From 89e716d623a2b773591ba020acb8c5affc1db9cc Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Thu, 12 Sep 2024 10:18:56 +0800
Subject: [PATCH] 1、查询上级综治中心组织
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 102 insertions(+), 13 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 65f9b32..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
@@ -215,9 +215,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("回退审核");
@@ -400,24 +400,30 @@
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.setHandleUserName(caseInfo.getInputUserName()+"（当事人）");
+ 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());
handleCaseFlowList.add(lfdj);
// 查询承办组织任务
QueryWrapper<CaseTask> caseTaskQueryWrapper = new QueryWrapper<>();
- caseTaskQueryWrapper.eq("case_id", caseId).eq("case_task_type", CaseTaskConsts.CASE_TASK_TYPE_1).orderByAsc("create_time");
+ 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){
CaseFlowDTO caseFlowDTO = new CaseFlowDTO();
if (CaseTaskConsts.TASK_STATUS_1 == caseTask.getStatus()){
- caseFlowDTO.setProcessName(caseInfo.getProcessName());
+ if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex())){
+ caseFlowDTO.setNodeShowName(caseTask.getNodeShowName());
+ caseFlowDTO.setProcessName(caseTask.getNodeShowName());
+ }else{
+ caseFlowDTO.setProcessName(caseInfo.getProcessName());
+ }
caseFlowDTO.setHandleUnitName(caseTask.getCandeUnitName());
caseFlowDTO.setTaskType(caseTask.getTaskType());
caseFlowDTO.setStatus(caseTask.getStatus());
@@ -427,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);
@@ -1052,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);
@@ -1522,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