From b4d23d40c6ba77b028538ccebf8b757b5491aa90 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 10:33:11 +0800
Subject: [PATCH] 1、流程bug修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java | 11 +++++------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 14 ++++++++------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 2 ++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml | 10 +++++-----
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java | 15 +++++++++------
5 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java
index 30557ef..10da3d4 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java
@@ -1,5 +1,6 @@
package cn.huge.module.cases.controller.web;
+import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.module.cases.domain.po.CaseDismiss;
@@ -55,12 +56,14 @@
public Object getByCaseId(@RequestParam(value = "caseId") String caseId) {
try {
CaseDismiss caseDismiss = service.getByCaseId(caseId);
- Map<String, Object> term = new HashMap<>();
- term.put("mainId", caseDismiss.getCaseId());
- term.put("ownerIds", caseDismiss.getId());
- List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
- if(CollectionUtils.isNotEmpty(fileInfoList)){
- caseDismiss.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList());
+ if (ObjectUtils.isNotEmpty(caseDismiss)) {
+ Map<String, Object> term = new HashMap<>();
+ term.put("mainId", caseDismiss.getCaseId());
+ term.put("ownerIds", caseDismiss.getId());
+ List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
+ if (CollectionUtils.isNotEmpty(fileInfoList)) {
+ caseDismiss.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList());
+ }
}
return ReturnSucUtils.getRepInfo(caseDismiss);
} catch (Exception e) {
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
index e3dca49..534df18 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
@@ -255,12 +255,14 @@
public Object getReturnApplyInfo(@RequestParam(value = "caseTaskId") String caseTaskId, @CurrentUser String userId) {
try {
CaseReturn caseReturn = caseReturnService.getByCaseTaskId(caseTaskId);
- Map<String, Object> term = new HashMap<>();
- term.put("mainId", caseReturn.getCaseId());
- term.put("ownerIds", caseReturn.getId());
- List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
- if(CollectionUtils.isNotEmpty(fileInfoList)){
- caseReturn.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList());
+ if (ObjectUtils.isNotEmpty(caseReturn)) {
+ Map<String, Object> term = new HashMap<>();
+ term.put("mainId", caseReturn.getCaseId());
+ term.put("ownerIds", caseReturn.getId());
+ List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
+ if (CollectionUtils.isNotEmpty(fileInfoList)) {
+ caseReturn.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList());
+ }
}
return ReturnSucUtils.getRepInfo(caseReturn);
} catch (Exception e) {
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
index 3bee051..24bd0b2 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml
@@ -564,6 +564,7 @@
(t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL')
and t2.delete_status = 0
and t1.sign_status != 1
+ and t1.handle_result != 3
<include refid="myTaskSl-where-part"/>
</select>
<!-- 首页-待/已受理分页查询 -->
@@ -579,6 +580,7 @@
(t1.node_id = 'ZJ_DSL' or t1.node_id = 'QJ_DSL' or t1.node_id = 'SJ_DSL' or t1.node_id = 'DSL')
and t2.delete_status = 0
and t1.sign_status != 1
+ and t1.handle_result != 3
<include refid="myTaskSl-where-part"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
index cbc95ef..ab727a8 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseWindupApplyMapper.xml
@@ -360,9 +360,6 @@
<if test="terms.assistUnitId != null and terms.assistUnitId !=''">
and t3.assist_unit_id like concat('%', #{terms.assistUnitId}, '%')
</if>
- <if test="terms.applyStatus != null and terms.applyStatus !=''">
- and t1.apply_status = #{terms.applyStatus}
- </if>
<if test="terms.auditResult != null and terms.auditResult !=''">
and t1.audit_result = #{terms.auditResult}
</if>
@@ -381,8 +378,10 @@
COUNT(t1.id)
from
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
+ left join dyh_case_info_unfold t3 on t3.id = t2.id
where
- t2.delete_status = 0
+ t1.apply_status = #{terms.applyStatus}
+ and t2.delete_status = 0
<include refid="mySubmitApplyReview-where-part"/>
</select>
<!-- 首页-结案申请/已结案分页查询 -->
@@ -403,7 +402,8 @@
dyh_case_windup_apply t1 left join dyh_case_info t2 on t1.case_id = t2.id
left join dyh_case_info_unfold t3 on t3.id = t2.id
where
- t2.delete_status = 0
+ t1.apply_status = #{terms.applyStatus}
+ and t2.delete_status = 0
<include refid="mySubmitApplyReview-where-part"/>
<if test="page.sort != null">
<foreach collection="page.sort" item="s" index="index" separator="," open="order by ">
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 296fe16..3babc30 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
@@ -244,6 +244,9 @@
TabButtonInfoDTO daxx = new TabButtonInfoDTO();
daxx.setId("daxx");
daxx.setName("档案信息");
+ TabButtonInfoDTO byslxq = new TabButtonInfoDTO();
+ byslxq.setId("byslxq");
+ byslxq.setName("详情");
// 定义button
TabButtonInfoDTO tjbljl = new TabButtonInfoDTO();
@@ -282,8 +285,8 @@
List<TabButtonInfoDTO> buttonList = new LinkedList<>();
if (ObjectUtils.isNotEmpty(caseTask)) {
// 不予受理
- if (CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
- tabList.add(daxx);
+ if (ObjectUtils.isNotEmpty(caseTask.getHandleResult()) && CaseTaskConsts.HANDLE_RESULT_3 == caseTask.getHandleResult()){
+ tabList.add(byslxq);
tabList.add(sqjl);
}else {
@@ -773,10 +776,6 @@
try {
long total = mapper.countMyTaskFp(terms);
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);
--
Gitblit v1.8.0