From b433e768a5185a6f4ce1f9271e43051b5dc254cc Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Fri, 20 Sep 2024 10:28:56 +0800
Subject: [PATCH] Merge branch 'master' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 431 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 328 insertions(+), 103 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index 0b4cabf..b02338b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -34,6 +34,7 @@
import cn.huge.module.flow.service.FlowInfoService;
import cn.huge.module.mediate.constant.*;
import cn.huge.module.sys.constant.SyTimeEnum;
+import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -94,6 +95,8 @@
private CaseReturnService caseReturnService;
@Autowired
private CaseEvaluateService caseEvaluateService;
+ @Autowired
+ private CaseAssistInfoService caseAssistInfoService;
@Autowired
private CaseWindupApplyMapper caseWindupApplyMapper;
@@ -345,11 +348,13 @@
if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
tabList.add(sxxq);
tabList.add(sxbl);
+ tabList.add(lcdb);
// tabList.add(sqjl);
buttonList.add(tjbljl);
buttonList.add(lhczsq);
buttonList.add(jasq);
+ buttonList.add(db);
}
if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
tabList.add(sxxq);
@@ -442,7 +447,7 @@
// 回退申请节点
if(CaseTaskConsts.TASK_TYPE_2 == caseTask.getTaskType()){
webCaseFlowDTO.setNodeShowName("事件回退");
- CaseReturn caseReturn = caseReturnService.getNewByCaseId(caseId);
+ CaseReturn caseReturn = caseReturnService.getNewByCaseId(caseId, caseTask.getCaseTaskType());
if (StringUtils.isNotEmpty(caseReturn.getReturnContent())) {
webCaseFlowDTO.setHandleNotes("回退理由：" + caseReturn.getReturnContent());
}else {
@@ -515,21 +520,124 @@
result.put("handleCaseFlowList", handleCaseFlowList);
// 查询配合组织流程
- LinkedList<WebCaseFlowDTO> assistCaseFlowList = new LinkedList<>();
- 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){
- WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
- webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- webCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
- webCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
- webCaseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
- webCaseFlowDTO.setTaskType(caseTask.getTaskType());
- webCaseFlowDTO.setStatus(caseTask.getStatus());
- assistCaseFlowList.add(webCaseFlowDTO);
+ List<CaseAssistInfo> caseAssistInfoList = caseAssistInfoService.listByCaseId(caseId);
+ if (CollectionUtils.isNotEmpty(caseAssistInfoList)){
+ LinkedList<WebAssistCaseFlowDTO> assistCaseFlowList = new LinkedList<>();
+ for (CaseAssistInfo caseAssistInfo: caseAssistInfoList){
+ WebAssistCaseFlowDTO webAssistCaseFlowDTO = new WebAssistCaseFlowDTO();
+ webAssistCaseFlowDTO.setUnitId(caseAssistInfo.getAssistUserId());
+ webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUserName());
+ LinkedList<WebCaseFlowDTO> caseFlowList = new LinkedList<>();
+ caseTaskQueryWrapper.clear();
+ caseTaskQueryWrapper.eq("case_id", caseId).eq("cande_unit_id", caseAssistInfo.getAssistUserId())
+ .eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).orderByDesc("create_time");
+ List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
+ for (CaseTask caseTask: assistCaseTaskList){
+ // 已结束节点
+ if (CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
+ // 待受理并已签收的正常任务节点，需要加多一个签收节点
+ if(caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DSL.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DSL.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())){
+ if (CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus() && CaseTaskConsts.TASK_TYPE_1 == caseTask.getTaskType()){
+ WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
+ slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ slWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
+ slWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
+ slWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
+ slWebCaseFlowDTO.setHandleNotes("已签收");
+ slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ slWebCaseFlowDTO.setStatus(caseTask.getStatus());
+ caseFlowList.add(slWebCaseFlowDTO);
+ }
+ }
+ // 普通节点
+ WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
+ webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ webCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
+ webCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
+ webCaseFlowDTO.setStatus(caseTask.getStatus());
+ webCaseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
+ webCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ // 回退申请节点
+ if(CaseTaskConsts.TASK_TYPE_2 == caseTask.getTaskType()){
+ webCaseFlowDTO.setNodeShowName("事件回退");
+ CaseReturn caseReturn = caseReturnService.getNewByCaseId(caseId, caseTask.getCaseTaskType());
+ if (StringUtils.isNotEmpty(caseReturn.getReturnContent())) {
+ webCaseFlowDTO.setHandleNotes("回退理由：" + caseReturn.getReturnContent());
+ }else {
+ webCaseFlowDTO.setHandleNotes("回退理由：-");
+
+ }
+ }
+ // 上报申请节点
+ if(CaseTaskConsts.TASK_TYPE_3 == caseTask.getTaskType()){
+ webCaseFlowDTO.setNodeShowName("事件上报");
+ CaseAppear caseAppear = caseAppearService.getNewByCaseId(caseId);
+ if (StringUtils.isNotEmpty(caseAppear.getAppearContent())) {
+ webCaseFlowDTO.setHandleNotes("上报理由：" + caseAppear.getAppearContent());
+ }else {
+ webCaseFlowDTO.setHandleNotes("上报意见：-" );
+ }
+ }
+ // 当事人评价节点，特殊处理
+ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
+ webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
+ }else{
+ webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
+ }
+ // 审核节点要判断通过/不通过
+ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_JASH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_HTSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex())
+ || caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_HTSH.getIndex())){
+ // 处理不通过，任务类型就是回退
+ if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
+ webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
+ webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
+ webCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
+ }else{
+ // 处理通过
+ webCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
+ webCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
+ }
+ // 临时加上
+ webCaseFlowDTO.setHandleNotes("审核结果："+webCaseFlowDTO.getAuditResultName());
+ }
+ // 结案申请，需要展示化解结果
+ if (FlowNodeEnum.FLOW_NODE_JASQ.getIndex().equals(caseTask.getNodeId())){
+ CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseTask.getCaseId());
+ if (ObjectUtils.isNotEmpty(caseInfoUnfold)){
+ webCaseFlowDTO.setMediResult(caseInfoUnfold.getMediResult());
+ webCaseFlowDTO.setMediResultName(caseInfoUnfold.getMediResultName());
+ // 临时加上
+ webCaseFlowDTO.setHandleNotes("化解结果："+webCaseFlowDTO.getMediResultName());
+ }
+ }
+ caseFlowList.add(webCaseFlowDTO);
+ }else {
+ // 进行中的节点
+ WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
+ webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ webCaseFlowDTO.setStatus(caseTask.getStatus());
+ // 当事人评价节点，特殊处理
+ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
+ webCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
+ }else{
+ webCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
+ }
+ caseFlowList.add(webCaseFlowDTO);
+ }
+ }
+ webAssistCaseFlowDTO.setCaseFlowList(caseFlowList);
+ assistCaseFlowList.add(webAssistCaseFlowDTO);
+ }
+ result.put("assistCaseFlowList", assistCaseFlowList);
}
- result.put("assistCaseFlowList", assistCaseFlowList);
return result;
}catch (Exception e){
log.error("[CaseTaskService.webGetTabButton]调用失败，异常信息："+e, e);
@@ -644,6 +752,7 @@
if(frontPageListDTO.getCaseId().equals(unfold.getId())){
frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
+ frontPageListDTO.setManager(unfold.getMediator());
}
}
}
@@ -721,6 +830,26 @@
/**
* 首页-待审核分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<FrontPageListDTO> pageMyTaskShWSQD(PageRequest page, int type, Map<String, Object> terms){
+ try {
+ long total = 0;
+ List<FrontPageListDTO> frontPageListDTOList = new ArrayList<>();
+ total = mapper.countMyTaskShWSQD(terms);
+ frontPageListDTOList = mapper.pageMyTaskShWSQD(page,terms);
+
+ return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ }catch (Exception e) {
+ log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
+ }
+ }
+
+ /**
+ * 首页-待审核分页查询
* @param caseId 事项编号
* @return Page
*/
@@ -742,12 +871,31 @@
caseAssistApplyQueryWrapper.eq("case_id", caseId);
List<CaseAssistApply>caseAssistApplyList = caseAssistApplyService.list(caseAssistApplyQueryWrapper);
List<SortUtilDTO> sortUtilDTOList = new ArrayList<>();
+
+ String ids = new String();
+ ids += caseReturnList.stream().map(CaseReturn:: getId).collect(Collectors.joining(","));
+ ids += caseAppearList.stream().map(CaseAppear:: getId).collect(Collectors.joining(","));
+ ids += caseWindupApplyList.stream().map(CaseWindupApply:: getId).collect(Collectors.joining(","));
+ ids += caseAssistApplyList.stream().map(CaseAssistApply:: getId).collect(Collectors.joining(","));
+ List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = new ArrayList<>();
+ if(StringUtils.isNotBlank(ids)){
+ Map terms = new HashMap();
+ terms.put("mainId", caseId);
+ terms.put("ownerIds", "," + ids + ",");
+ fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(terms);
+ }
+
for(CaseReturn caseReturn: caseReturnList){
SortUtilDTO sortUtilDTO = new SortUtilDTO();
sortUtilDTO.setObject(caseReturn);
sortUtilDTO.setDate(caseReturn.getCreateTime());
sortUtilDTO.setType("回退申请");
sortUtilDTOList.add(sortUtilDTO);
+ for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
+ if(caseReturn.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
+ sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
+ }
+ }
}
for(CaseAppear caseAppear: caseAppearList){
SortUtilDTO sortUtilDTO = new SortUtilDTO();
@@ -755,6 +903,11 @@
sortUtilDTO.setDate(caseAppear.getCreateTime());
sortUtilDTO.setType("上报申请");
sortUtilDTOList.add(sortUtilDTO);
+ for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
+ if(caseAppear.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
+ sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
+ }
+ }
}
for(CaseWindupApply caseWindupApply: caseWindupApplyList){
SortUtilDTO sortUtilDTO = new SortUtilDTO();
@@ -762,6 +915,11 @@
sortUtilDTO.setDate(caseWindupApply.getCreateTime());
sortUtilDTO.setType("结案申请");
sortUtilDTOList.add(sortUtilDTO);
+ for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
+ if(caseWindupApply.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
+ sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
+ }
+ }
}
for(CaseAssistApply caseAssistApply: caseAssistApplyList){
SortUtilDTO sortUtilDTO = new SortUtilDTO();
@@ -769,6 +927,11 @@
sortUtilDTO.setDate(caseAssistApply.getCreateTime());
sortUtilDTO.setType("联合处置申请");
sortUtilDTOList.add(sortUtilDTO);
+ for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
+ if(caseAssistApply.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
+ sortUtilDTO.setFileList(fileIdTypeInfoBaseDTO.getFileList());
+ }
+ }
}
sortUtilDTOList.sort(Comparator.comparing(SortUtilDTO::getDate));
List<Object> resultList = new ArrayList<>();
@@ -777,8 +940,8 @@
}
return resultList;
}catch (Exception e) {
- log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
- throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
+ log.error("[CaseTaskService.listMyApplyRecord]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.listMyApplyRecord", e);
}
}
@@ -1077,7 +1240,7 @@
caseInfoUnfoldPO.setMediateUnitId(blfkCaseTask.getCandeUnitId());
caseInfoUnfoldPO.setMediateUnitName(blfkCaseTask.getCandeUnitName());
caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
- return dslCaseTask.getId();
+ return blfkCaseTask.getId();
}catch (Exception e){
log.error("[CaseTaskService.webStartFlowZXSL]调用失败，异常信息："+e, e);
throw new ServiceException("CaseTaskService.webStartFlowZXSL", e);
@@ -1188,37 +1351,87 @@
collect(Collectors.joining(BaseConsts.COMMA));
for (AssignAssistUnitDTO assignAssistUnitDTO: assignTaskDTO.getAssistUnitList()){
// 启动联合处置工作流
- FlowNode firstFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_LHCZ, dfpCaseTask.getCaseId());
- // 创建配合部门待受理任务
- CaseTask lhczCaseTask = new CaseTask();
- lhczCaseTask.setId(utilsClient.getNewTimeId());
- lhczCaseTask.setCaseId(dfpCaseTask.getCaseId());
- lhczCaseTask.setFlowableId(firstFlowNode.getFlowableId());
- lhczCaseTask.setProcessInstanceId(firstFlowNode.getProcessInstanceId());
- lhczCaseTask.setProcessTaskId(firstFlowNode.getProcessTaskId());
- lhczCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
- lhczCaseTask.setNodeType(firstFlowNode.getNodeType());
- lhczCaseTask.setNodeId(firstFlowNode.getNodeId());
- lhczCaseTask.setNodeName(firstFlowNode.getNodeName());
- lhczCaseTask.setFlowId(firstFlowNode.getFlowId());
- lhczCaseTask.setNodeShowName(firstFlowNode.getNodeShowName());
- lhczCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
+ FlowNode lhczdfpFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_LHCZ, dfpCaseTask.getCaseId());
+ // 新建并完成配合部门待分派任务
+ CaseTask lhczdfpCaseTask = new CaseTask();
+ lhczdfpCaseTask.setId(utilsClient.getNewTimeId());
+ lhczdfpCaseTask.setCaseId(dfpCaseTask.getCaseId());
+ lhczdfpCaseTask.setFlowableId(lhczdfpFlowNode.getFlowableId());
+ lhczdfpCaseTask.setProcessInstanceId(lhczdfpFlowNode.getProcessInstanceId());
+ lhczdfpCaseTask.setProcessTaskId(lhczdfpFlowNode.getProcessTaskId());
+ lhczdfpCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
+ lhczdfpCaseTask.setNodeType(lhczdfpFlowNode.getNodeType());
+ lhczdfpCaseTask.setNodeId(lhczdfpFlowNode.getNodeId());
+ lhczdfpCaseTask.setNodeName(lhczdfpFlowNode.getNodeName());
+ lhczdfpCaseTask.setFlowId(lhczdfpFlowNode.getFlowId());
+ lhczdfpCaseTask.setNodeShowName(lhczdfpFlowNode.getNodeShowName());
+ lhczdfpCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
// 通过调度的，任务候选执行者类型是上一步骤选择
- lhczCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
- lhczCaseTask.setCandeUnitId(assignAssistUnitDTO.getUitId());
- lhczCaseTask.setCandeUnitName(assignAssistUnitDTO.getUitName());
- // 需要签收
- lhczCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
- lhczCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
+ lhczdfpCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
+ lhczdfpCaseTask.setCandeUnitId(assignAssistUnitDTO.getUitId());
+ lhczdfpCaseTask.setCandeUnitName(assignAssistUnitDTO.getUitName());
+ // 不需要签收
+ lhczdfpCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
+ lhczdfpCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ lhczdfpCaseTask.setHandleUnitId(loginUser.getUnitId());
+ lhczdfpCaseTask.setHandleUnitName(loginUser.getUnitName());
+ lhczdfpCaseTask.setHandleUserId(loginUser.getId());
+ lhczdfpCaseTask.setHandleUserName(loginUser.getTrueName());
+ lhczdfpCaseTask.setHandleContent(assignTaskDTO.getAssignContent());
+ lhczdfpCaseTask.setHandleIllust("交办至："+assistUnitName);
// 任务处理时限
- if (firstFlowNode.getExpire() != 0) {
- lhczCaseTask.setExpireTime(DateUtils.addDay(nowDate, firstFlowNode.getExpire()));
+ if (lhczdfpFlowNode.getExpire() != 0) {
+ lhczdfpCaseTask.setExpireTime(DateUtils.addDay(nowDate, lhczdfpFlowNode.getExpire()));
}
- lhczCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
- lhczCaseTask.setCustId(dfpCaseTask.getCustId());
- lhczCaseTask.setCreateTime(nowDate);
- lhczCaseTask.setUpdateTime(nowDate);
- mapper.insert(lhczCaseTask);
+ lhczdfpCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ lhczdfpCaseTask.setCustId(dfpCaseTask.getCustId());
+ lhczdfpCaseTask.setCreateTime(nowDate);
+ lhczdfpCaseTask.setUpdateTime(nowDate);
+ mapper.insert(lhczdfpCaseTask);
+ // 完成待分派任务
+ FlowNode lhczdslFlowNode = flowInfoService.completeTask(lhczdfpCaseTask.getFlowableId(), lhczdfpCaseTask.getProcessTaskId(),
+ FlowableConsts.OPERATION_forward, loginUser.getId());
+ // 创建配合部门待受理任务
+ CaseTask lhczdslCaseTask = new CaseTask();
+ lhczdslCaseTask.setId(utilsClient.getNewTimeId());
+ lhczdslCaseTask.setCaseId(lhczdfpCaseTask.getCaseId());
+ lhczdslCaseTask.setFlowableId(lhczdslFlowNode.getFlowableId());
+ lhczdslCaseTask.setProcessInstanceId(lhczdslFlowNode.getProcessInstanceId());
+ lhczdslCaseTask.setProcessTaskId(lhczdslFlowNode.getProcessTaskId());
+ lhczdslCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
+ lhczdslCaseTask.setNodeType(lhczdslFlowNode.getNodeType());
+ lhczdslCaseTask.setNodeId(lhczdslFlowNode.getNodeId());
+ lhczdslCaseTask.setNodeName(lhczdslFlowNode.getNodeName());
+ lhczdslCaseTask.setFlowId(lhczdslFlowNode.getFlowId());
+ lhczdslCaseTask.setNodeShowName(lhczdslFlowNode.getNodeShowName());
+ lhczdslCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_2);
+ // 通过调度的，任务候选执行者类型是上一步骤选择
+ lhczdslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
+ lhczdslCaseTask.setCandeUnitId(assignAssistUnitDTO.getUitId());
+ lhczdslCaseTask.setCandeUnitName(assignAssistUnitDTO.getUitName());
+ // 需要签收
+ lhczdslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
+ lhczdslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
+ // 任务处理时限
+ if (lhczdslFlowNode.getExpire() != 0) {
+ lhczdslCaseTask.setExpireTime(DateUtils.addDay(nowDate, lhczdslFlowNode.getExpire()));
+ }
+ lhczdslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ lhczdslCaseTask.setCustId(lhczdfpCaseTask.getCustId());
+ lhczdslCaseTask.setCreateTime(nowDate);
+ lhczdslCaseTask.setUpdateTime(nowDate);
+ mapper.insert(lhczdslCaseTask);
+ // 新增联合处置信息
+ CaseAssistInfo caseAssistInfoPO = new CaseAssistInfo();
+ caseAssistInfoPO.setId(utilsClient.getNewTimeId());
+ caseAssistInfoPO.setCaseId(dslCaseTask.getCaseId());
+ caseAssistInfoPO.setAssistUnitId(assignAssistUnitDTO.getUitId());
+ caseAssistInfoPO.setAssistUnitName(assignAssistUnitDTO.getUitName());
+ caseAssistInfoPO.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_0);
+ caseAssistInfoPO.setCustId(dslCaseTask.getCustId());
+ caseAssistInfoPO.setCreateTime(nowDate);
+ caseAssistInfoPO.setUpdateTime(nowDate);
+ caseAssistInfoService.save(caseAssistInfoPO);
}
// 更新纠纷扩展信息
CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
@@ -1353,6 +1566,15 @@
caseInfoUnfoldPO.setMediateUnitId(blfkCaseTask.getCandeUnitId());
caseInfoUnfoldPO.setMediateUnitName(blfkCaseTask.getCandeUnitName());
caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
+ }else {
+ // 更新配合部门联合处置信息
+ QueryWrapper<CaseAssistInfo> caseAssistInfoQueryWrapper = new QueryWrapper<>();
+ caseAssistInfoQueryWrapper.eq("case_id", blfkCaseTask.getCaseId())
+ .eq("assist_unit_id", loginUser.getUnitId()).eq("assist_status", CaseTaskConsts.ASSIST_STATUS_0);
+ CaseAssistInfo caseAssistInfoPO = caseAssistInfoService.getOne(caseAssistInfoQueryWrapper);
+ caseAssistInfoPO.setCaseTaskId(blfkCaseTask.getId());
+ caseAssistInfoPO.setAcceptTime(nowDate);
+ caseAssistInfoService.updateCaseAssistInfo(caseAssistInfoPO);
}
return blfkCaseTask.getId();
}catch (Exception e){
@@ -1853,7 +2075,7 @@
htshCaseTask.setNodeName(htshFlowNode.getNodeName());
htshCaseTask.setFlowId(htshFlowNode.getFlowId());
htshCaseTask.setNodeShowName(htshFlowNode.getNodeShowName());
- htshCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
+ htshCaseTask.setCaseTaskType(dslCaseTask.getCaseTaskType());
// 受理任务，任务候选执行者类型是上一步骤选择
htshCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId());
@@ -1873,6 +2095,7 @@
mapper.insert(htshCaseTask);
// 新增回退申请信息
caseReturn.setCaseTaskId(htshCaseTask.getId());
+ caseReturn.setCaseTaskType(htshCaseTask.getCaseTaskType());
caseReturnService.save(caseReturn);
}catch (Exception e){
log.error("[CaseTaskService.webAppearApply]调用失败，异常信息："+e, e);
@@ -1914,65 +2137,67 @@
htshCaseTaskPO.setHandleTime(nowDate);
htshCaseTaskPO.setUpdateTime(nowDate);
mapper.updateCaseTask(htshCaseTaskPO);
- // 完成当前回退审核任务，走待分派任务
+ // 完成当前回退审核任务，承办部门走待分派任务，配合部门结束流程
FlowNode dfpFlowNode = flowInfoService.completeTask(htshCaseTask.getFlowableId(), htshCaseTask.getProcessTaskId(),
FlowableConsts.OPERATION_htsh_ty, userId);
- // 新建待分派任务
- CaseTask dfphCaseTask = new CaseTask();
- dfphCaseTask.setId(utilsClient.getNewTimeId());
- dfphCaseTask.setCaseId(htshCaseTask.getCaseId());
- dfphCaseTask.setFlowableId(dfpFlowNode.getFlowableId());
- dfphCaseTask.setProcessInstanceId(dfpFlowNode.getProcessInstanceId());
- dfphCaseTask.setProcessTaskId(dfpFlowNode.getProcessTaskId());
- dfphCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
- dfphCaseTask.setNodeType(dfpFlowNode.getNodeType());
- dfphCaseTask.setNodeId(dfpFlowNode.getNodeId());
- dfphCaseTask.setNodeName(dfpFlowNode.getNodeName());
- dfphCaseTask.setFlowId(dfpFlowNode.getFlowId());
- dfphCaseTask.setNodeShowName(dfpFlowNode.getNodeShowName());
- dfphCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
- // 受理任务，任务候选执行者类型是上一步骤选择
- dfphCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
- dfphCaseTask.setCandeUnitId(loginUser.getUnitId());
- dfphCaseTask.setCandeUnitName(loginUser.getUnitName());
- // 受理后的任务，不需要签收
- dfphCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
- // 任务处理时限
- if (dfpFlowNode.getExpire() != 0) {
- dfphCaseTask.setExpireTime(DateUtils.addDay(nowDate, dfpFlowNode.getExpire()));
+ if (CaseTaskConsts.CASE_TASK_TYPE_1 == htshCaseTask.getCaseTaskType()) {
+ // 新建待分派任务
+ CaseTask dfphCaseTask = new CaseTask();
+ dfphCaseTask.setId(utilsClient.getNewTimeId());
+ dfphCaseTask.setCaseId(htshCaseTask.getCaseId());
+ dfphCaseTask.setFlowableId(dfpFlowNode.getFlowableId());
+ dfphCaseTask.setProcessInstanceId(dfpFlowNode.getProcessInstanceId());
+ dfphCaseTask.setProcessTaskId(dfpFlowNode.getProcessTaskId());
+ dfphCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
+ dfphCaseTask.setNodeType(dfpFlowNode.getNodeType());
+ dfphCaseTask.setNodeId(dfpFlowNode.getNodeId());
+ dfphCaseTask.setNodeName(dfpFlowNode.getNodeName());
+ dfphCaseTask.setFlowId(dfpFlowNode.getFlowId());
+ dfphCaseTask.setNodeShowName(dfpFlowNode.getNodeShowName());
+ dfphCaseTask.setCaseTaskType(htshCaseTask.getCaseTaskType());
+ // 受理任务，任务候选执行者类型是上一步骤选择
+ dfphCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
+ dfphCaseTask.setCandeUnitId(loginUser.getUnitId());
+ dfphCaseTask.setCandeUnitName(loginUser.getUnitName());
+ // 受理后的任务，不需要签收
+ dfphCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
+ // 任务处理时限
+ if (dfpFlowNode.getExpire() != 0) {
+ dfphCaseTask.setExpireTime(DateUtils.addDay(nowDate, dfpFlowNode.getExpire()));
+ }
+ dfphCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
+ dfphCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ dfphCaseTask.setCustId(dfphCaseTask.getCustId());
+ dfphCaseTask.setCreateTime(nowDate);
+ dfphCaseTask.setUpdateTime(nowDate);
+ mapper.insert(dfphCaseTask);
+ // 更新纠纷信息
+ CaseInfo caseInfoPO = new CaseInfo();
+ caseInfoPO.setId(htshCaseTask.getCaseId());
+ caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_1.getIndex());
+ caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_1.getDes());
+ caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
+ caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
+ caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
+ caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
+ caseInfoPO.setUpdateTime(nowDate);
+ caseInfoService.updateCaseInfo(caseInfoPO);
}
- dfphCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
- dfphCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
- dfphCaseTask.setCustId(dfphCaseTask.getCustId());
- dfphCaseTask.setCreateTime(nowDate);
- dfphCaseTask.setUpdateTime(nowDate);
- mapper.insert(dfphCaseTask);
- // 更新纠纷信息
- CaseInfo caseInfoPO = new CaseInfo();
- caseInfoPO.setId(htshCaseTask.getCaseId());
- caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_1.getIndex());
- caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_1.getDes());
- caseInfoPO.setProcess(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getIndex());
- caseInfoPO.setProcessName(CaseProcessBaseConstsEnum.getByStatus(caseInfoPO.getStatus()).getDes());
- caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
- caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
- caseInfoPO.setUpdateTime(nowDate);
- caseInfoService.updateCaseInfo(caseInfoPO);
}else {
// 审核不通过
// 完成当前回退审核任务
- CaseTask sbshCaseTaskPO = new CaseTask();
- sbshCaseTaskPO.setId(caseReturn.getCaseTaskId());
- sbshCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
- sbshCaseTaskPO.setHandleUnitId(loginUser.getUnitId());
- sbshCaseTaskPO.setHandleUnitName(loginUser.getUnitName());
- sbshCaseTaskPO.setHandleUserId(loginUser.getId());
- sbshCaseTaskPO.setHandleUserName(loginUser.getTrueName());
- sbshCaseTaskPO.setHandleContent(caseReturn.getAuditContent());
- sbshCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_2);
- sbshCaseTaskPO.setHandleTime(nowDate);
- sbshCaseTaskPO.setUpdateTime(nowDate);
- mapper.updateCaseTask(sbshCaseTaskPO);
+ CaseTask htshCaseTaskPO = new CaseTask();
+ htshCaseTaskPO.setId(caseReturn.getCaseTaskId());
+ htshCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ htshCaseTaskPO.setHandleUnitId(loginUser.getUnitId());
+ htshCaseTaskPO.setHandleUnitName(loginUser.getUnitName());
+ htshCaseTaskPO.setHandleUserId(loginUser.getId());
+ htshCaseTaskPO.setHandleUserName(loginUser.getTrueName());
+ htshCaseTaskPO.setHandleContent(caseReturn.getAuditContent());
+ htshCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_2);
+ htshCaseTaskPO.setHandleTime(nowDate);
+ htshCaseTaskPO.setUpdateTime(nowDate);
+ mapper.updateCaseTask(htshCaseTaskPO);
CaseReturn btyCaseReturn = caseReturnService.getById(caseReturn.getId());
CtUnitDTO returnUnit = custClient.getUnitById(btyCaseReturn.getReturnUnitId());
String operation = FlowableConsts.OPERATION_htsh_bty;
@@ -1998,7 +2223,7 @@
dslCaseTask.setNodeName(dslFlowNode.getNodeName());
dslCaseTask.setFlowId(dslFlowNode.getFlowId());
dslCaseTask.setNodeShowName(dslFlowNode.getNodeShowName());
- dslCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
+ dslCaseTask.setCaseTaskType(htshCaseTask.getCaseTaskType());
// 受理任务，任务候选执行者类型是上一步骤选择
dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
dslCaseTask.setCandeUnitId(btyCaseReturn.getReturnUnitId());
@@ -2017,8 +2242,8 @@
mapper.insert(dslCaseTask);
}
}catch (Exception e){
- log.error("[CaseTaskService.webAppearAudit]调用失败，异常信息："+e, e);
- throw new ServiceException("CaseTaskService.webAppearAudit", e);
+ log.error("[CaseTaskService.webReturnAudit]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseTaskService.webReturnAudit", e);
}
}
--
Gitblit v1.8.0