fix:任务节点优化，政法委权限优化，大平台跳转登录优化，大平台案件推送优化

xusd

3 days ago ab7b1b5ad5f2eed0b11be524cbaccbb7489fd6cd

fix:任务节点优化，政法委权限优化，大平台跳转登录优化，大平台案件推送优化

 dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java

@@ -91,6 +91,12 @@
                if (item.isLastOrgRole() && item.getRoleName().contains("调度干部")) {
                    BeanUtils.copyProperties(item, nowRoleDTO);
                }
                if (item.isLastOrgRole() && item.getRoleCode().equals("22_00024-2")) {
                    BeanUtils.copyProperties(item, nowRoleDTO);
                }
//                if (item.isLastOrgRole() && item.getRoleName().contains("领导")) {
//                    BeanUtils.copyProperties(item, nowRoleDTO);
//                }
                if (item.getRoleName().contains("（M）")) {
                    BeanUtils.copyProperties(item, roleDTO);
                }

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/casebook/controller/web/CaseBookWebController.java

@@ -19,6 +19,7 @@
import org.springframework.data.domain.Sort;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java

@@ -175,7 +175,7 @@

        //经办人ID
        String systemSource = request.getParameter("systemSource");
        if (StringUtils.isNotBlank(mediator)) {
        if (StringUtils.isNotBlank(systemSource)) {
            terms.put("systemSource", systemSource);
        }


 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java

@@ -424,6 +424,13 @@
                terms.put("partyName", partyName);
            }
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
            //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
            if (201 == unitById.getUnitType()) {
                CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
                if (bjZzzx != null)
                    loginUser.setUnitId(bjZzzx.getId());
            }
            if (status == 1) {
                terms.put("candeUnitId", loginUser.getUnitId());
            } else {
@@ -513,6 +520,13 @@
                terms.put("partyName", partyName);
            }
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
            //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
            if (201 == unitById.getUnitType()) {
                CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
                if (bjZzzx != null)
                    loginUser.setUnitId(bjZzzx.getId());
            }
            if (status == 1) {
                terms.put("candeUnitId", loginUser.getUnitId());
            } else {
@@ -660,6 +674,13 @@
                terms.put("partyName", partyName);
            }
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
            //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
            if (201 == unitById.getUnitType()) {
                CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
                if (bjZzzx != null)
                    loginUser.setUnitId(bjZzzx.getId());
            }
            // 不予受理，查询case_dismiss表
            if (status == 3) {
                terms.put("disUnitId", loginUser.getUnitId());
@@ -710,6 +731,13 @@
            }
            terms.put("caseTaskType", caseTaskType);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
            //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
            if (201 == unitById.getUnitType()) {
                CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
                if (bjZzzx != null)
                    loginUser.setUnitId(bjZzzx.getId());
            }
            terms.put("candeUnitId", loginUser.getUnitId());

            String mediatorType = request.getParameter("mediatorType");
@@ -791,6 +819,13 @@
                terms.put("partyName", partyName);
            }
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
            //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
            if (201 == unitById.getUnitType()) {
                CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
                if (bjZzzx != null)
                    loginUser.setUnitId(bjZzzx.getId());
            }
            if (caseTaskType == 1) {
                terms.put("applyUnitId", loginUser.getUnitId());
            } else {
@@ -939,6 +974,13 @@
            }
            PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
            //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
            if (201 == unitById.getUnitType()) {
                CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
                if (bjZzzx != null)
                    loginUser.setUnitId(bjZzzx.getId());
            }
            terms.put("auditUnitId", loginUser.getUnitId());
            terms.put("applyStatus", status);
            return ReturnSucUtils.getRepInfo(service.pageMyTaskSh(pageRequest, type, terms));
