From 7b7f52e057434bf7e2edc2273e1d334d87ba65f6 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Fri, 25 Oct 2024 17:14:16 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
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..294d540 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
@@ -6,15 +6,12 @@
import cn.huge.base.common.utils.IdUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.module.cases.consts.CaseTaskConsts;
-import cn.huge.module.cases.domain.po.CaseAssistApply;
+import cn.huge.module.cases.domain.po.*;
import cn.huge.module.cases.domain.dto.TransactResultDTO;
-import cn.huge.module.cases.domain.po.CaseAssistInfo;
-import cn.huge.module.cases.domain.po.CaseTask;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.cases.dao.mapper.CaseInfoUnfoldMapper;
-import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.cust.dto.CtUnitDTO;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
@@ -25,6 +22,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.collect.Maps;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.el.stream.Stream;
import org.springframework.beans.BeanUtils;
@@ -72,6 +70,9 @@
@Autowired
private CaseAssistInfoService caseAssistInfoService;
+
+ @Autowired
+ private CaseFeedbackService caseFeedbackService;
/**
* 更新对象
@@ -218,8 +219,8 @@
CaseInfoUnfold caseInfoUnfold = this.getById(caseId);
if(StringUtils.isNotBlank(caseInfoUnfold.getMediResult())) {
TransactResultDTO transactResultDTO = new TransactResultDTO();
- BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO);
- if (ObjectUtils.isNotEmpty(transactResultDTO)) {
+ if (ObjectUtils.isNotEmpty(caseInfoUnfold)) {
+ BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO);
QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
caseAssistApplyQueryWrapper.select("apply_assist_unit_name").eq("case_id", caseId).eq("apply_status", 1)
.eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
@@ -227,6 +228,15 @@
if (ObjectUtils.isNotEmpty(caseAssistApply)) {
transactResultDTO.setApplyAssistUnitName(caseAssistApply.getApplyAssistUnitName());
+ }
+
+ // 查询最新的办理意见
+ QueryWrapper<CaseFeedback> caseFeedbackQueryWrapper = new QueryWrapper<>();
+ caseFeedbackQueryWrapper.eq("case_id", caseId).eq("handle_type", CaseTaskConsts.HANDLE_TYPE_1)
+ .orderByDesc("create_time");
+ List<CaseFeedback> caseFeedbackList = caseFeedbackService.list(caseFeedbackQueryWrapper);
+ if (CollectionUtils.isNotEmpty(caseFeedbackList)){
+ transactResultDTO.setHandleContent(caseFeedbackList.get(0).getHandleContent());
}
}
Map<String, Object> terms = new HashMap<>();
@@ -252,20 +262,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