forked from gzzfw/backEnd/gz-dyh

liyj
2024-09-09 bc684a5f99b82ff46b0dc87cc4917ca1b4b88fe1
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -5,15 +5,12 @@
import cn.huge.base.common.utils.IdUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.cases.domain.dto.*;
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.cases.domain.po.CaseWindupApply;
import cn.huge.module.cases.domain.po.*;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.DispClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseTaskMapper;
import cn.huge.module.cases.domain.po.CaseTask;
import cn.huge.module.constant.BaseConsts;
import cn.huge.module.cust.constant.UserBaseConsts;
import cn.huge.module.cust.dto.CtUnitDTO;
@@ -176,105 +173,180 @@
     */
    public TabButtonDTO webGetTabButton(String caseTaskId, String userId){
        try{
            // 临时给前端联调数据
            TabButtonDTO tabButtonDTO = new TabButtonDTO();
            List<TabButtonInfoDTO> tabList = new LinkedList<>();
            // 查询当前任务信息
            CaseTask caseTask = mapper.selectById(caseTaskId);
            // 定义tab
            TabButtonInfoDTO sxxq = new TabButtonInfoDTO();
            sxxq.setId("sxxq");
            sxxq.setName("事项详情");
            tabList.add(sxxq);
            TabButtonInfoDTO dslxq = new TabButtonInfoDTO();
            dslxq.setId("dslxq");
            dslxq.setName("详情");
            tabList.add(dslxq);
            TabButtonInfoDTO sxbl = new TabButtonInfoDTO();
            sxbl.setId("sxbl");
            sxbl.setName("事项办理");
            tabList.add(sxbl);
            TabButtonInfoDTO sqjl = new TabButtonInfoDTO();
            sqjl.setId("sqjl");
            sqjl.setName("申请记录");
            tabList.add(sqjl);
            TabButtonInfoDTO htsh = new TabButtonInfoDTO();
            htsh.setId("htsh");
            htsh.setName("回退审核");
            tabList.add(htsh);
            TabButtonInfoDTO sbsh = new TabButtonInfoDTO();
            sbsh.setId("sbsh");
            sbsh.setName("上报审核");
            tabList.add(sbsh);
            TabButtonInfoDTO jash = new TabButtonInfoDTO();
            jash.setId("jash");
            jash.setName("结案审核");
            tabList.add(jash);
            TabButtonInfoDTO lhczsh = new TabButtonInfoDTO();
            lhczsh.setId("lhczsh");
            lhczsh.setName("联合处置申请审核");
            tabList.add(lhczsh);
            TabButtonInfoDTO lcdb = new TabButtonInfoDTO();
            lcdb.setId("lcdb");
            lcdb.setName("流程督办");
            tabList.add(lcdb);
            TabButtonInfoDTO daxx = new TabButtonInfoDTO();
            daxx.setId("daxx");
            daxx.setName("档案信息");
            tabList.add(daxx);
            tabButtonDTO.setTabList(tabList);
            List<TabButtonInfoDTO> buttonList = new LinkedList<>();
            // 定义button
            TabButtonInfoDTO tjbljl = new TabButtonInfoDTO();
            tjbljl.setId("tjbljl");
            tjbljl.setName("添加办理记录");
            buttonList.add(tjbljl);
            TabButtonInfoDTO lhczsq = new TabButtonInfoDTO();
            lhczsq.setId("lhczsq");
            lhczsq.setName("联合处置申请");
            buttonList.add(lhczsq);
            TabButtonInfoDTO jasq = new TabButtonInfoDTO();
            jasq.setId("jasq");
            jasq.setName("结案申请");
            buttonList.add(jasq);
            TabButtonInfoDTO db = new TabButtonInfoDTO();
            db.setId("db");
            db.setName("督办");
            buttonList.add(db);
            TabButtonInfoDTO sl = new TabButtonInfoDTO();
            sl.setId("sl");
            sl.setName("受理");
            buttonList.add(sl);
            TabButtonInfoDTO ht = new TabButtonInfoDTO();
            ht.setId("ht");
            ht.setName("回退");
            buttonList.add(ht);
            TabButtonInfoDTO zxsl = new TabButtonInfoDTO();
            zxsl.setId("zxsl");
            zxsl.setName("自行受理");
            buttonList.add(zxsl);
            TabButtonInfoDTO jb = new TabButtonInfoDTO();
            jb.setId("jb");
            jb.setName("交办");
            buttonList.add(jb);
            TabButtonInfoDTO sb = new TabButtonInfoDTO();
            sb.setId("sb");
            sb.setName("上报");
            buttonList.add(sb);
            // 根据流程显示tab
            List<TabButtonInfoDTO> tabList = new LinkedList<>();
            // 根据流程显示button
            List<TabButtonInfoDTO> buttonList = new LinkedList<>();
            if (ObjectUtils.isNotEmpty(caseTask)) {
                if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
                    tabList.add(sqjl);
                    buttonList.add(zxsl);
                    buttonList.add(jb);
                    buttonList.add(sb);
                }
                if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
                    tabList.add(sqjl);
                    buttonList.add(sl);
                    buttonList.add(ht);
                }
                if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
                    tabList.add(sqjl);
                    tabList.add(htsh);
                }
                if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
                    tabList.add(sqjl);
                    tabList.add(sbsh);
                }
                if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
                    tabList.add(sqjl);
                    buttonList.add(zxsl);
                    buttonList.add(jb);
                    buttonList.add(sb);
                }
                if (FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
                    tabList.add(sqjl);
                    buttonList.add(sl);
                    buttonList.add(ht);
                }
                if (FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
                    tabList.add(sqjl);
                    tabList.add(htsh);
                }
                if (FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
                    tabList.add(sqjl);
                    tabList.add(sbsh);
                }
                if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
                    tabList.add(sqjl);
                    buttonList.add(zxsl);
                    buttonList.add(jb);
                }
                if (FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(dslxq);
                    tabList.add(sqjl);
                    buttonList.add(sl);
                    buttonList.add(ht);
                }
                if (FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex().equals(caseTask.getNodeId())) {
                    sxxq.setName("详情");
                    tabList.add(sxxq);
                    tabList.add(sqjl);
                    tabList.add(htsh);
                }
                if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(sxxq);
                    tabList.add(sxbl);
                    tabList.add(sqjl);
                    buttonList.add(tjbljl);
                    buttonList.add(lhczsq);
                    buttonList.add(jasq);
                }
                if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(sxxq);
                    tabList.add(sqjl);
                    tabList.add(jash);
                }
                if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
                    daxx.setName("信息");
                    tabList.add(daxx);
                    tabList.add(lcdb);
                    tabList.add(sqjl);
                }
                if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
                    tabList.add(daxx);
                    tabList.add(lcdb);
                    tabList.add(sqjl);
                }
            }else {
                tabList.add(sxxq);
                tabList.add(sqjl);
                tabList.add(lhczsh);
            }
            // 封装数据
            TabButtonDTO tabButtonDTO = new TabButtonDTO();
            tabButtonDTO.setTabList(tabList);
            tabButtonDTO.setButtonList(buttonList);
            return tabButtonDTO;
        }catch (Exception e){
@@ -290,76 +362,64 @@
     */
    public Map<String, Object> webListCaseFlow(String caseId, String userId){
        try{
            // 临时给前端联调数据
            Map<String, Object> result = Maps.newHashMap();
            List<CaseFlowDTO> handleCaseFlowList = new LinkedList<>();
            // 首节点
            CaseFlowDTO lfdj = new CaseFlowDTO();
            CaseInfo caseInfo = caseInfoService.getById(caseId);
            lfdj.setNodeShowName("来访登记");
            lfdj.setHandleUnitName("白云区新市综治中心");
            lfdj.setHandleUserName("李晓明");
            lfdj.setTaskType(1);
            lfdj.setStatus(2);
            lfdj.setHandleUnitName(caseInfo.getInputUnitName());
            lfdj.setHandleUserName(caseInfo.getInputUserName());
            lfdj.setTaskType(CaseTaskConsts.TASK_TYPE_1);
            lfdj.setStatus(CaseTaskConsts.TASK_STATUS_2);
            lfdj.setHandleTime(new Date());
            handleCaseFlowList.add(lfdj);
            // 查询承办组织任务
            QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
            caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_1).orderByDesc("create_time");
            List<CaseTask> handleCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
            CaseFlowDTO xtpd = new CaseFlowDTO();
            xtpd.setNodeShowName("事件流转");
            xtpd.setHandleUnitName("系统派单");
            xtpd.setHandleTime(new Date());
            xtpd.setHandleNotes("派单至:白云区新市司法所");
            xtpd.setTaskType(1);
            xtpd.setStatus(2);
            handleCaseFlowList.add(xtpd);
            CaseFlowDTO sjlz = new CaseFlowDTO();
            sjlz.setNodeShowName("事件流转");
            sjlz.setHandleUnitName("白云区新市司法所");
            sjlz.setHandleUserName("赵菲菲");
            sjlz.setHandleTime(new Date());
            sjlz.setHandleNotes("已签收");
            sjlz.setTaskType(1);
            sjlz.setStatus(2);
            handleCaseFlowList.add(sjlz);
            CaseFlowDTO sjht = new CaseFlowDTO();
            sjht.setNodeShowName("事件回退");
            sjht.setHandleUnitName("白云区新市司法所");
            sjht.setHandleUserName("赵菲菲");
            sjht.setHandleTime(new Date());
            sjht.setTaskType(2);
            sjht.setStatus(2);
            handleCaseFlowList.add(sjht);
            CaseFlowDTO htsh = new CaseFlowDTO();
            htsh.setNodeShowName("回退审核");
            htsh.setHandleUnitName("白云区新市综治中心");
            htsh.setHandleUserName("李晓明");
            htsh.setHandleTime(new Date());
            htsh.setAuditResult("24_00004-1");
            htsh.setAuditResultName("通过");
            htsh.setHandleTime(new Date());
            htsh.setTaskType(1);
            htsh.setStatus(2);
            handleCaseFlowList.add(htsh);
            CaseFlowDTO dsl = new CaseFlowDTO();
            dsl.setProcessName("待受理");
            dsl.setHandleUnitName("白云区新市综治中心");
            dsl.setTaskType(1);
            dsl.setStatus(1);
            handleCaseFlowList.add(dsl);
            for (CaseTask caseTask: handleCaseTaskList){
                CaseFlowDTO caseFlowDTO = new CaseFlowDTO();
                if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
                    caseFlowDTO.setProcessName(caseInfo.getProcessName());
                    caseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
                    caseFlowDTO.setTaskType(caseTask.getTaskType());
                    caseFlowDTO.setStatus(caseTask.getStatus());
                }else {
                    caseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                    caseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
                    caseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
                    caseFlowDTO.setHandleTime(caseTask.getHandleTime());
                    caseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
                    if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
                        caseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
                        caseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
                    }
                    if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
                        caseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
                        caseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
                    }
                }
                handleCaseFlowList.add(caseFlowDTO);
            }
            result.put("handleCaseFlowList", handleCaseFlowList);
            // 查询配合组织流程
            List<CaseFlowDTO> assistCaseFlowList = new LinkedList<>();
            CaseFlowDTO xtpd2 = new CaseFlowDTO();
            xtpd2.setNodeShowName("事件流转");
            xtpd2.setHandleUnitName("联合处置申请");
            xtpd2.setHandleTime(new Date());
            xtpd2.setHandleNotes("联合处置申请:白云区永平司法所");
            xtpd2.setTaskType(1);
            xtpd2.setStatus(2);
            assistCaseFlowList.add(xtpd2);
            caseTaskQueryWrapper.clear();
            caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).orderByDesc("create_time");
            List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
            for (CaseTask caseTask: assistCaseTaskList){
                CaseFlowDTO caseFlowDTO = new CaseFlowDTO();
                caseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
                caseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
                caseFlowDTO.setHandleTime(caseTask.getHandleTime());
                caseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
                caseFlowDTO.setTaskType(caseTask.getTaskType());
                caseFlowDTO.setStatus(caseTask.getStatus());
                assistCaseFlowList.add(caseFlowDTO);
            }
            result.put("assistCaseFlowList", assistCaseFlowList);
            return result;
        }catch (Exception e){
@@ -486,7 +546,7 @@
                        dfpCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
                        dfpCaseTask.setHandleUnitName("系统派单");
                        dfpCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
                        dfpCaseTask.setHandleContent("派单至:"+caseDispBaseDTO.getTargetName());
                        dfpCaseTask.setHandleIllust("派单至:"+caseDispBaseDTO.getTargetName());
                        dfpCaseTask.setHandleTime(caseInfo.getCreateTime());
                        dfpCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
                        dfpCaseTask.setCustId(caseInfo.getCustId());
@@ -577,6 +637,8 @@
            dfpCaseTaskPO.setHandleUserId(loginUser.getId());
            dfpCaseTaskPO.setHandleUserName(loginUser.getTrueName());
            dfpCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
            dfpCaseTaskPO.setHandleContent(assignTaskDTO.getAssignContent());
            dfpCaseTaskPO.setHandleIllust("派单至:"+assignTaskDTO.getHandleUnitName());
            dfpCaseTaskPO.setHandleTime(nowDate);
            dfpCaseTaskPO.setUpdateTime(nowDate);
            mapper.updateCaseTask(dfpCaseTaskPO);
@@ -647,21 +709,54 @@
            caseInfoService.updateCaseInfo(caseInfoPO);
            // 分派配合组织
            if (CollectionUtils.isNotEmpty(assignTaskDTO.getAssistUnitList())){
                // 拼接配合组织编号和名称
                String assistUnitId = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
                        collect(Collectors.joining(BaseConsts.COMMA));
                String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
                        collect(Collectors.joining(BaseConsts.COMMA));
                for (AssignAssistUnitDTO assignAssistUnitDTO: assignTaskDTO.getAssistUnitList()){
                    // 创建交办配合组织任务
                    CaseTask jbAssistCaseTask = new CaseTask();
                    jbAssistCaseTask.setId(utilsClient.getNewTimeId());
                    jbAssistCaseTask.setCaseId(dfpCaseTask.getCaseId());
                    jbAssistCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
                    jbAssistCaseTask.setNodeName("交办配合部门");
                    jbAssistCaseTask.setNodeShowName("交办配合部门");
                    jbAssistCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
                    // 配合任务,任务候选执行者类型是上一步骤选择
                    jbAssistCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
                    jbAssistCaseTask.setCandeUnitId(loginUser.getUnitId());
                    jbAssistCaseTask.setCandeUnitName(loginUser.getUnitName());
                    jbAssistCaseTask.setHandleUnitId(loginUser.getUnitId());
                    jbAssistCaseTask.setHandleUnitName(loginUser.getUnitId());
                    jbAssistCaseTask.setHandleUserId(loginUser.getId());
                    jbAssistCaseTask.setHandleUserName(loginUser.getTrueName());
                    jbAssistCaseTask.setHandleContent(assignTaskDTO.getAssignContent());
                    jbAssistCaseTask.setHandleIllust("派单至:"+assignTaskDTO.getHandleUnitName());
                    jbAssistCaseTask.setHandleTime(nowDate);
                    // 不需要签收
                    jbAssistCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
                    jbAssistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
                    jbAssistCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
                    jbAssistCaseTask.setCustId(dfpCaseTask.getCustId());
                    jbAssistCaseTask.setCreateTime(nowDate);
                    jbAssistCaseTask.setUpdateTime(nowDate);
                    mapper.insert(jbAssistCaseTask);
                    // 创建配合组织任务
                    CaseTask assistCaseTask = new CaseTask();
                    assistCaseTask.setId(utilsClient.getNewTimeId());
                    assistCaseTask.setCaseId(dfpCaseTask.getCaseId());
                    assistCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
                    assistCaseTask.setNodeId(FlowNodeEnum.FLOW_NODE_BLFK.getIndex());
                    assistCaseTask.setNodeName(FlowNodeEnum.FLOW_NODE_BLFK.getIndex());
                    assistCaseTask.setFlowId(newFlowNode.getFlowId());
                    assistCaseTask.setNodeName(FlowNodeEnum.FLOW_NODE_BLFK.getDes());
                    assistCaseTask.setNodeShowName(FlowNodeEnum.FLOW_NODE_BLFK.getIndex());
                    assistCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
                    // 配合任务,任务候选执行者类型是上一步骤选择
                    assistCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
                    assistCaseTask.setCandeUnitId(assignAssistUnitDTO.getUitId());
                    assistCaseTask.setCandeUnitName(assignAssistUnitDTO.getUitName());
                    assistCaseTask.setHandleUnitId(assignAssistUnitDTO.getUitId());
                    assistCaseTask.setHandleUnitName(assignAssistUnitDTO.getUitName());
                    // 分派的任务,需要签收
                    assistCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
                    assistCaseTask.setSignExpireTime(sysClient.getExpireTime(nowDate, SyTimeEnum.SY_TIME_2.getIndex()));
@@ -672,12 +767,12 @@
                    assistCaseTask.setUpdateTime(nowDate);
                    mapper.insert(assistCaseTask);
                }
                // 拼接配合组织编号和名称
                String assistUnitId = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
                        collect(Collectors.joining(BaseConsts.COMMA));
                String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitId).
                        collect(Collectors.joining(BaseConsts.COMMA));
                // 更新纠纷扩展信息
                CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
                caseInfoUnfoldPO.setId(blfkCaseTask.getCaseId());
                caseInfoUnfoldPO.setAssistUnitId(assistUnitId);
                caseInfoUnfoldPO.setAssistUnitName(assistUnitName);
                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
            }
        }catch (Exception e){
            log.error("[CaseTaskService.webAssign]调用失败,异常信息:"+e, e);
@@ -702,6 +797,7 @@
            caseTaskPO.setSignTime(nowDate);
            caseTaskPO.setSignUserId(loginUser.getId());
            caseTaskPO.setSignUserName(loginUser.getTrueName());
            caseTaskPO.setHandleIllust("已签收");
            caseTaskPO.setUpdateTime(nowDate);
            mapper.updateCaseTask(caseTaskPO);
            // 更新纠纷信息
@@ -926,7 +1022,7 @@
                dsrpjCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
                dsrpjCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
                dsrpjCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
                dsrpjCaseTask.setCustId(blfkCaseTaskPO.getCustId());
                dsrpjCaseTask.setCustId(jashCaseTask.getCustId());
                dsrpjCaseTask.setCreateTime(nowDate);
                dsrpjCaseTask.setUpdateTime(nowDate);
                mapper.insert(dsrpjCaseTask);
@@ -972,7 +1068,7 @@
                // 新建结案审核任务
                CaseTask jashCaseTask = new CaseTask();
                jashCaseTask.setId(utilsClient.getNewTimeId());
                jashCaseTask.setCaseId(blfkCaseTaskPO.getCaseId());
                jashCaseTask.setCaseId(jasqCaseTask.getCaseId());
                jashCaseTask.setFlowableId(jashFlowNode.getFlowableId());
                jashCaseTask.setProcessInstanceId(jashFlowNode.getProcessInstanceId());
                jashCaseTask.setProcessTaskId(jashFlowNode.getProcessTaskId());
@@ -991,15 +1087,15 @@
                jashCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
                jashCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
                jashCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
                jashCaseTask.setCustId(blfkCaseTaskPO.getCustId());
                jashCaseTask.setCustId(jasqCaseTask.getCustId());
                jashCaseTask.setCreateTime(nowDate);
                jashCaseTask.setUpdateTime(nowDate);
                mapper.insert(jashCaseTask);
                // 更新结案申请信息
                caseWindupApply.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_0);
                caseWindupApply.setCaseTaskId(jashCaseTask.getId());
                caseWindupApply.setAuditUnitId(jashCaseTask.getHandleUnitId());
                caseWindupApply.setAuditUnitName(jashCaseTask.getHandleUnitName());
                caseWindupApply.setAuditUnitId(jashCaseTask.getCandeUnitId());
                caseWindupApply.setAuditUnitName(jashCaseTask.getCandeUnitName());
                caseWindupApply.setCustId(jashCaseTask.getCustId());
                caseWindupApplyService.save(caseWindupApply);
                // 更新纠纷信息