@@ -1017,6 +1059,13 @@
            }
            PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
            //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
            if (201 == unitById.getUnitType()) {
                CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
                if (bjZzzx != null)
                    loginUser.setUnitId(bjZzzx.getId());
            }
            terms.put("applyUnitId", loginUser.getUnitId());
            return ReturnSucUtils.getRepInfo(service.pageMyTaskShWSQD(pageRequest, terms));
        } catch (Exception e) {
@@ -1091,6 +1140,13 @@
            }
            PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
            //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
            if (201 == unitById.getUnitType()) {
                CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
                if (bjZzzx != null)
                    loginUser.setUnitId(bjZzzx.getId());
            }
            Page<FrontPageListDTO> frontPageListDTOPage = null;
            if (StringUtils.isNotBlank(loginUser.getUnitId())) {
                terms.put("type", status);
@@ -1341,6 +1397,13 @@
            }

            CtUserDTO loginUser = custClient.clientGetUserAll(userId);
            CtUnitDTO unitById = custClient.getUnitById(loginUser.getUnitId());
            //如果是政法委，赋予综治中心查看案件的权限，政法委不接收案子处理，只负责指导，所以可以直接赋予
            if (201 == unitById.getUnitType()) {
                CtUnitDTO bjZzzx = custClient.getBjZzzx(unitById.getId());
                if (bjZzzx != null)
                    loginUser.setUnitId(bjZzzx.getId());
            }
            terms.put("handleUnitId", loginUser.getUnitId());
            // 排序
            Sort sort = null;
@@ -1488,8 +1551,9 @@

    /**
     * 测试接口
     * @url {ctx}/api/web/caseTask/test
     *
     * @return Object
     * @url {ctx}/api/web/caseTask/test
     */
    @GetMapping("/test")
    public Object test(@RequestParam(value = "caseId") String caseId,

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml

@@ -559,7 +559,7 @@
                    and b.agree_type = #{terms.agreeType}
                </if>
                <if test="terms.systemSource != null and terms.systemSource !=''">
                    and b.sys_source = #{systemSource}
                    and b.sys_source = #{terms.systemSource}
                </if>
                <if test="terms.visitTimeStart != null and terms.visitTimeStart !='' and terms.visitTimeEnd != null and terms.visitTimeEnd !=''">
                    and (DATE_FORMAT(a.visit_time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{terms.visitTimeStart}

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java

@@ -310,7 +310,9 @@
            generateQrCodeRequestVo.setBusinessSource("02");
            generateQrCodeRequestVo.setGenerateUnifiedCode(true);
            generateQrCodeRequestVo.setInfoSource("03");
            String area = this.formatGridCode(ctUnitDTO.getArea());
            log.info("xsdgridCode:{}",registerSaveDTO.getQueArea());
            String area = this.formatGridCode(registerSaveDTO.getQueArea());
            log.info("xsdgridCode:{}",area);
            generateQrCodeRequestVo.setGridCode(area);
            caseInfo.setCaseRef(sysClient.getCaseRefByGenerateQrCode(generateQrCodeRequestVo));
            // 获取调解案号

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java

@@ -651,6 +651,14 @@
                    lfdj.setNodeShowName("自行排查");
                    lfdj.setHandleUserName(caseInfo.getInputUserName());
                    lfdj.setHandleUnitName(caseInfo.getInputUnitName());
                    if(CaseBaseConstsEnum.CASE_CANAL_SECOND_2.getIndex().equals(caseInfo.getCanalSecond())){
                        lfdj.setHandleUserName("系统自动获取");
                        lfdj.setHandleUnitName(caseInfo.getCanalSecondName());
                    }
                    if(CaseBaseConstsEnum.CASE_CANAL_SECOND_7.getIndex().equals(caseInfo.getCanalSecond())){
                        lfdj.setHandleUserName("系统自动获取");
                        lfdj.setHandleUnitName(caseInfo.getCanalSecondName());
                    }
                }
                if (CaseBaseConstsEnum.CASE_CANAL_4.getIndex().equals(caseInfo.getCanal())) {
                    lfdj.setNodeShowName("协同推送");

 dyh-service/dyh-sys/src/main/java/cn/huge/module/timer/GridCityCaseTimer.java

@@ -454,7 +454,7 @@
                                    if (StringUtils.isNotBlank(gridCaseInfoDTO.getContactTel())) {
                                        uploadPolicePhone = AesUtils.decrypt(gridCaseInfoDTO.getContactTel(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
                                    }
                                } else if ("12".equals(canalSecond)) {
                                } else if ("12".equals(canalSecond) || "13".equals(canalSecond)) {
                                    if (StringUtils.isNotBlank(gridCaseInfoDTO.getLinkman())) {
                                        uploadPolice = AesUtils.decrypt(gridCaseInfoDTO.getLinkman(), "W90akz7tA7tyMn5tNTynG69YM2E8jGfF");
                                    }