From 55a6ee00c9bb89556a1ba53a3a763fa20230e030 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Sun, 22 Sep 2024 20:36:08 +0800
Subject: [PATCH] 督办相关接口bug修复、附件查询相关修改
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java | 6 ++++++
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java | 20 +++++++++++++++++++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 3 ++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseDismissWebController.java | 2 +-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml | 8 ++++----
5 files changed, 32 insertions(+), 7 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 10da3d4..aee8692 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
@@ -59,7 +59,7 @@
if (ObjectUtils.isNotEmpty(caseDismiss)) {
Map<String, Object> term = new HashMap<>();
term.put("mainId", caseDismiss.getCaseId());
- term.put("ownerIds", caseDismiss.getId());
+ term.put("ownerIds", "'" + caseDismiss.getId() + "'");
List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
if (CollectionUtils.isNotEmpty(fileInfoList)) {
caseDismiss.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList());
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 34da7a8..e330cb4 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
@@ -258,7 +258,7 @@
if (ObjectUtils.isNotEmpty(caseReturn)) {
Map<String, Object> term = new HashMap<>();
term.put("mainId", caseReturn.getCaseId());
- term.put("ownerIds", caseReturn.getId());
+ term.put("ownerIds", "'" + caseReturn.getId() + "'");
List<FileIdTypeInfoBaseDTO> fileInfoList = sysClient.listIdTypeInfoByOwnerIdList(term);
if (CollectionUtils.isNotEmpty(fileInfoList)) {
caseReturn.setFileInfoList(fileInfoList.get(0).getFileList().get(0).getFileList());
@@ -932,6 +932,7 @@
CtUserDTO loginUser = custClient.clientGetUserAll(userId);
Page<CaseSupervise> caseSupervisePage = null;
if(StringUtils.isNotBlank(loginUser.getUnitId())){
+ terms.put("type", status);
if(3 != status){
terms.put("quiltUnitId",loginUser.getUnitId());
terms.put("supStatus", status);
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
index 8628d8b..810086d 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseSuperviseMapper.xml
@@ -228,7 +228,7 @@
<include refid="table-name" />
where case_id = #{terms.caseId}
and delete_status = 0
- <if test="terms.quiltUnitId == 1">
+ <if test="terms.type == 1">
and sup_status = #{terms.supStatus}
and quilt_unit_id = #{terms.quiltUnitId}
</if>
@@ -242,7 +242,7 @@
<include refid="table-name" />
where case_id = #{terms.caseId}
and delete_status = 0
- <if test="terms.quiltUnitId == 1">
+ <if test="terms.type == 1">
and sup_status = #{terms.supStatus}
and quilt_unit_id = #{terms.quiltUnitId}
</if>
@@ -310,11 +310,11 @@
dyh_case_supervise t1 left join dyh_case_info t2 on t1.case_id = t2.id
where
t1.delete_status = 0
- <if test="terms.quiltUnitId != null and terms.quiltUnitId !=''">
+ <if test="terms.type != 3">
and t1.quilt_unit_id = #{terms.quiltUnitId}
and t1.sup_status = #{terms.supStatus}
</if>
- <if test="terms.supUnitId != null and terms.supUnitId !=''">
+ <if test="terms.type == 3">
and t1.sup_unit_id = #{terms.supUnitId}
</if>
<if test="terms.timeStart != null and terms.timeStart !='' and terms.timeEnd != null and terms.timeEnd !=''">
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java
index dce4065..4d77ec9 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CaseSupervise.java
@@ -160,4 +160,10 @@
*/
@TableField(exist = false)
private List<QuiltUnitDTO> quiltUnitDTOList;
+
+ /**
+ * 事项等级
+ */
+ @TableField(exist = false)
+ private Integer caseGrade;
}
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
index 6cb637b..9347be4 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
@@ -3,8 +3,11 @@
import cn.huge.base.common.exception.ServiceException;
import cn.huge.base.common.utils.DateUtils;
import cn.huge.base.common.utils.IdUtils;
+import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.cases.domain.dto.FileRelateDTO;
import cn.huge.module.cases.domain.dto.QuiltUnitDTO;
+import cn.huge.module.cases.domain.po.CaseInfo;
+import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
@@ -57,6 +60,9 @@
@Autowired
private SysClientImpl sysClient;
+
+ @Autowired
+ private CaseInfoService caseInfoService;
/**
* 条件更新对象
@@ -228,6 +234,18 @@
}
long countSuperviseList = mapper.countCaseSupervise(terms);
List<CaseSupervise> caseSuperviseList = mapper.pageCaseSupervise(terms, page);
+ CaseInfo caseInfo = new CaseInfo();
+ if(1 != type && CollectionUtils.isNotEmpty(caseSuperviseList)){
+ QueryWrapper<CaseInfo>caseInfoQueryWrapper = new QueryWrapper<>();
+ caseInfoQueryWrapper.eq("id", caseId);
+ caseInfo = caseInfoService.getOne(caseInfoQueryWrapper);
+ for(CaseSupervise caseSupervise: caseSuperviseList){
+ if(ObjectUtils.isNotEmpty(caseInfo)){
+ caseSupervise.setCaseGrade(caseInfo.getCaseLevel());
+ }
+ }
+
+ }
Map<String, Object>map = new HashMap<>();
map.put("mainId", caseId);
@@ -283,7 +301,7 @@
try {
CaseSupervise caseSupervise = mapper.selectById(id);
Map<String, Object> terms = new HashMap<>();
- terms.put("mainId", "'" + caseSupervise.getCaseId() + "'");
+ terms.put("mainId", caseSupervise.getCaseId());
terms.put("ownerIds", "'" + id + "'");
List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(terms);
if(CollectionUtils.isNotEmpty(fileIdTypeInfoBaseDTOList)){
--
Gitblit v1.8.0