From d1fcb44a9b81d0880b414e9125cb60897cf0b6a8 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 21 Sep 2024 13:19:14 +0800
Subject: [PATCH] 1、受理操作报错修复 整改： 2、工作台-待/已分派列表 3、工作台-待/已签收列表 4、工作台-待/已/不予受理列表
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 92 +++++++++++++++++++++++++++------------------
1 files changed, 55 insertions(+), 37 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 96aab01..fd02986 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
@@ -216,9 +216,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("回退审核");
@@ -266,6 +266,9 @@
TabButtonInfoDTO sb = new TabButtonInfoDTO();
sb.setId("sb");
sb.setName("上报");
+ TabButtonInfoDTO bysl = new TabButtonInfoDTO();
+ sb.setId("bysl");
+ sb.setName("不予受理");
// 根据流程显示tab
List<TabButtonInfoDTO> tabList = new LinkedList<>();
// 根据流程显示button
@@ -273,76 +276,82 @@
if (ObjectUtils.isNotEmpty(caseTask)) {
if (FlowNodeEnum.FLOW_NODE_ZJ_DFP.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ 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);
+ 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(sqjl);
tabList.add(htsh);
}
if (FlowNodeEnum.FLOW_NODE_QJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(sbsh);
}
if (FlowNodeEnum.FLOW_NODE_QJ_DFP.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ 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);
+ 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(sqjl);
tabList.add(htsh);
}
if (FlowNodeEnum.FLOW_NODE_SJ_SBSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(sbsh);
}
if (FlowNodeEnum.FLOW_NODE_SJ_DFP.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ 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);
+ 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(sqjl);
tabList.add(htsh);
}
if (FlowNodeEnum.FLOW_NODE_BLFK.getIndex().equals(caseTask.getNodeId())) {
@@ -350,7 +359,7 @@
tabList.add(sxxq);
tabList.add(sxbl);
tabList.add(lcdb);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(tjbljl);
buttonList.add(lhczsq);
@@ -360,30 +369,30 @@
tabList.add(sxxq);
tabList.add(sxbl);
tabList.add(lcdb);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(tjbljl);
}
}
if (FlowNodeEnum.FLOW_NODE_JASH.getIndex().equals(caseTask.getNodeId())) {
tabList.add(sxxq);
-// tabList.add(sqjl);
+ 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);
+ tabList.add(sqjl);
}
if (FlowNodeEnum.FLOW_NODE_JAGD.getIndex().equals(caseTask.getNodeId())) {
tabList.add(daxx);
tabList.add(lcdb);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
}
if (FlowNodeEnum.FLOW_NODE_DSL.getIndex().equals(caseTask.getNodeId())) {
tabList.add(dslxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
buttonList.add(sl);
buttonList.add(ht);
@@ -391,12 +400,12 @@
if (FlowNodeEnum.FLOW_NODE_HTSH.getIndex().equals(caseTask.getNodeId())) {
sxxq.setName("详情");
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(htsh);
}
}else {
tabList.add(sxxq);
-// tabList.add(sqjl);
+ tabList.add(sqjl);
tabList.add(lhczsh);
}
// 封装数据
@@ -734,16 +743,20 @@
}
/**
- * 首页-查询待办任务-受分派
+ * 首页-查询待办任务-待/已分派
* @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);
+ for (FrontPageListFPDTO frontPageListFPDTO: frontPageListFPDTOList){
+ // 查询督办次数
+
+ }
+ return new PageImpl<FrontPageListFPDTO>(frontPageListFPDTOList, page, total);
}catch (Exception e) {
log.error("[CaseTaskService.pageMyTaskFp]调用失败，异常信息：" + e, e);
throw new ServiceException("CaseTaskService.pageMyTaskFp", e);
@@ -752,16 +765,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);
@@ -769,19 +782,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);
}
}
@@ -1577,8 +1590,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_forward, userId);
+ operation, userId);
// 新建办理反馈任务
CaseTask blfkCaseTask = new CaseTask();
blfkCaseTask.setId(utilsClient.getNewTimeId());
--
Gitblit v1.8.0