From 93a2113dc9168a1258d388153c9a613f56869523 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Wed, 11 Sep 2024 15:52:25 +0800
Subject: [PATCH] 1、流程修改
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 97 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 90 insertions(+), 7 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 4bfe8d7..253193e 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
@@ -400,12 +400,12 @@
if (CaseBaseConstsEnum.CASE_CANAL_1.getIndex().equals(caseInfo.getCanal())){
lfdj.setNodeShowName("来访登记");
lfdj.setHandleUserName(caseInfo.getInputUserName());
+ lfdj.setHandleUnitName(caseInfo.getInputUnitName());
}else {
lfdj.setNodeShowName(caseInfo.getCanalName());
lfdj.setHandleUnitName(caseInfo.getInputUserName()+"（当事人）");
lfdj.setHandleUserName(caseInfo.getInputUserName());
}
- lfdj.setHandleUnitName(caseInfo.getInputUnitName());
lfdj.setTaskType(CaseTaskConsts.TASK_TYPE_1);
lfdj.setStatus(CaseTaskConsts.TASK_STATUS_2);
lfdj.setHandleTime(new Date());
@@ -433,19 +433,87 @@
caseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
caseFlowDTO.setHandleTime(caseTask.getHandleTime());
caseFlowDTO.setHandleNotes(caseTask.getHandleIllust());
+ caseFlowDTO.setTaskType(caseTask.getTaskType());
+ // todo 审核不通过、通过的展示，有调解结果的
if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
- caseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
- caseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
- caseFlowDTO.setTaskType(caseTask.getTaskType());
+
}
if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
- caseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
- caseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
- caseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
+
}
caseFlowDTO.setStatus(caseTask.getStatus());
}
handleCaseFlowList.add(caseFlowDTO);
+ // 待受理节点，已签收的，需要加多一个受理节点
+ 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()){
+ CaseFlowDTO slCaseFlowDTO = new CaseFlowDTO();
+ if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
+ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
+ slCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ slCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
+ }else{
+ slCaseFlowDTO.setProcessName(caseInfo.getProcessName());
+ }
+ slCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
+ slCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ slCaseFlowDTO.setStatus(caseTask.getStatus());
+ }else {
+ slCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ slCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
+ slCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
+ slCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
+ slCaseFlowDTO.setHandleNotes("已受理");
+ if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
+ slCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
+ slCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_1.getDes());
+ slCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ }
+ if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
+ slCaseFlowDTO.setAuditResult(AuditBaseConstsEnum.AUDIT_RESULT_2.getIndex());
+ slCaseFlowDTO.setAuditResultName(AuditBaseConstsEnum.AUDIT_RESULT_2.getDes());
+ slCaseFlowDTO.setTaskType(CaseTaskConsts.TASK_TYPE_2);
+ }
+ slCaseFlowDTO.setStatus(caseTask.getStatus());
+ }
+ handleCaseFlowList.add(slCaseFlowDTO);
+ }
+ }
+
+ // 办理反馈节点，加上化解结果
+ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_BLFK.getIndex())){
+ CaseFlowDTO blfkCaseFlowDTO = new CaseFlowDTO();
+ if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
+ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
+ blfkCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ blfkCaseFlowDTO.setProcessName(caseTask.getNodeShowName());
+ }else{
+ blfkCaseFlowDTO.setProcessName(caseInfo.getProcessName());
+ }
+ blfkCaseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
+ blfkCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ blfkCaseFlowDTO.setStatus(caseTask.getStatus());
+ }else {
+ blfkCaseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ blfkCaseFlowDTO.setHandleUnitName(caseTask.getHandleUnitName());
+ blfkCaseFlowDTO.setHandleUserName(caseTask.getHandleUserName());
+ blfkCaseFlowDTO.setHandleTime(caseTask.getHandleTime());
+ CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
+ blfkCaseFlowDTO.setHandleNotes("化解结果："+caseInfoUnfold.getMediResultName());
+ blfkCaseFlowDTO.setTaskType(caseTask.getTaskType());
+ // todo 审核不通过、通过的展示，有调解结果的
+ if (CaseTaskConsts.HANDLE_RESULT_1 == caseTask.getHandleResult()) {
+
+ }
+ if (CaseTaskConsts.HANDLE_RESULT_2 == caseTask.getHandleResult()) {
+
+ }
+ blfkCaseFlowDTO.setStatus(caseTask.getStatus());
+ }
+ handleCaseFlowList.add(blfkCaseFlowDTO);
+ }
}
result.put("handleCaseFlowList", handleCaseFlowList);
@@ -1058,6 +1126,7 @@
dslCaseTaskPO.setHandleUnitId(loginUser.getUnitId());
dslCaseTaskPO.setHandleUnitName(loginUser.getUnitName());
dslCaseTaskPO.setHandleUserId(loginUser.getId());
+ dslCaseTaskPO.setHandleIllust("已受理");
dslCaseTaskPO.setHandleUserName(loginUser.getTrueName());
dslCaseTaskPO.setHandleResult(CaseTaskConsts.HANDLE_RESULT_1);
dslCaseTaskPO.setHandleTime(nowDate);
@@ -1528,4 +1597,18 @@
}
}
+ /**
+ * web端任务处理-上报
+ * @param caseAppear 上报表单
+ * @param userId 当前登录用户
+ */
+ public void webAppearApply(CaseAppear caseAppear, String userId){
+ try{
+
+ }catch (Exception e){
+ log.error("[CaseTaskService.webWindupApply]调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseTaskService.webWindupApply", e);
+ }
+ }
+
}
--
Gitblit v1.8.0