From b0b1e641a31a0494262187f97034807fc53515dd Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 28 Oct 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java | 75 ++++++++++++++++++++++++-------------
1 files changed, 48 insertions(+), 27 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 e278d3f..7c4eaac 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,6 +3,7 @@
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
+import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.cases.consts.CaseTaskConsts;
import cn.huge.module.cases.domain.dto.FrontPageListDTO;
import cn.huge.module.cases.domain.po.*;
@@ -17,6 +18,9 @@
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.constant.GridBaseConsts;
+import cn.huge.module.sys.constant.GridEnum;
+import cn.huge.module.sys.constant.SyTimeEnum;
import cn.huge.module.sys.dto.FileIdInfoBaseDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -64,6 +68,8 @@
private CaseInfoUnfoldService caseInfoUnfoldService;
@Autowired
private CaseAssistInfoService caseAssistInfoService;
+ @Autowired
+ private CaseInfoService caseInfoService;
/**
* 更新对象
@@ -179,6 +185,12 @@
caseAssistApply.setAuditUnitId(ctUnitDTO.getId());
caseAssistApply.setAuditUnitName(ctUnitDTO.getUnitName());
mapper.insert(caseAssistApply);
+ CaseInfo caseInfo = caseInfoService.getById(caseAssistApply.getCaseId());
+ CaseTask caseTask = new CaseTask();
+ caseTask.setId(caseInfo.getId());
+ caseTask.setCandeUnitId(caseAssistApply.getAuditUnitId());
+ caseTask.setExpireTime(sysClient.getExpireTime(caseAssistApply.getApplyTime(), SyTimeEnum.SY_TIME_2.getIndex()));
+ caseTaskService.createGridToDo(caseInfo, caseTask, GridEnum.GRID_OBJECT_TYPE_4.getIndex(), GridBaseConsts.GRID_TYPE_4);
}catch (Exception e){
log.error("[CaseAssistApplyService.addCaseAssistApply]调用失败，异常信息："+e, e);
throw new ServiceException("CaseAssistApplyService.addCaseAssistApply", e);
@@ -212,32 +224,33 @@
String unitId = unitIdList[i];
String unitName = unitNameList[i];
// 启动联合处置工作流
- FlowNode dfpFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_LHCZ, caseAssistApplyPO.getCaseId());
- // 新建并完成配合部门待分派任务
+ FlowNode dfpFlowNode = flowInfoService.startFlow(FlowableConsts.GZDYH_LHCZ_V1, 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.setCandeUnitId(loginUser.getUnitId());
+ dfpCaseTask.setCandeUnitName(loginUser.getUnitName());
+ // 联合处置审核任务，不需要签收
dfpCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
dfpCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
dfpCaseTask.setHandleUnitId(loginUser.getUnitId());
dfpCaseTask.setHandleUnitName(loginUser.getUnitName());
+ dfpCaseTask.setHandleDeptId(loginUser.getDeptId());
+ dfpCaseTask.setHandleDeptName(loginUser.getDeptName());
dfpCaseTask.setHandleUserId(loginUser.getId());
dfpCaseTask.setHandleUserName(loginUser.getTrueName());
+ dfpCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
dfpCaseTask.setHandleContent(caseAssistApplyPO.getAuditContent());
dfpCaseTask.setHandleIllust("交办至："+caseAssistApplyPO.getApplyAssistUnitName());
// 任务处理时限
@@ -249,35 +262,33 @@
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.setStatus(CaseTaskConsts.TASK_STATUS_1);
dslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
dslCaseTask.setCustId(caseAssistApplyPO.getCustId());
dslCaseTask.setCreateTime(now);
@@ -287,6 +298,7 @@
CaseAssistInfo caseAssistInfoPO = new CaseAssistInfo();
caseAssistInfoPO.setId(utilsClient.getNewTimeId());
caseAssistInfoPO.setCaseId(dslCaseTask.getCaseId());
+ caseAssistInfoPO.setProcessInstanceId(dslCaseTask.getProcessInstanceId());
caseAssistInfoPO.setAssistUnitId(unitId);
caseAssistInfoPO.setAssistUnitName(unitName);
caseAssistInfoPO.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_0);
@@ -294,6 +306,9 @@
caseAssistInfoPO.setCreateTime(now);
caseAssistInfoPO.setUpdateTime(now);
caseAssistInfoService.save(caseAssistInfoPO);
+ //网格待办流转
+ CaseInfo caseInfo = caseInfoService.getById(caseAssistApplyPO.getCaseId());
+ caseTaskService.taskFlowGridToDo(caseInfo, dslCaseTask, caseInfo.getId(), GridEnum.GRID_OBJECT_TYPE_2.getIndex(), GridBaseConsts.GRID_TYPE_2);
}
// 更新纠纷扩展信息
CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
@@ -301,6 +316,11 @@
caseInfoUnfoldPO.setAssistUnitId(caseAssistApplyPO.getApplyAssistUnitId());
caseInfoUnfoldPO.setAssistUnitName(caseAssistApplyPO.getApplyAssistUnitName());
caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
+ }else{
+ CaseTask caseTask = new CaseTask();
+ caseTask.setCaseId(caseAssistApplyPO.getCaseId());
+ caseTask.setId(caseAssistApplyPO.getCaseId());
+ caseTaskService.deleteGridTodo(caseTask);
}
}catch (Exception e){
log.error("[CaseAssistApplyService.reviewCaseAssistApply]调用失败，异常信息："+e, e);
@@ -310,26 +330,27 @@
/**
* 根据案件编号查询联合处置申请
- * @param caseId 条件
+ * @param id 主键编号
* @return long
*/
- public CaseAssistApply caseAssistApplyByCaseId(String caseId){
+ public CaseAssistApply caseAssistApplyById(String id){
try {
QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
- caseAssistApplyQueryWrapper.eq("case_id", caseId).eq("apply_status", 0)
- .orderByDesc("create_time");
+ caseAssistApplyQueryWrapper.eq("id", id);
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());
+ if(ObjectUtils.isNotEmpty(caseAssistApply)){
+ Map<String, Object> terms = new HashMap<>();
+ terms.put("mainId", caseAssistApply.getCaseId());
+ 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);
+ log.error("[CaseAssistApplyService.caseAssistApplyById]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseAssistApplyService.caseAssistApplyById", e);
}
}
--
Gitblit v1.8.0