From 34d608441b579b9dabecb062cee5d562cb46437a Mon Sep 17 00:00:00 2001
From: xusd <330628789@qq.com>
Date: Sat, 05 Jul 2025 18:18:03 +0800
Subject: [PATCH] fix:去除未合并代码
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 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 01a8830..18a986c 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
@@ -433,9 +433,9 @@
buttonList.add(bysl);
}
}
- if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
- buttonList.add(db);
- }
+// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
+// buttonList.add(db);
+// }
}
// 待受理节点
if (FlowNodeEnum.FLOW_NODE_ZJ_DSL.getIndex().equals(caseTask.getNodeId())
@@ -446,9 +446,9 @@
buttonList.add(sl);
buttonList.add(ht);
buttonList.add(xqcl);
- if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
- buttonList.add(db);
- }
+// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
+// buttonList.add(db);
+// }
}
// 回退审核节点
if (FlowNodeEnum.FLOW_NODE_ZJ_HTSH.getIndex().equals(caseTask.getNodeId())
@@ -494,9 +494,9 @@
buttonList.add(tjbljl);
buttonList.add(tabcl);
}
- if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
- buttonList.add(db);
- }
+// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
+// buttonList.add(db);
+// }
}
// 结案审核节点
if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())
@@ -507,9 +507,9 @@
tabList.add(jash);
buttonList.add(tabcl);
- if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
- buttonList.add(db);
- }
+// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
+// buttonList.add(db);
+// }
}
// 当事人评价节点
if (FlowNodeEnum.FLOW_NODE_DSRPJ.getIndex().equals(caseTask.getNodeId())) {
@@ -528,9 +528,9 @@
buttonList.add(sl);
buttonList.add(ht);
buttonList.add(tabcl);
- if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
- buttonList.add(db);
- }
+// if(ctUnitDTO.getUnitType()!=null &ctUnitDTO.getUnitType()==101){
+// buttonList.add(db);
+// }
}
}
//司法确认
@@ -846,7 +846,7 @@
|| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex())
|| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex())
|| caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex())) {
- webCaseFlowDTO.setStatusName("待受理");
+ webCaseFlowDTO.setStatusName("待分派");
}
// 受理节点
if (caseTask.getNodeId().equals(FlowNodeEnum.FLOW_NODE_DSL.getIndex())
@@ -1164,6 +1164,45 @@
throw new ServiceException("CaseTaskService.getCountList", e);
}
}
+ /**
+ * 首页-查询全部待办任务
+ *
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<FrontPageListAllDTO> pageMyTaskAll(PageRequest page, Map<String, Object> terms) {
+ try {
+ long total = mapper.countMyTaskAll(terms);
+ List<FrontPageListAllDTO> frontPageListFPDTOList = mapper.pageMyTaskAll(page, terms);
+ return new PageImpl<FrontPageListAllDTO>(frontPageListFPDTOList, page, total);
+ } catch (Exception e) {
+ log.error("[CaseTaskService.pageMyTaskAll]调用失败，异常信息：" + e, e);
+ throw new ServiceException("pageMyTaskAll.pageMyTaskFp", e);
+ }
+
+ }
+
+ /**
+ * 已办事项-数量
+ * @param terms 条件
+ */
+ public CaseYbCountDTO countYbTaskAll(Map<String, Object> terms) {
+ CaseYbCountDTO caseYbCountDTO = new CaseYbCountDTO();
+ long ybDispatch = mapper.countYbDispatch(terms);
+ long ybAccept = mapper.countYbAccept(terms);
+ long ybClosed = mapper.countYbClosed(terms);
+ long ybAudit = mapper.countYbAudit(terms);
+ long ybSupervise = mapper.countYbSupervise(terms);
+ caseYbCountDTO.setYbDispatch(ybDispatch);
+ caseYbCountDTO.setYbAccept(ybAccept);
+ caseYbCountDTO.setYbClosed(ybClosed);
+ caseYbCountDTO.setYbAudit(ybAudit);
+ caseYbCountDTO.setYbSupervise(ybSupervise);
+ caseYbCountDTO.setYbMerge(0L);
+ caseYbCountDTO.setAllYbTask(ybDispatch+ybAccept+ybClosed+ybAudit+ybSupervise);
+ return caseYbCountDTO;
+ }
/**
* 首页-查询待办任务-待/已分派
--
Gitblit v1.8.0