From ce8db97536e2ffa4513c79f39939ed796c5160ff Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 16:53:26 +0800
Subject: [PATCH] 1、获取tab和button接口优化
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 1457 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 953 insertions(+), 504 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 9cc3474..8a588d4 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
@@ -22,6 +22,8 @@
import cn.huge.module.cust.constant.UserBaseConsts;
import cn.huge.module.cust.dto.CtUnitDTO;
import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.draft.domain.po.CasedraftInfo;
+import cn.huge.module.draft.service.CasedraftInfoService;
import cn.huge.module.mediate.constant.AuditBaseConsts;
import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
import cn.huge.module.disp.constant.DispBaseConstsEnum;
@@ -34,11 +36,13 @@
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;
import com.google.common.collect.Maps;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -93,15 +97,12 @@
private CaseReturnService caseReturnService;
@Autowired
private CaseEvaluateService caseEvaluateService;
-
@Autowired
- private CaseWindupApplyMapper caseWindupApplyMapper;
+ private CaseAssistInfoService caseAssistInfoService;
@Autowired
- private CaseReturnMapper caseReturnMapper;
+ private CaseDismissService caseDismissService;
@Autowired
- private CaseAppearMapper caseAppearMapper;
- @Autowired
- private CaseAssistApplyMapper caseAssistApplyMapper;
+ private CasedraftInfoService casedraftInfoService;
/**
* 更新对象
@@ -194,14 +195,26 @@
}
/**
+ * 根据纠纷编号查询进行中的配合部门任务
+ * @param caseId
+ * @return
+ */
+ public List<CaseTask> listAssistTasking(String caseId){
+ // 查询配合部门的任务
+ QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
+ caseTaskQueryWrapper.eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).eq("case_id", caseId)
+ .eq("status", CaseTaskConsts.TASK_STATUS_1);
+ List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
+ return assistCaseTaskList;
+ }
+
+ /**
* web端-任务出来页面-初始化tab和按钮
* @param caseTaskId
* @return
*/
public TabButtonDTO webGetTabButton(String caseTaskId, String userId){
try{
- // 查询当前任务信息
- CaseTask caseTask = mapper.selectById(caseTaskId);
// 定义tab
TabButtonInfoDTO sxxq = new TabButtonInfoDTO();
sxxq.setId("sxxq");
@@ -212,9 +225,9 @@
TabButtonInfoDTO sxbl = new TabButtonInfoDTO();
sxbl.setId("sxbl");
sxbl.setName("事项办理");
-// TabButtonInfoDTO sqjl = new TabButtonInfoDTO();
-// sqjl.setId("sqjl");
-// sqjl.setName("申请记录");
+ TabButtonInfoDTO sqjl = new TabButtonInfoDTO();
+ sqjl.setId("sqjl");
+ sqjl.setName("申请记录");
TabButtonInfoDTO htsh = new TabButtonInfoDTO();
htsh.setId("htsh");
htsh.setName("回退审核");
@@ -233,6 +246,9 @@
TabButtonInfoDTO daxx = new TabButtonInfoDTO();
daxx.setId("daxx");
daxx.setName("档案信息");
+ TabButtonInfoDTO byslxq = new TabButtonInfoDTO();
+ byslxq.setId("byslxq");
+ byslxq.setName("详情");
// 定义button
TabButtonInfoDTO tjbljl = new TabButtonInfoDTO();
@@ -262,113 +278,167 @@
TabButtonInfoDTO sb = new TabButtonInfoDTO();
sb.setId("sb");
sb.setName("上报");
+ TabButtonInfoDTO bysl = new TabButtonInfoDTO();
+ bysl.setId("bysl");
+ bysl.setName("不予受理");
+
// 根据流程显示tab
List<TabButtonInfoDTO> tabList = new LinkedList<>();
// 根据流程显示button
List<TabButtonInfoDTO> buttonList = new LinkedList<>();
+ // 查询当前任务信息
+ CaseTask caseTask = mapper.selectById(caseTaskId);
if (ObjectUtils.isNotEmpty(caseTask)) {
- if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
- tabList.add(dslxq);
-// tabList.add(sqjl);
+ // 任务已完成
+ if (CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
+ // 不予受理
+ if (ObjectUtils.isNotEmpty(caseTask.getHandleResult()) && CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
+ tabList.add(byslxq);
+ tabList.add(sqjl);
+ }else {
+ CaseInfo caseInfo = caseInfoService.getById(caseTask.getCaseId());
+ if (CaseProcessBaseConstsEnum.CASE_PROCESS_6.getIndex() != caseInfo.getProcess()){
+ daxx.setName("详情");
+ }
+ tabList.add(daxx);
+ tabList.add(lcdb);
+ tabList.add(sqjl);
+ }
+ }else {
+ // 进行中任务
+ if (FlowNodeEnum.FLOW_NODE_ZJ_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(zxsl);
+ buttonList.add(jb);
+ buttonList.add(sb);
+ buttonList.add(bysl);
+ }
+ 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(sl);
+ buttonList.add(ht);
+ buttonList.add(bysl);
+ }
+ 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(zxsl);
+ buttonList.add(jb);
+ buttonList.add(sb);
+ buttonList.add(bysl);
+ }
+ 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(sl);
+ buttonList.add(ht);
+ buttonList.add(bysl);
+ }
+ 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(zxsl);
+ buttonList.add(jb);
+ buttonList.add(bysl);
+ }
+ 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(sl);
+ buttonList.add(ht);
+ buttonList.add(bysl);
+ }
+ 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())) {
+ if (CaseTaskConsts.CASE_TASK_TYPE_1 == caseTask.getCaseTaskType()) {
+ tabList.add(sxxq);
+ tabList.add(sxbl);
+ tabList.add(lcdb);
+ 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);
+ buttonList.add(tjbljl);
+ buttonList.add(lhczsq);
+ buttonList.add(jasq);
+ buttonList.add(db);
+ } else {
+ tabList.add(sxxq);
+ tabList.add(sxbl);
+ tabList.add(lcdb);
+ tabList.add(sqjl);
+
+ buttonList.add(tjbljl);
+ }
+ }
+ 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);
+ }
+ if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
+ tabList.add(dslxq);
+ tabList.add(sqjl);
+
+ buttonList.add(sl);
+ buttonList.add(ht);
+ }
+ if (FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
+ sxxq.setName("详情");
+ tabList.add(sxxq);
+ tabList.add(sqjl);
+ tabList.add(htsh);
+ }
}
}else {
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(lhczsh);
}
// 封装数据
@@ -401,7 +471,6 @@
}else {
lfdj.setNodeShowName(caseInfo.getCanalName());
lfdj.setHandleUnitName(caseInfo.getInputUserName()+"（当事人）");
- lfdj.setHandleUserName(caseInfo.getInputUserName());
}
lfdj.setTaskType(CaseTaskConsts.TASK_TYPE_1);
lfdj.setStatus(CaseTaskConsts.TASK_STATUS_2);
@@ -411,126 +480,274 @@
QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_1).orderByAsc("id");
List<CaseTask> handleCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
-
for (CaseTask caseTask: handleCaseTaskList){
- WebCaseFlowDTO webCaseFlowDTO = new WebCaseFlowDTO();
- if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
+ // 已结束节点
+ 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.getCandeUnitName());
+ slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
+ slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
+ slWebCaseFlowDTO.setHandleNotes("已签收");
+ slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ slWebCaseFlowDTO.setStatus(caseTask.getStatus());
+ handleCaseFlowList.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.setProcessName(caseInfo.getProcessName());
+ webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
}
- webCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
- webCaseFlowDTO.setTaskType(caseTask.getTaskType());
- webCaseFlowDTO.setStatus(caseTask.getStatus());
- }else {
- webCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- webCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
- webCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
- webCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
- webCaseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
- webCaseFlowDTO.setTaskType(caseTask.getTaskType());
- // todo 审核不通过、通过的展示，有调解结果的
- if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
-
- }
- if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
-
- }
- webCaseFlowDTO.setStatus(caseTask.getStatus());
- }
- handleCaseFlowList.add(webCaseFlowDTO);
- // 待受理节点，已签收的并处理完，需要加多一个受理节点
- 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())){
- if(CaseTaskConsts.SIGN_STATUS_2 == caseTask.getSignStatus()
- && CaseTaskConsts.TASK_STATUS_2 == caseTask.getStatus()){
- WebCaseFlowDTO slWebCaseFlowDTO = new WebCaseFlowDTO();
- if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
- if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
- slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- slWebCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
- }else{
- slWebCaseFlowDTO.setProcessName(caseInfo.getProcessName());
- }
- slWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
- slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
- slWebCaseFlowDTO.setStatus(caseTask.getStatus());
- }else {
- slWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- slWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
- slWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
- slWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
- slWebCaseFlowDTO.setHandleNotes("已受理");
- if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
- slWebCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
- slWebCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
- slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
- }
- if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
- slWebCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
- slWebCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
- slWebCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
- }
- slWebCaseFlowDTO.setStatus(caseTask.getStatus());
- }
- handleCaseFlowList.add(slWebCaseFlowDTO);
- }
- }
-
- // 办理反馈节点，加上化解结果
- if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_BLFK.getIndex())){
- WebCaseFlowDTO blfkWebCaseFlowDTO = new WebCaseFlowDTO();
- if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
- if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
- blfkWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- blfkWebCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
- }else{
- blfkWebCaseFlowDTO.setProcessName(caseInfo.getProcessName());
- }
- blfkWebCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
- blfkWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
- blfkWebCaseFlowDTO.setStatus(caseTask.getStatus());
- }else {
- blfkWebCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
- blfkWebCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
- blfkWebCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
- blfkWebCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
- CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
- blfkWebCaseFlowDTO.setHandleNotes("化解结果："+caseInfoUnfold.getMediResultName());
- blfkWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
- // todo 审核不通过、通过的展示，有调解结果的
- if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
-
- }
+ // 审核节点要判断通过/不通过
+ 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());
}
- blfkWebCaseFlowDTO.setStatus(caseTask.getStatus());
+ // 临时加上
+ webCaseFlowDTO.setHandleNotes("审核结果："+webCaseFlowDTO.getAuditResultName());
}
- handleCaseFlowList.add(blfkWebCaseFlowDTO);
+ // 结案申请，需要展示化解结果
+ 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());
+ }
+ }
+ // 不予受理
+ if (CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
+ webCaseFlowDTO.setNodeShowName("不予受理");
+ webCaseFlowDTO.setHandleNotes(null);
+ webCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_4);
+ }
+ handleCaseFlowList.add(webCaseFlowDTO);
+ }else {
+ // 进行中的节点
+ // 待受理并已签收的正常任务节点，需要加多一个签收节点
+ 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.getCandeUnitName());
+ slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
+ slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
+ slWebCaseFlowDTO.setHandleNotes("已签收");
+ slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ slWebCaseFlowDTO.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ handleCaseFlowList.add(slWebCaseFlowDTO);
+ }
+ }
+ // 正常节点
+ 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.setProcessName(caseTask.getCandeUnitName());
+ }
+ handleCaseFlowList.add(webCaseFlowDTO);
}
}
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.getAssistUnitId());
+ if (CaseTaskConsts.ASSIST_STATUS_0 == caseAssistInfo.getAssistStatus()) {
+ webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName());
+ }else {
+ webAssistCaseFlowDTO.setUnitName(caseAssistInfo.getAssistUnitName()+"（已回退）");
+ }
+ LinkedList<WebCaseFlowDTO> caseFlowList = new LinkedList<>();
+ caseTaskQueryWrapper.clear();
+ caseTaskQueryWrapper.eq("case_id", caseId).eq("cande_unit_id", caseAssistInfo.getAssistUnitId())
+ .eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).orderByAsc("id");
+ 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.getCandeUnitName());
+ slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
+ slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
+ 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 {
+ // 进行中的节点
+ // 待受理并已签收的正常任务节点，需要加多一个签收节点
+ 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.getCandeUnitName());
+ slWebCaseFlowDTO.setHandleUserName(caseTask.getSignUserName());
+ slWebCaseFlowDTO.setHandleTime(caseTask.getSignTime());
+ slWebCaseFlowDTO.setHandleNotes("已签收");
+ slWebCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ slWebCaseFlowDTO.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ caseFlowList.add(slWebCaseFlowDTO);
+ }
+ }
+ // 正常节点
+ 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.setProcessName(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);
@@ -557,6 +774,16 @@
long countAppearReview = caseAppearService.countAppearReview(loginUser.getUnitId());
long countAssistReview = caseAssistApplyService.countAssistReview(loginUser.getUnitId());
frontPageCountDTO.setWaitReview(countApplyReview+countReturnReview+countAppearReview+countAssistReview);
+ // 已办
+ Map<String, Object> ybTerms = new HashMap<>();
+ ybTerms.put("handleUnitId", loginUser.getUnitId());
+ long alreadyDone = mapper.countMyTaskYb(ybTerms);
+ frontPageCountDTO.setAlreadyDone(alreadyDone);
+ // 已办
+ Map<String, Object> cgTerms = new HashMap<>();
+ cgTerms.put("inputUnitId", loginUser.getUnitId());
+ long caseDraft = casedraftInfoService.countTerms(cgTerms);
+ frontPageCountDTO.setCaseDraft(caseDraft);
return frontPageCountDTO;
}catch (Exception e) {
log.error("[CaseTaskService.getCountList]调用失败，异常信息：" + e, e);
@@ -565,16 +792,16 @@
}
/**
- * 首页-查询待办任务-受分派
+ * 首页-查询待办任务-待/已分派
* @param page 分页对象
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskFp(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListFPDTO> pageMyTaskFp(PageRequest page, Map<String, Object> terms){
try {
long total = mapper.countMyTaskFp(terms);
- List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskFp(page, terms);
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ List<FrontPageListFPDTO> frontPageListFPDTOList = mapper.pageMyTaskFp(page, terms);
+ return new PageImpl<FrontPageListFPDTO>(frontPageListFPDTOList, page, total);
}catch (Exception e) {
log.error("[CaseTaskService.pageMyTaskFp]调用失败，异常信息：" + e, e);
throw new ServiceException("CaseTaskService.pageMyTaskFp", e);
@@ -583,16 +810,16 @@
}
/**
- * 首页-查询待办任务-受签收
+ * 首页-查询待办任务-待/已签收
* @param page 分页对象
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskQs(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListQSDTO> pageMyTaskQs(PageRequest page, Map<String, Object> terms){
try {
long total = mapper.countMyTaskQs(terms);
- List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskQs(page, terms);
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ List<FrontPageListQSDTO> frontPageListDTOList = mapper.pageMyTaskQs(page, terms);
+ return new PageImpl<FrontPageListQSDTO>(frontPageListDTOList, page, total);
}catch (Exception e) {
log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
@@ -600,19 +827,19 @@
}
/**
- * 首页-查询待办任务-受待理
+ * 首页-查询待办任务-待/已受理
* @param page 分页对象
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskSl(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListSLDTO> pageMyTaskSl(PageRequest page, Map<String, Object> terms){
try {
long total = mapper.countMyTaskSl(terms);
- List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskSl(page, terms);
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ List<FrontPageListSLDTO> frontPageListDTOList = mapper.pageMyTaskSl(page, terms);
+ return new PageImpl<FrontPageListSLDTO>(frontPageListDTOList, page, total);
}catch (Exception e) {
- log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
- throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
+ log.error("[CaseTaskService.pageMyTaskSl]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskSl", e);
}
}
@@ -622,38 +849,22 @@
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListBLZDTO> pageMyTaskBlz(PageRequest page, Map<String, Object> terms){
try {
- long total = mapper.countMyTaskProcessing(terms);
- List<FrontPageListDTO> frontPageListDTOList = mapper.pageMyTaskProcessing(page, terms);
- List<String> caseIdList = new ArrayList<>();
+ long total = mapper.countMyTaskBlz(terms);
+ List<FrontPageListBLZDTO> frontPageListBLZDTOList = mapper.pageMyTaskBlz(page, terms);
Date now = DateUtils.getNowDate();
- for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
- long milliseconds1 = frontPageListDTO.getTurnaroundTime().getTime();
+ for(FrontPageListBLZDTO frontPageListBLZDTO: frontPageListBLZDTOList){
+ long milliseconds1 = frontPageListBLZDTO.getTurnaroundTime().getTime();
long milliseconds2 = now.getTime();
long diff = milliseconds2 - milliseconds1;
long daysBetween = diff / (24 * 60 * 60 * 1000);
- frontPageListDTO.setProcessingDays(daysBetween);
- caseIdList.add(frontPageListDTO.getCaseId());
+ frontPageListBLZDTO.setProcessingDays(daysBetween);
}
- if(CollectionUtils.isNotEmpty(caseIdList)){
- QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
- unfoldQueryWrapper.in("id", caseIdList);
- List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
- for(CaseInfoUnfold unfold: unfoldList){
- for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
- if(frontPageListDTO.getCaseId().equals(unfold.getId())){
- frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
- frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
- }
- }
- }
- }
-
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ return new PageImpl<FrontPageListBLZDTO>(frontPageListBLZDTOList, page, total);
}catch (Exception e) {
- log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
- throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
+ log.error("[CaseTaskService.pageMyTaskBlz]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskBlz", e);
}
}
@@ -663,30 +874,14 @@
* @param terms 条件
* @return Page
*/
- public Page<FrontPageListDTO> pageMyTaskBl(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListJADTO> pageMyTaskJa(PageRequest page, Map<String, Object> terms){
try {
- long total = caseWindupApplyService.countMySubmitApplyReview(terms);
- List<FrontPageListDTO> frontPageListDTOList = caseWindupApplyService.listMySubmitApplyReview(page, terms);
-
- List<String> caseIdList = new ArrayList<>();
- caseIdList = frontPageListDTOList.stream().map(FrontPageListDTO ::getCaseId).collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(caseIdList)){
- QueryWrapper<CaseInfoUnfold> unfoldQueryWrapper = new QueryWrapper<>();
- unfoldQueryWrapper.in("id", caseIdList);
- List<CaseInfoUnfold> unfoldList = caseInfoUnfoldService.list(unfoldQueryWrapper);
- for(CaseInfoUnfold unfold: unfoldList){
- for(FrontPageListDTO frontPageListDTO: frontPageListDTOList){
- if(frontPageListDTO.getCaseId().equals(unfold.getId())){
- frontPageListDTO.setOrganizingUnit(unfold.getMediateUnitName());
- frontPageListDTO.setCooperatingUnit(unfold.getAssistUnitName());
- }
- }
- }
- }
- return new PageImpl<FrontPageListDTO>(frontPageListDTOList, page, total);
+ long total = caseWindupApplyService.countMyTaskJa(terms);
+ List<FrontPageListJADTO> frontPageListJADTOList = caseWindupApplyService.listMyTaskJa(page, terms);
+ return new PageImpl<FrontPageListJADTO>(frontPageListJADTOList, page, total);
}catch (Exception e) {
- log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
- throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
+ log.error("[CaseTaskService.pageMyTaskJa]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskJa", e);
}
}
@@ -722,6 +917,23 @@
/**
* 首页-待审核分页查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<FrontPageListWSQDDTO> pageMyTaskShWSQD(PageRequest page, Map<String, Object> terms){
+ try {
+ long total = mapper.countMyTaskShWSQD(terms);
+ List<FrontPageListWSQDDTO> frontPageListWSQDDTOList = mapper.pageMyTaskShWSQD(page,terms);
+ return new PageImpl<FrontPageListWSQDDTO>(frontPageListWSQDDTOList, page, total);
+ }catch (Exception e) {
+ log.error("[CaseTaskService.pageMyTaskQs]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskQs", e);
+ }
+ }
+
+ /**
+ * 首页-待审核分页查询
* @param caseId 事项编号
* @return Page
*/
@@ -743,12 +955,33 @@
caseAssistApplyQueryWrapper.eq("case_id", caseId);
List<CaseAssistApply>caseAssistApplyList = caseAssistApplyService.list(caseAssistApplyQueryWrapper);
List<SortUtilDTO> sortUtilDTOList = new ArrayList<>();
+
+ List<String> idList = new ArrayList<>();
+ String ids = new String();
+ idList.addAll(caseReturnList.stream().map(CaseReturn:: getId).collect(Collectors.toList()));
+ idList.addAll(caseAppearList.stream().map(CaseAppear:: getId).collect(Collectors.toList()));
+ idList.addAll(caseWindupApplyList.stream().map(CaseWindupApply:: getId).collect(Collectors.toList()));
+ idList.addAll(caseAssistApplyList.stream().map(CaseAssistApply:: getId).collect(Collectors.toList()));
+ ids = idList.stream().map(String::valueOf).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();
@@ -756,6 +989,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();
@@ -763,6 +1001,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();
@@ -770,6 +1013,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<>();
@@ -778,8 +1026,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);
}
}
@@ -789,55 +1037,53 @@
* @return
*/
public List<WechatCaseFlowDTO> wechatListCaseFlow(String caseId, String userId){
- try{
- // 封装办理流程
- List<WechatCaseFlowDTO> list = new ArrayList<>();
- CaseInfo caseInfo = caseInfoService.getById(caseId);
- // 提交申请
- WechatCaseFlowDTO tjsq = new WechatCaseFlowDTO();
- tjsq.setProcessName("提交申请");
- tjsq.setVisitWayName(caseInfo.getVisitWayName());
- tjsq.setShowTime(caseInfo.getCreateTime());
- tjsq.setCaseTypeName(caseInfo.getCaseTypeName());
- list.add(tjsq);
- // 办理中
- if (caseInfo.getInfoProcess() == CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2.getIndex()){
- CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
- WechatCaseFlowDTO sxbl = new WechatCaseFlowDTO();
- sxbl.setProcessName("事项办理");
- sxbl.setShowTime(caseInfoUnfold.getAcceptTime());
- sxbl.setMediateUnitName(caseInfoUnfold.getMediateUnitName());
- list.add(sxbl);
- }
- // 已结案
- if (caseInfo.getInfoProcess() == CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2.getIndex()){
- CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
- WechatCaseFlowDTO sxbj = new WechatCaseFlowDTO();
- sxbj.setProcessName("事项办结");
- sxbj.setShowTime(caseInfoUnfold.getCloseTime());
- sxbj.setMediResult(caseInfoUnfold.getMediResult());
- sxbj.setMediResultName(caseInfoUnfold.getMediResultName());
- list.add(sxbj);
- }
- // 评价
- QueryWrapper<CaseEvaluate> caseEvaluateQueryWrapper = new QueryWrapper<>();
- caseEvaluateQueryWrapper.eq("case_id", caseId).orderByDesc("create_time");
- List<CaseEvaluate> caseEvaluateList = caseEvaluateService.list(caseEvaluateQueryWrapper);
- if (CollectionUtils.isNotEmpty(caseEvaluateList)){
- CaseEvaluate caseEvaluate = caseEvaluateList.get(0);
- WechatCaseFlowDTO sxpj = new WechatCaseFlowDTO();
- sxpj.setProcessName("事项评价");
- sxpj.setShowTime(caseEvaluate.getCreateTime());
- sxpj.setEvaluateUserName(caseEvaluate.getEvaluateUserName());
- sxpj.setEvaluateGrade(caseEvaluate.getEvaluateGrade());
- sxpj.setEvaluateRemark(caseEvaluate.getEvaluateRemark());
- list.add(sxpj);
- }
- return list;
- }catch (Exception e){
- log.error("[CaseTaskService.wechatListCaseFlow]调用失败，异常信息："+e, e);
- throw new ServiceException("CaseTaskService.wechatListCaseFlow", e);
+ // 封装办理流程
+ List<WechatCaseFlowDTO> list = new ArrayList<>();
+ CaseInfo caseInfo = caseInfoService.getById(caseId);
+ // 提交申请
+ WechatCaseFlowDTO tjsq = new WechatCaseFlowDTO();
+ tjsq.setProcessName("提交申请");
+ tjsq.setVisitWayName(caseInfo.getVisitWayName());
+ tjsq.setShowTime(caseInfo.getCreateTime());
+ tjsq.setCaseTypeName(caseInfo.getCaseTypeName());
+ tjsq.setProcessStep(1);
+ list.add(tjsq);
+ CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
+ // 办理中
+ if (caseInfo.getInfoProcess() >= CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2.getIndex()){
+ WechatCaseFlowDTO sxbl = new WechatCaseFlowDTO();
+ sxbl.setProcessName("事项办理");
+ sxbl.setShowTime(caseInfoUnfold.getAcceptTime());
+ sxbl.setMediateUnitName(caseInfoUnfold.getMediateUnitName());
+ sxbl.setProcessStep(2);
+ list.add(sxbl);
}
+ // 已结案
+ if (caseInfo.getInfoProcess() >= CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_3.getIndex()){
+ WechatCaseFlowDTO sxbj = new WechatCaseFlowDTO();
+ sxbj.setProcessName("事项办结");
+ sxbj.setShowTime(caseInfoUnfold.getCloseTime());
+ sxbj.setMediResult(caseInfoUnfold.getMediResult());
+ sxbj.setMediResultName(caseInfoUnfold.getMediResultName());
+ sxbj.setProcessStep(3);
+ list.add(sxbj);
+ }
+ // 评价
+ QueryWrapper<CaseEvaluate> caseEvaluateQueryWrapper = new QueryWrapper<>();
+ caseEvaluateQueryWrapper.eq("case_id", caseId).orderByDesc("create_time");
+ List<CaseEvaluate> caseEvaluateList = caseEvaluateService.list(caseEvaluateQueryWrapper);
+ if (CollectionUtils.isNotEmpty(caseEvaluateList)){
+ CaseEvaluate caseEvaluate = caseEvaluateList.get(0);
+ WechatCaseFlowDTO sxpj = new WechatCaseFlowDTO();
+ sxpj.setProcessName("事项评价");
+ sxpj.setShowTime(caseEvaluate.getCreateTime());
+ sxpj.setEvaluateUserName(caseEvaluate.getEvaluateUserName());
+ sxpj.setEvaluateGrade(caseEvaluate.getEvaluateGrade());
+ sxpj.setEvaluateRemark(caseEvaluate.getEvaluateRemark());
+ sxpj.setProcessStep(4);
+ list.add(sxpj);
+ }
+ return list;
}
/**
@@ -918,6 +1164,10 @@
// 系统给综治中心分派，不需要签收
dfpCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
dfpCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ // 任务处理时限
+ if (firstFlowNode.getExpire() != 0) {
+ dfpCaseTask.setExpireTime(DateUtils.addDay(caseInfo.getCreateTime(), firstFlowNode.getExpire()));
+ }
dfpCaseTask.setHandleUnitName("系统派单");
dfpCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
dfpCaseTask.setHandleIllust("派单至："+caseDispBaseDTO.getTargetName());
@@ -931,36 +1181,36 @@
FlowNode secondFlowNode = flowInfoService.completeTask(dfpCaseTask.getFlowableId(), dfpCaseTask.getProcessTaskId(),
FlowableConsts.OPERATION_jb_zszz, "系统派单");
// 进入第2个节点-镇街级组织待受理
- CaseTask sdlCaseTask = new CaseTask();
- sdlCaseTask.setId(utilsClient.getNewTimeId());
- sdlCaseTask.setCaseId(caseInfo.getId());
- sdlCaseTask.setFlowableId(secondFlowNode.getFlowableId());
- sdlCaseTask.setProcessInstanceId(secondFlowNode.getProcessInstanceId());
- sdlCaseTask.setProcessTaskId(secondFlowNode.getProcessTaskId());
- sdlCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
- sdlCaseTask.setNodeType(secondFlowNode.getNodeType());
- sdlCaseTask.setNodeId(secondFlowNode.getNodeId());
- sdlCaseTask.setNodeName(secondFlowNode.getNodeName());
- sdlCaseTask.setFlowId(secondFlowNode.getFlowId());
- sdlCaseTask.setNodeShowName(secondFlowNode.getNodeShowName());
- sdlCaseTask.setCaseTaskType(dfpCaseTask.getCaseTaskType());
+ CaseTask dslCaseTask = new CaseTask();
+ dslCaseTask.setId(utilsClient.getNewTimeId());
+ dslCaseTask.setCaseId(caseInfo.getId());
+ dslCaseTask.setFlowableId(secondFlowNode.getFlowableId());
+ dslCaseTask.setProcessInstanceId(secondFlowNode.getProcessInstanceId());
+ dslCaseTask.setProcessTaskId(secondFlowNode.getProcessTaskId());
+ dslCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
+ dslCaseTask.setNodeType(secondFlowNode.getNodeType());
+ dslCaseTask.setNodeId(secondFlowNode.getNodeId());
+ dslCaseTask.setNodeName(secondFlowNode.getNodeName());
+ dslCaseTask.setFlowId(secondFlowNode.getFlowId());
+ dslCaseTask.setNodeShowName(secondFlowNode.getNodeShowName());
+ dslCaseTask.setCaseTaskType(dfpCaseTask.getCaseTaskType());
// 通过调度的，任务候选执行者类型是上一步骤选择
- sdlCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
- sdlCaseTask.setCandeUnitId(caseDispBaseDTO.getTargetId());
- sdlCaseTask.setCandeUnitName(caseDispBaseDTO.getTargetName());
+ dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
+ dslCaseTask.setCandeUnitId(caseDispBaseDTO.getTargetId());
+ dslCaseTask.setCandeUnitName(caseDispBaseDTO.getTargetName());
// 系统调度给调解组织，需要签收
- sdlCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
- sdlCaseTask.setSignExpireTime(sysClient.getExpireTime(caseInfo.getCreateTime(), SyTimeEnum.SY_TIME_2.getIndex()));
+ dslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_1);
+ dslCaseTask.setSignExpireTime(sysClient.getExpireTime(caseInfo.getCreateTime(), SyTimeEnum.SY_TIME_2.getIndex()));
// 任务处理时限
if (firstFlowNode.getExpire() != 0) {
- sdlCaseTask.setExpireTime(DateUtils.addDay(caseInfo.getCreateTime(), firstFlowNode.getExpire()));
+ dslCaseTask.setExpireTime(DateUtils.addDay(caseInfo.getCreateTime(), firstFlowNode.getExpire()));
}
- sdlCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
- sdlCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
- sdlCaseTask.setCustId(caseInfo.getCustId());
- sdlCaseTask.setCreateTime(caseInfo.getCreateTime());
- sdlCaseTask.setUpdateTime(caseInfo.getUpdateTime());
- mapper.insert(sdlCaseTask);
+ dslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
+ dslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ dslCaseTask.setCustId(caseInfo.getCustId());
+ dslCaseTask.setCreateTime(caseInfo.getCreateTime());
+ dslCaseTask.setUpdateTime(caseInfo.getUpdateTime());
+ mapper.insert(dslCaseTask);
// 更新纠纷信息
CaseInfo caseInfoPO = new CaseInfo();
caseInfoPO.setId(caseInfo.getId());
@@ -985,23 +1235,63 @@
* @param caseInfo
* @param loginUser
*/
- public void webStartFlowZXSL(CaseInfo caseInfo, CtUserDTO loginUser){
+ public String webStartFlowZXSL(CaseInfo caseInfo, CtUserDTO loginUser){
try{
- // 启动自行受理工作流
- FlowNode firstFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_ZXSL, caseInfo.getId());
+ // 启动自行受理工作流，进入待受理节点
+ FlowNode dslFlowNode = flowInfoService.startFlow(FlowableConsts.FLOWABLE_ID_ZXSL, caseInfo.getId());
+ // 创建并完成待受理任务
+ CaseTask dslCaseTask = new CaseTask();
+ dslCaseTask.setId(utilsClient.getNewTimeId());
+ dslCaseTask.setCaseId(caseInfo.getId());
+ 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_1);
+ // 自行受理，任务候选执行者类型是上一步骤选择
+ dslCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
+ dslCaseTask.setCandeUnitId(loginUser.getUnitId());
+ dslCaseTask.setCandeUnitName(loginUser.getUnitName());
+ // 自行受理，不需要签收
+ dslCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
+ dslCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ // 任务处理时限
+ if (dslFlowNode.getExpire() != 0) {
+ dslCaseTask.setExpireTime(DateUtils.addDay(caseInfo.getCreateTime(), dslFlowNode.getExpire()));
+ }
+ dslCaseTask.setHandleUnitId(loginUser.getUnitId());
+ dslCaseTask.setHandleUnitName(loginUser.getUnitName());
+ dslCaseTask.setHandleUserId(loginUser.getId());
+ dslCaseTask.setHandleUserName(loginUser.getTrueName());
+ dslCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
+ dslCaseTask.setHandleIllust("自行受理");
+ dslCaseTask.setHandleTime(caseInfo.getCreateTime());
+ dslCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ dslCaseTask.setCustId(caseInfo.getCustId());
+ dslCaseTask.setCreateTime(caseInfo.getCreateTime());
+ dslCaseTask.setUpdateTime(caseInfo.getCreateTime());
+ mapper.insert(dslCaseTask);
+ // 完成待受理任务，走办理反馈节点
+ FlowNode blfkFlowNode = flowInfoService.completeTask(dslCaseTask.getFlowableId(), dslCaseTask.getProcessTaskId(),
+ FlowableConsts.OPERATION_forward, loginUser.getId());
// 进入第1个节点-办理反馈
CaseTask blfkCaseTask = new CaseTask();
blfkCaseTask.setId(utilsClient.getNewTimeId());
blfkCaseTask.setCaseId(caseInfo.getId());
- blfkCaseTask.setFlowableId(firstFlowNode.getFlowableId());
- blfkCaseTask.setProcessInstanceId(firstFlowNode.getProcessInstanceId());
- blfkCaseTask.setProcessTaskId(firstFlowNode.getProcessTaskId());
+ blfkCaseTask.setFlowableId(blfkFlowNode.getFlowableId());
+ blfkCaseTask.setProcessInstanceId(blfkFlowNode.getProcessInstanceId());
+ blfkCaseTask.setProcessTaskId(blfkFlowNode.getProcessTaskId());
blfkCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
- blfkCaseTask.setNodeType(firstFlowNode.getNodeType());
- blfkCaseTask.setNodeId(firstFlowNode.getNodeId());
- blfkCaseTask.setNodeName(firstFlowNode.getNodeName());
- blfkCaseTask.setFlowId(firstFlowNode.getFlowId());
- blfkCaseTask.setNodeShowName(firstFlowNode.getNodeShowName());
+ blfkCaseTask.setNodeType(blfkFlowNode.getNodeType());
+ blfkCaseTask.setNodeId(blfkFlowNode.getNodeId());
+ blfkCaseTask.setNodeName(blfkFlowNode.getNodeName());
+ blfkCaseTask.setFlowId(blfkFlowNode.getFlowId());
+ blfkCaseTask.setNodeShowName(blfkFlowNode.getNodeShowName());
blfkCaseTask.setCaseTaskType(CaseTaskConsts.CASE_TASK_TYPE_1);
// 通过调度的，任务候选执行者类型是上一步骤选择
blfkCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
@@ -1011,8 +1301,8 @@
blfkCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
blfkCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
// 任务处理时限
- if (firstFlowNode.getExpire() != 0) {
- blfkCaseTask.setExpireTime(DateUtils.addDay(caseInfo.getCreateTime(), firstFlowNode.getExpire()));
+ if (blfkFlowNode.getExpire() != 0) {
+ blfkCaseTask.setExpireTime(DateUtils.addDay(caseInfo.getCreateTime(), blfkFlowNode.getExpire()));
}
blfkCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
blfkCaseTask.setCustId(caseInfo.getCustId());
@@ -1029,9 +1319,89 @@
caseInfoPO.setInfoProcess(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getIndex());
caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
caseInfoService.updateCaseInfo(caseInfoPO);
+ // 更新纠纷扩展信息
+ CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
+ caseInfoUnfoldPO.setId(blfkCaseTask.getCaseId());
+ caseInfoUnfoldPO.setAcceptTime(blfkCaseTask.getCreateTime());
+ caseInfoUnfoldPO.setMediateUnitId(blfkCaseTask.getCandeUnitId());
+ caseInfoUnfoldPO.setMediateUnitName(blfkCaseTask.getCandeUnitName());
+ caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
+ return blfkCaseTask.getId();
}catch (Exception e){
log.error("[CaseTaskService.webStartFlowZXSL]调用失败，异常信息："+e, e);
throw new ServiceException("CaseTaskService.webStartFlowZXSL", e);
+ }
+ }
+
+ /**
+ * web端任务处理-不予受理
+ * @param caseDismiss 不予受理表单
+ * @param userId 当前登录用户
+ */
+ public void webDismiss(CaseDismiss caseDismiss, String userId){
+ try{
+ Date nowDate = DateUtils.getNowDate();
+ // 获取当前登录用户
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ // 查询当前任务
+ CaseTask caseTask = mapper.selectById(caseDismiss.getCaseTaskId());
+ // 结束当前任务
+ CaseTask caseTaskPO = new CaseTask();
+ caseTaskPO.setId(caseDismiss.getCaseTaskId());
+ caseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ caseTaskPO.setHandleUnitId(loginUser.getUnitId());
+ caseTaskPO.setHandleUnitName(loginUser.getUnitName());
+ caseTaskPO.setHandleUserId(loginUser.getId());
+ caseTaskPO.setHandleUserName(loginUser.getTrueName());
+ caseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_3);
+ caseTaskPO.setHandleContent(caseDismiss.getDisContent());
+ caseTaskPO.setHandleTime(nowDate);
+ caseTaskPO.setUpdateTime(nowDate);
+ mapper.updateCaseTask(caseTaskPO);
+ // 结束当前工作流任务
+ flowInfoService.endFlow(caseTask.getProcessInstanceId());
+ // 更新纠纷信息
+ CaseInfo caseInfoPO = new CaseInfo();
+ caseInfoPO.setId(caseTask.getCaseId());
+ caseInfoPO.setStatus(CaseStatusBaseConstsEnum.CASE_STATUS_8.getIndex());
+ caseInfoPO.setStatusName(CaseStatusBaseConstsEnum.CASE_STATUS_8.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);
+ // 有配合部门，也结束配合部门工作流程
+ List<CaseTask> assistCaseTaskList = this.listAssistTasking(caseDismiss.getCaseId());
+ for (CaseTask assistCaseTask: assistCaseTaskList){
+ // 完成配合部门当前任务
+ assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ assistCaseTask.setHandleUnitId(loginUser.getUnitId());
+ assistCaseTask.setHandleUnitName(loginUser.getUnitName());
+ assistCaseTask.setHandleUserId(loginUser.getId());
+ assistCaseTask.setHandleUserName(loginUser.getTrueName());
+ assistCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
+ assistCaseTask.setHandleTime(nowDate);
+ assistCaseTask.setUpdateTime(nowDate);
+ mapper.updateCaseTask(assistCaseTask);
+ // 结束配合部门当前工作流任务
+ flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
+ }
+ // 新增不予受理信息
+ caseDismiss.setCaseTaskTime(caseTask.getCreateTime());
+ caseDismiss.setDisUnitId(loginUser.getUnitId());
+ caseDismiss.setDisUnitName(loginUser.getUnitName());
+ caseDismiss.setDisUserId(loginUser.getId());
+ caseDismiss.setDisUserName(loginUser.getTrueName());
+ caseDismiss.setDisTime(nowDate);
+ caseDismiss.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
+ caseDismiss.setCustId(caseTask.getCustId());
+ caseDismiss.setCreateTime(nowDate);
+ caseDismiss.setUpdateTime(nowDate);
+ caseDismissService.save(caseDismiss);
+ }catch (Exception e){
+ log.error("[CaseTaskService.webAssign]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseTaskService.webAssign", e);
}
}
@@ -1129,66 +1499,98 @@
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);
// 分派配合组织
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).
+ String assistUnitName = assignTaskDTO.getAssistUnitList().stream().map(AssignAssistUnitDTO::getUitName).
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);
+ // 启动联合处置工作流
+ 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);
+ // 通过调度的，任务候选执行者类型是上一步骤选择
+ lhczdfpCaseTask.setCandeType(CaseTaskConsts.CANDE_TYPE_1);
+ lhczdfpCaseTask.setCandeUnitId(assignAssistUnitDTO.getUitId());
+ lhczdfpCaseTask.setCandeUnitName(assignAssistUnitDTO.getUitName());
// 不需要签收
- 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.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()));
- assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_1);
- assistCaseTask.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
- assistCaseTask.setCustId(dfpCaseTask.getCustId());
- assistCaseTask.setCreateTime(nowDate);
- assistCaseTask.setUpdateTime(nowDate);
- mapper.insert(assistCaseTask);
+ 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 (lhczdfpFlowNode.getExpire() != 0) {
+ lhczdfpCaseTask.setExpireTime(DateUtils.addDay(nowDate, lhczdfpFlowNode.getExpire()));
+ }
+ 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();
@@ -1213,8 +1615,6 @@
Date nowDate = DateUtils.getNowDate();
// 获取当前登录用户
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
- List<String> taskIdList = new ArrayList<>();
- List<String> caseIdList = new ArrayList<>();
for (SignTaskDTO signTaskDTO: signTaskDTOList){
CaseTask qsCaseTask = mapper.selectById(signTaskDTO.getCaseTaskId());
// 更新纠纷任务信息
@@ -1253,7 +1653,7 @@
* @param acceptTaskDTO 受理任务表单
* @param userId 当前登录用户
*/
- public void webAccept(AcceptTaskDTO acceptTaskDTO, String userId){
+ public String webAccept(AcceptTaskDTO acceptTaskDTO, String userId){
try{
Date nowDate = DateUtils.getNowDate();
// 获取当前登录用户
@@ -1274,8 +1674,13 @@
dslCaseTaskPO.setUpdateTime(nowDate);
mapper.updateCaseTask(dslCaseTaskPO);
// 完成当前待受理工作流任务
+ String operation = FlowableConsts.OPERATION_sl;
+ // 配合部门受理条件改为通过
+ if (CaseTaskConsts.CASE_TASK_TYPE_2 == dslCaseTask.getCaseTaskType()) {
+ operation = FlowableConsts.OPERATION_forward;
+ }
FlowNode newFlowNode = flowInfoService.completeTask(dslCaseTask.getFlowableId(), dslCaseTask.getProcessTaskId(),
- FlowableConsts.OPERATION_sl, userId);
+ operation, userId);
// 新建办理反馈任务
CaseTask blfkCaseTask = new CaseTask();
blfkCaseTask.setId(utilsClient.getNewTimeId());
@@ -1317,6 +1722,7 @@
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);
// 更新纠纷扩展信息
CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
@@ -1325,7 +1731,17 @@
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){
log.error("[CaseTaskService.webAccept]调用失败，异常信息："+e, e);
throw new ServiceException("CaseTaskService.webAccept", e);
@@ -1345,7 +1761,8 @@
// 新增结案申请信息
caseWindupApply.setApplyUnitId(loginUser.getUnitId());
caseWindupApply.setApplyUnitName(loginUser.getUnitName());
- caseWindupApply.setApplyUserId(loginUser.getTrueName());
+ caseWindupApply.setApplyUserId(loginUser.getId());
+ caseWindupApply.setApplyUserName(loginUser.getTrueName());
caseWindupApply.setApplyTime(nowDate);
caseWindupApply.setDeleteStatus(BaseConsts.DELETE_STATUS_0);
caseWindupApply.setCreateTime(nowDate);
@@ -1566,17 +1983,13 @@
caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
- caseInfoUnfoldPO.setCloseTime(nowDate);
caseInfoUnfoldPO.setUpdateTime(nowDate);
caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
}
// 查询配合部门的任务，全部结束流程
- QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
- caseTaskQueryWrapper.eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_2).eq("case_id", jasqCaseTask.getCaseId());
- List<CaseTask> assistCaseTaskList = mapper.selectList(caseTaskQueryWrapper);
+ List<CaseTask> assistCaseTaskList = this.listAssistTasking(jasqCaseTask.getCaseId());
for (CaseTask assistCaseTask: assistCaseTaskList){
- // 完成配合部门当前办理反馈任务
- assistCaseTask.setId(caseWindupApply.getCaseTaskId());
+ // 完成配合部门当前任务
assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
assistCaseTask.setHandleUnitId(loginUser.getUnitId());
assistCaseTask.setHandleUnitName(loginUser.getUnitName());
@@ -1586,10 +1999,8 @@
assistCaseTask.setHandleTime(nowDate);
assistCaseTask.setUpdateTime(nowDate);
mapper.updateCaseTask(assistCaseTask);
- // 完成当前配合部门办理反馈工作流任务
- flowInfoService.completeTask(assistCaseTask.getFlowableId(), assistCaseTask.getProcessTaskId(),
- FlowableConsts.OPERATION_forward, userId);
-
+ // 结束配合部门当前工作流任务
+ flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
}
}catch (Exception e){
log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);
@@ -1680,12 +2091,6 @@
// 更新纠纷扩展信息
CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
caseInfoUnfoldPO.setId(dsrpjCaseTask.getCaseId());
- caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
- caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
- caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
- caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
- caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
- caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
caseInfoUnfoldPO.setCloseTime(nowDate);
caseInfoUnfoldPO.setUpdateTime(nowDate);
caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
@@ -1748,18 +2153,6 @@
caseInfoPO.setInfoProcessName(CaseInfoProcessBaseConstsEnum.getByProcess(caseInfoPO.getProcess()).getDes());
caseInfoPO.setUpdateTime(nowDate);
caseInfoService.updateCaseInfo(caseInfoPO);
- // 更新纠纷扩展信息
- CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
- caseInfoUnfoldPO.setId(blfkCaseTask.getCaseId());
- caseInfoUnfoldPO.setMediResult(caseWindupApply.getMediResult());
- caseInfoUnfoldPO.setMediResultName(caseWindupApply.getMediResultName());
- caseInfoUnfoldPO.setAgreeType(caseWindupApply.getAgreeType());
- caseInfoUnfoldPO.setAgreeTypeName(caseWindupApply.getAgreeTypeName());
- caseInfoUnfoldPO.setAgreeContent(caseWindupApply.getAgreeContent());
- caseInfoUnfoldPO.setWindupContent(caseWindupApply.getWindupContent());
- caseInfoUnfoldPO.setCloseTime(nowDate);
- caseInfoUnfoldPO.setUpdateTime(nowDate);
- caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
}
}catch (Exception e){
log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);
@@ -1796,6 +2189,7 @@
// 完成当前待受理任务
CaseTask dslCaseTaskPO = new CaseTask();
dslCaseTaskPO.setId(caseReturn.getCaseTaskId());
+ dslCaseTaskPO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
dslCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
dslCaseTaskPO.setHandleUnitId(loginUser.getUnitId());
dslCaseTaskPO.setHandleUnitName(loginUser.getUnitName());
@@ -1816,18 +2210,18 @@
htshCaseTask.setFlowableId(htshFlowNode.getFlowableId());
htshCaseTask.setProcessInstanceId(htshFlowNode.getProcessInstanceId());
htshCaseTask.setProcessTaskId(htshFlowNode.getProcessTaskId());
- htshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_2);
+ htshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
htshCaseTask.setNodeType(htshFlowNode.getNodeType());
htshCaseTask.setNodeId(htshFlowNode.getNodeId());
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());
- htshCaseTask.setCandeUnitId(ctUnitDTO.getId());
- htshCaseTask.setCandeUnitName(ctUnitDTO.getUnitName());
+// CtUnitDTO ctUnitDTO = custClient.getParentZzzxUnit(loginUser.getUnitId());
+ htshCaseTask.setCandeUnitId(loginUser.getUnitId());
+ htshCaseTask.setCandeUnitName(loginUser.getUnitName());
// 受理后的任务，不需要签收
htshCaseTask.setSignStatus(CaseTaskConsts.SIGN_STATUS_0);
// 任务处理时限
@@ -1842,6 +2236,7 @@
mapper.insert(htshCaseTask);
// 新增回退申请信息
caseReturn.setCaseTaskId(htshCaseTask.getId());
+ caseReturn.setCaseTaskType(htshCaseTask.getCaseTaskType());
caseReturnService.save(caseReturn);
}catch (Exception e){
log.error("[CaseTaskService.webAppearApply]调用失败，异常信息："+e, e);
@@ -1883,65 +2278,92 @@
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);
+ // 有配合部门，也结束配合部门工作流程
+ List<CaseTask> assistCaseTaskList = this.listAssistTasking(htshCaseTask.getCaseId());
+ for (CaseTask assistCaseTask: assistCaseTaskList){
+ // 完成配合部门当前任务
+ assistCaseTask.setStatus(CaseTaskConsts.TASK_STATUS_2);
+ assistCaseTask.setHandleUnitId(loginUser.getUnitId());
+ assistCaseTask.setHandleUnitName(loginUser.getUnitName());
+ assistCaseTask.setHandleUserId(loginUser.getId());
+ assistCaseTask.setHandleUserName(loginUser.getTrueName());
+ assistCaseTask.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
+ assistCaseTask.setHandleTime(nowDate);
+ assistCaseTask.setUpdateTime(nowDate);
+ mapper.updateCaseTask(assistCaseTask);
+ // 结束配合部门当前工作流任务
+ flowInfoService.endFlow(assistCaseTask.getProcessInstanceId());
+ }
+ }else {
+ // 更新联合处置信息
+ QueryWrapper<CaseAssistInfo> caseAssistInfoQueryWrapper = new QueryWrapper<>();
+ caseAssistInfoQueryWrapper.eq("case_id", htshCaseTask.getCaseId()).eq("assist_unit_id", htshCaseTask.getCandeUnitId()).eq("assist_status", CaseTaskConsts.ASSIST_STATUS_0);
+ CaseAssistInfo caseAssistInfo = caseAssistInfoService.getOne(caseAssistInfoQueryWrapper);
+ if (ObjectUtils.isNotEmpty(caseAssistInfo)){
+ caseAssistInfo.setAssistStatus(CaseTaskConsts.ASSIST_STATUS_1);
+ caseAssistInfoService.updateCaseAssistInfo(caseAssistInfo);
+ }
}
- 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;
@@ -1967,7 +2389,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());
@@ -1986,8 +2408,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);
}
}
@@ -2017,6 +2439,7 @@
// 完成当前待受理任务
CaseTask dslCaseTaskPO = new CaseTask();
dslCaseTaskPO.setId(caseAppear.getCaseTaskId());
+ dslCaseTaskPO.setTaskType(CaseTaskConsts.TASK_TYPE_3);
dslCaseTaskPO.setStatus(CaseTaskConsts.TASK_STATUS_2);
dslCaseTaskPO.setHandleUnitId(loginUser.getUnitId());
dslCaseTaskPO.setHandleUnitName(loginUser.getUnitName());
@@ -2037,7 +2460,7 @@
sbshCaseTask.setFlowableId(sbshFlowNode.getFlowableId());
sbshCaseTask.setProcessInstanceId(sbshFlowNode.getProcessInstanceId());
sbshCaseTask.setProcessTaskId(sbshFlowNode.getProcessTaskId());
- sbshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_3);
+ sbshCaseTask.setTaskType(CaseTaskConsts.TASK_TYPE_1);
sbshCaseTask.setNodeType(sbshFlowNode.getNodeType());
sbshCaseTask.setNodeId(sbshFlowNode.getNodeId());
sbshCaseTask.setNodeName(sbshFlowNode.getNodeName());
@@ -2202,4 +2625,30 @@
}
}
+ /**
+ * 按条件查询
+ * @param terms 条件
+ * @return List
+ */
+ public List<SignTaskDTO> listIdByTerms(Map<String, Object> terms){
+ return mapper.listIdByTerms(terms);
+ }
+
+ /**
+ * web端-工作台-已办事项
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<FrontPageListYBDTO> pageMyTaskYb(PageRequest page, Map<String, Object> terms){
+ try {
+ long total = mapper.countMyTaskYb(terms);
+ List<FrontPageListYBDTO> frontPageListYBDTOList = mapper.pageMyTaskYb(page, terms);
+ return new PageImpl<FrontPageListYBDTO>(frontPageListYBDTOList, page, total);
+ }catch (Exception e) {
+ log.error("[CaseTaskService.pageMyTaskYb]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CaseTaskService.pageMyTaskYb", e);
+ }
+ }
+
}
--
Gitblit v1.8.0