From e79d8c8f9679839bf983341fe2cf3212e1bb3001 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Mon, 28 Oct 2024 14:44:33 +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 | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 e58da8b..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());
@@ -228,6 +229,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<>();
terms.put("mainId", caseId);
--
Gitblit v1.8.0