From bfb5b0c14bec340af93779d6de1f9e6e8fe03c37 Mon Sep 17 00:00:00 2001 From: zhouxiantao <1026371446@qq.com> Date: Sun, 22 Sep 2024 17:41:41 +0800 Subject: [PATCH] 首页弹窗 --- dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java | 204 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 174 insertions(+), 30 deletions(-) diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java index bde0bd2..e278d3f 100644 --- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java +++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java @@ -3,13 +3,20 @@ import cn.huge.base.common.exception.ServiceException; import cn.huge.base.common.utils.DateUtils; import cn.huge.base.common.utils.IdUtils; +import cn.huge.module.cases.consts.CaseTaskConsts; +import cn.huge.module.cases.domain.dto.FrontPageListDTO; +import cn.huge.module.cases.domain.po.*; import cn.huge.module.client.api.impl.CustClientImpl; import cn.huge.module.client.api.impl.SysClientImpl; import cn.huge.module.client.api.impl.UtilsClientImpl; import cn.huge.module.cases.dao.mapper.CaseAssistApplyMapper; -import cn.huge.module.cases.domain.po.CaseAssistApply; +import cn.huge.module.constant.BaseConsts; import cn.huge.module.cust.dto.CtUnitDTO; import cn.huge.module.cust.dto.CtUserDTO; +import cn.huge.module.flow.consts.FlowableConsts; +import cn.huge.module.flow.domain.po.FlowNode; +import cn.huge.module.flow.service.FlowInfoService; +import cn.huge.module.mediate.constant.*; import cn.huge.module.sys.dto.FileIdInfoBaseDTO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -26,7 +33,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * @title: 联合处置申请信息表业务逻辑处理 @@ -46,12 +52,18 @@ @Autowired private UtilsClientImpl utilsClient; - @Autowired private CustClientImpl custClient; - @Autowired private SysClientImpl sysClient; + @Autowired + private FlowInfoService flowInfoService; + @Autowired + private CaseTaskService caseTaskService; + @Autowired + private CaseInfoUnfoldService caseInfoUnfoldService; + @Autowired + private CaseAssistInfoService caseAssistInfoService; /** * 更新对象 @@ -152,21 +164,20 @@ // 获取当前登录用户 CtUserDTO loginUser = custClient.clientGetUserAll(userId); Date now = DateUtils.getNowDate(); - + // 新增联合处置申请 caseAssistApply.setApplyUnitId(loginUser.getUnitId()); caseAssistApply.setApplyUnitName(loginUser.getUnitName()); caseAssistApply.setApplyUserId(loginUser.getId()); caseAssistApply.setApplyUserName(loginUser.getTrueName()); - caseAssistApply.setApplyStatus(0); - caseAssistApply.setDeleteStatus(0); + caseAssistApply.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_0); + caseAssistApply.setDeleteStatus(BaseConsts.DELETE_STATUS_0); caseAssistApply.setApplyTime(now); caseAssistApply.setCreateTime(now); caseAssistApply.setUpdateTime(now); - //todo 添加任务 + // 上级综治中心审核 CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId()); caseAssistApply.setAuditUnitId(ctUnitDTO.getId()); caseAssistApply.setAuditUnitName(ctUnitDTO.getUnitName()); - mapper.insert(caseAssistApply); }catch (Exception e){ log.error("[CaseAssistApplyService.addCaseAssistApply]调用失败,异常信息:"+e, e); @@ -175,7 +186,7 @@ } /** - * 审核联合处置申请 + * 审核联合处置审核 * @param caseAssistApply 实体对象 */ public void reviewCaseAssistApply(CaseAssistApply caseAssistApply, String userId){ @@ -183,15 +194,114 @@ // 获取当前登录用户 CtUserDTO loginUser = custClient.clientGetUserAll(userId); Date now = DateUtils.getNowDate(); - - caseAssistApply.setApplyStatus(1); - caseAssistApply.setAuditUserId(loginUser.getId()); - caseAssistApply.setAuditUserName(loginUser.getTrueName()); - caseAssistApply.setAuditTime(now); - caseAssistApply.setUpdateTime(now); - //todo 修改任务状态 - - mapper.updateCaseAssistApply(caseAssistApply); + CaseAssistApply caseAssistApplyPO = mapper.selectById(caseAssistApply.getId()); + caseAssistApplyPO.setAuditResult(caseAssistApply.getAuditResult()); + caseAssistApplyPO.setAuditResultName(caseAssistApply.getAuditResultName()); + caseAssistApplyPO.setAuditContent(caseAssistApply.getAuditContent()); + caseAssistApplyPO.setApplyStatus(AuditBaseConsts.AUDIT_STATUS_1); + caseAssistApplyPO.setAuditUserId(loginUser.getId()); + caseAssistApplyPO.setAuditUserName(loginUser.getTrueName()); + caseAssistApplyPO.setAuditTime(now); + caseAssistApplyPO.setUpdateTime(now); + mapper.updateCaseAssistApply(caseAssistApplyPO); + // 审核通过,就启动联合处置工作流 + if (AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex().equals(caseAssistApplyPO.getAuditResult())) { + String[] unitIdList = caseAssistApplyPO.getApplyAssistUnitId().split(BaseConsts.COMMA); + String[] unitNameList = caseAssistApplyPO.getApplyAssistUnitName().split(BaseConsts.COMMA); + for (int i=0; i<unitIdList.length; i++){ + String unitId = unitIdList[i]; + String unitName = unitNameList[i]; + // 启动联合处置工作流 + FlowNode dfpFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_LHCZ, caseAssistApplyPO.getCaseId()); + // 新建并完成配合部门待分派任务 + CaseTask dfpCaseTask = new CaseTask(); + dfpCaseTask.setId(utilsClient.getNewTimeId()); + dfpCaseTask.setCaseId(caseAssistApplyPO.getCaseId()); + dfpCaseTask.setFlowableId(dfpFlowNode.getFlowableId()); + dfpCaseTask.setProcessInstanceId(dfpFlowNode.getProcessInstanceId()); + dfpCaseTask.setProcessTaskId(dfpFlowNode.getProcessTaskId()); + dfpCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1); + dfpCaseTask.setNodeType(dfpFlowNode.getNodeType()); + dfpCaseTask.setNodeId(dfpFlowNode.getNodeId()); + dfpCaseTask.setNodeName(dfpFlowNode.getNodeName()); + dfpCaseTask.setFlowId(dfpFlowNode.getFlowId()); + dfpCaseTask.setNodeShowName(dfpFlowNode.getNodeShowName()); + dfpCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2); + // 通过调度的,任务候选执行者类型是上一步骤选择 + dfpCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1); + dfpCaseTask.setCandeUnitId(unitId); + dfpCaseTask.setCandeUnitName(unitName); + // 不需要签收 + dfpCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0); + dfpCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2); + dfpCaseTask.setHandleUnitId(loginUser.getUnitId()); + dfpCaseTask.setHandleUnitName(loginUser.getUnitName()); + dfpCaseTask.setHandleUserId(loginUser.getId()); + dfpCaseTask.setHandleUserName(loginUser.getTrueName()); + dfpCaseTask.setHandleContent(caseAssistApplyPO.getAuditContent()); + dfpCaseTask.setHandleIllust("交办至:"+caseAssistApplyPO.getApplyAssistUnitName()); + // 任务处理时限 + if (dfpFlowNode.getExpire() != 0) { + dfpCaseTask.setExpireTime(DateUtils.addDay(now, dfpFlowNode.getExpire())); + } + dfpCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0); + dfpCaseTask.setCustId(caseAssistApplyPO.getCustId()); + dfpCaseTask.setCreateTime(now); + dfpCaseTask.setUpdateTime(now); + caseTaskService.save(dfpCaseTask); + // 完成待分派任务 + FlowNode dslFlowNode = flowInfoService.completeTask(dfpCaseTask.getFlowableId(), dfpCaseTask.getProcessTaskId(), + FlowableConsts.OPERATION_forward, loginUser.getId()); + // 创建配合部门待受理任务 + CaseTask dslCaseTask = new CaseTask(); + dslCaseTask.setId(utilsClient.getNewTimeId()); + dslCaseTask.setCaseId(caseAssistApplyPO.getCaseId()); + dslCaseTask.setFlowableId(dslFlowNode.getFlowableId()); + dslCaseTask.setProcessInstanceId(dslFlowNode.getProcessInstanceId()); + dslCaseTask.setProcessTaskId(dslFlowNode.getProcessTaskId()); + dslCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1); + dslCaseTask.setNodeType(dslFlowNode.getNodeType()); + dslCaseTask.setNodeId(dslFlowNode.getNodeId()); + dslCaseTask.setNodeName(dslFlowNode.getNodeName()); + dslCaseTask.setFlowId(dslFlowNode.getFlowId()); + dslCaseTask.setNodeShowName(dslFlowNode.getNodeShowName()); + dslCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2); + // 通过调度的,任务候选执行者类型是上一步骤选择 + dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1); + CtUnitDTO ctUnitDTO = custClient.getUnitById(unitId); + dslCaseTask.setCandeUnitId(ctUnitDTO.getId()); + dslCaseTask.setCandeUnitName(ctUnitDTO.getUnitName()); + // 需要签收 + dslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1); + dslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1); + // 任务处理时限 + if (dslFlowNode.getExpire() != 0) { + dslCaseTask.setExpireTime(DateUtils.addDay(now, dslFlowNode.getExpire())); + } + dslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0); + dslCaseTask.setCustId(caseAssistApplyPO.getCustId()); + dslCaseTask.setCreateTime(now); + dslCaseTask.setUpdateTime(now); + caseTaskService.save(dslCaseTask); + // 新增联合处置信息 + CaseAssistInfo caseAssistInfoPO = new CaseAssistInfo(); + caseAssistInfoPO.setId(utilsClient.getNewTimeId()); + caseAssistInfoPO.setCaseId(dslCaseTask.getCaseId()); + caseAssistInfoPO.setAssistUnitId(unitId); + caseAssistInfoPO.setAssistUnitName(unitName); + caseAssistInfoPO.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_0); + caseAssistInfoPO.setCustId(dslCaseTask.getCustId()); + caseAssistInfoPO.setCreateTime(now); + caseAssistInfoPO.setUpdateTime(now); + caseAssistInfoService.save(caseAssistInfoPO); + } + // 更新纠纷扩展信息 + CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold(); + caseInfoUnfoldPO.setId(caseAssistApplyPO.getCaseId()); + caseInfoUnfoldPO.setAssistUnitId(caseAssistApplyPO.getApplyAssistUnitId()); + caseInfoUnfoldPO.setAssistUnitName(caseAssistApplyPO.getApplyAssistUnitName()); + caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO); + } }catch (Exception e){ log.error("[CaseAssistApplyService.reviewCaseAssistApply]调用失败,异常信息:"+e, e); throw new ServiceException("CaseAssistApplyService.reviewCaseAssistApply", e); @@ -204,17 +314,51 @@ * @return long */ public CaseAssistApply caseAssistApplyByCaseId(String caseId){ - QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>(); - caseAssistApplyQueryWrapper.eq("case_id", caseId).eq("apply_status", 0) - .orderByDesc("create_time"); - CaseAssistApply caseAssistApply = mapper.selectOne(caseAssistApplyQueryWrapper); - Map<String, Object> terms = new HashMap<>(); - terms.put("mainId", caseId); - terms.put("ownerIds", "'" + caseAssistApply.getId() + "'"); - List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms); - if(CollectionUtils.isNotEmpty(fileIdInfoBaseDTOList)){ - caseAssistApply.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList()); + try { + QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>(); + caseAssistApplyQueryWrapper.eq("case_id", caseId).eq("apply_status", 0) + .orderByDesc("create_time"); + CaseAssistApply caseAssistApply = mapper.selectOne(caseAssistApplyQueryWrapper); + Map<String, Object> terms = new HashMap<>(); + terms.put("mainId", caseId); + terms.put("ownerIds", "'" + caseAssistApply.getId() + "'"); + List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms); + if (CollectionUtils.isNotEmpty(fileIdInfoBaseDTOList)) { + caseAssistApply.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList()); + } + return caseAssistApply; + }catch(Exception e ){ + log.error("[CaseAssistApplyService.caseAssistApplyByCaseId]调用失败,异常信息:"+e, e); + throw new ServiceException("CaseAssistApplyService.caseAssistApplyByCaseId", e); } - return caseAssistApply; } + + /** + * 首页查询 + * @param auditUnitId 审核组织编号 + * @return long + */ + public long countAssistReview(String auditUnitId){ + return mapper.countAssistReview(auditUnitId); + } + + /** + * 首页-待审核条件统计 + * @param terms 条件 + * @return long + */ + public long countMyTaskAssistReview(Map<String, Object> terms){ + return mapper.countMyTaskAssistReview(terms); + } + + /** + * 按条件查询 + * @param page 分页对象 + * @param terms 条件 + * @return List + */ + public List<FrontPageListDTO> pageMyTaskAssistReview(PageRequest page, Map<String, Object> terms){ + return mapper.pageMyTaskAssistReview(page, terms); + } + } -- Gitblit v1.8.0