From 24d3def5fd8dc526ce9439449d2725b529e394f2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 13:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java | 35 +++++++++++++++++++++--------------
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseTaskMapper.xml | 2 +-
2 files changed, 22 insertions(+), 15 deletions(-)
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 02f997a..a178308 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
@@ -365,7 +365,7 @@
select
count(case when (node_id = 'ZJ_DFP' or node_id = 'QJ_DFP' or node_id = 'SJ_DFP' or node_id = 'DFP') and sign_status != 1 then id end) as waitDisp,
count(case when sign_status = 1 then id end) as waitSign,
- count(case when (node_id = 'ZJ_DSL' or node_id = 'QJ_DSL' or node_id = 'SJ_DSL' or node_id = 'DSL') and sign_status != 1 then id end) as waitAccept,
+ count(case when (node_id = 'ZJ_DSL' or node_id = 'QJ_DSL' or node_id = 'SJ_DSL' or node_id = 'DSL') and sign_status != 1 and (handle_result != 3 or handle_result is null) then id end) as waitAccept,
count(case when node_id = 'BLFK' then id end) as Processing
from
<include refid="table-name" />
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
index 958070e..e58da8b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
@@ -252,20 +252,27 @@
* @return
*/
public List<SelectTermDTO> superviceUnitChoose(String caseId) {
- CaseInfoUnfold caseInfoUnfold = getById(caseId);
- List<String> unitIdList = new ArrayList<>();
- unitIdList.add(caseInfoUnfold.getMediateUnitId());
- unitIdList.addAll(Arrays.stream(caseInfoUnfold.getAssistUnitId().split(",")).map(String::valueOf).collect(Collectors.toList()));
- List<SelectTermDTO> selectTermDTOList = new ArrayList<>();
- for(String unitId: unitIdList){
- CtUnitDTO ctUnitDTO = custClient.getUnitById(unitId);
- SelectTermDTO unitSelectTerm = new SelectTermDTO();
- unitSelectTerm.setValue(ctUnitDTO.getId());
- unitSelectTerm.setLabel(ctUnitDTO.getUnitName());
- unitSelectTerm.setParentId(ctUnitDTO.getParentId());
- unitSelectTerm.setCheckable(true);
- selectTermDTOList.add(unitSelectTerm);
+ try {
+ CaseInfoUnfold caseInfoUnfold = getById(caseId);
+ List<String> unitIdList = new ArrayList<>();
+ unitIdList.add(caseInfoUnfold.getMediateUnitId());
+ if(StringUtils.isNotBlank(caseInfoUnfold.getAssistUnitId())){
+ unitIdList.addAll(Arrays.stream(caseInfoUnfold.getAssistUnitId().split(",")).map(String::valueOf).collect(Collectors.toList()));
+ }
+ List<SelectTermDTO> selectTermDTOList = new ArrayList<>();
+ for (String unitId : unitIdList) {
+ CtUnitDTO ctUnitDTO = custClient.getUnitById(unitId);
+ SelectTermDTO unitSelectTerm = new SelectTermDTO();
+ unitSelectTerm.setValue(ctUnitDTO.getId());
+ unitSelectTerm.setLabel(ctUnitDTO.getUnitName());
+ unitSelectTerm.setParentId(ctUnitDTO.getParentId());
+ unitSelectTerm.setCheckable(true);
+ selectTermDTOList.add(unitSelectTerm);
+ }
+ return selectTermDTOList;
+ }catch (Exception e){
+ log.error("[CaseInfoUnfoldService.superviceUnitChoose] 调用失败，异常信息："+e, e);
+ throw new ServiceException("CaseInfoUnfoldService.superviceUnitChoose", e);
}
- return selectTermDTOList;
}
}
--
Gitblit v1.8.0