回退上报流程bug修复2

liyj

2024-09-14 0b597ea4500b3463ac9f0983dbabaca52417226c

回退上报流程bug修复2

 dyh-service/dyh-base/src/main/java/cn/huge/base/common/utils/ReturnFailUtils.java

@@ -22,7 +22,7 @@
    /**
     * 请求成功默认代码
     */
    public static int CODE_FAIL = 0;
    public static int CODE_FAIL = -1;
    /**
     * 用户未登录、失效
     */

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/controller/web/CtUserWebController.java

@@ -423,4 +423,21 @@
            return ReturnFailUtils.getRepInfo();
        }
    }

    /**
     * 人工配置-统一修改单位名称
     * @url {ctx}/api/web/ctUser/updateUnitName
     * @param id 主键编号
     * @return Object
     * @throws Exception
     */
    @GetMapping("/getByIdupdateUnitNameRole")
    public Object updateUnitName() {
        try {

            return ReturnSucUtils.getRepInfo();
        } catch (Exception e) {
            return ReturnFailUtils.getRepInfo();
        }
    }
}

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUnitService.java

@@ -331,10 +331,10 @@
                unitSelectTerm.setLabel(ctUnit.getUnitName());
                unitSelectTerm.setParentId(ctUnit.getParentId());
                unitSelectTerm.setCheckable(true);
                if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
                if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
                    szbmList.add(unitSelectTerm);
                }
                if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
                if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
                    qzzzxList.add(unitSelectTerm);
                }
            }
@@ -382,7 +382,7 @@
                if (UserBaseConsts.UNIT_TYPE_2 == ctUnit.getUnitType()){
                    qzbmList.add(unitSelectTerm);
                }
                if (UserBaseConsts.UNIT_TYPE_3 == ctUnit.getUnitType()){
                if (UserBaseConsts.UNIT_TYPE_1 == ctUnit.getUnitType()){
                    zjzzzxList.add(unitSelectTerm);
                }
            }

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

@@ -1216,9 +1216,10 @@
            List<String> taskIdList = new ArrayList<>();
            List<String> caseIdList = new ArrayList<>();
            for (SignTaskDTO signTaskDTO: signTaskDTOList){
                CaseTask qsCaseTask = mapper.selectById(signTaskDTO.getCaseId());
                CaseTask qsCaseTask = mapper.selectById(signTaskDTO.getCaseTaskId());
                // 更新纠纷任务信息
                CaseTask caseTaskPO = new CaseTask();
                caseTaskPO.setId(qsCaseTask.getId());
                caseTaskPO.setSignStatus(CaseTaskConsts.SIGN_STATUS_2);
                caseTaskPO.setSignTime(nowDate);
                caseTaskPO.setSignUserId(loginUser.getId());
@@ -1230,6 +1231,7 @@
                if (CaseTaskConsts.CASE_TASK_TYPE_1 ==  qsCaseTask.getCaseTaskType()) {
                    // 更新纠纷信息
                    CaseInfo caseInfoPO = new CaseInfo();
                    caseInfoPO.setId(qsCaseTask.getCaseId());
                    caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_3.getIndex());
                    caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_3.getDes());
                    caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
@@ -1940,7 +1942,8 @@
                sbshCaseTaskPO.setHandleTime(nowDate);
                sbshCaseTaskPO.setUpdateTime(nowDate);
                mapper.updateCaseTask(sbshCaseTaskPO);
                CtUnitDTO returnUnit = custClient.getUnitById(caseReturn.getReturnUnitId());
                CaseReturn btyCaseReturn = caseReturnService.getById(caseReturn.getId());
                CtUnitDTO returnUnit = custClient.getUnitById(btyCaseReturn.getReturnUnitId());
                String operation = FlowableConsts.OPERATION_htsh_bty;
                if (UserBaseConsts.UNIT_GRADE_2 == returnUnit.getUnitGrade()){
                    operation = FlowableConsts.OPERATION_htsh_bty_qj;
@@ -1954,7 +1957,7 @@
                // 新建待分派任务
                CaseTask dslCaseTask = new CaseTask();
                dslCaseTask.setId(utilsClient.getNewTimeId());
                dslCaseTask.setCaseId(dslCaseTask.getCaseId());
                dslCaseTask.setCaseId(htshCaseTask.getCaseId());
                dslCaseTask.setFlowableId(dslFlowNode.getFlowableId());
                dslCaseTask.setProcessInstanceId(dslFlowNode.getProcessInstanceId());
                dslCaseTask.setProcessTaskId(dslFlowNode.getProcessTaskId());
@@ -1967,8 +1970,8 @@
                dslCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
                // 受理任务，任务候选执行者类型是上一步骤选择
                dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
                dslCaseTask.setCandeUnitId(caseReturn.getReturnUnitId());
                dslCaseTask.setCandeUnitName(caseReturn.getReturnUnitName());
                dslCaseTask.setCandeUnitId(btyCaseReturn.getReturnUnitId());
                dslCaseTask.setCandeUnitName(btyCaseReturn.getReturnUnitName());
                // 受理后的任务，不需要签收
                dslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
                // 任务处理时限