From 5aa1a5263745b746b98d05c3296bf91c5c7d5edf Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Fri, 27 Sep 2024 18:00:02 +0800
Subject: [PATCH] 1、联合处置审核页面bug修复 2、详情也办理结果-办理意见为空修复
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 10 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 24c7c05..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
@@ -1,19 +1,18 @@
package cn.huge.module.cases.service;
+import cn.huge.base.common.dto.SelectTermDTO;
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.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;
import cn.huge.module.mediate.constant.CaseBaseConsts;
@@ -23,7 +22,9 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,10 +34,8 @@
import org.springframework.data.domain.PageRequest;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @title: 纠纷信息扩展表业务逻辑处理
@@ -71,6 +70,9 @@
@Autowired
private CaseAssistInfoService caseAssistInfoService;
+
+ @Autowired
+ private CaseFeedbackService caseFeedbackService;
/**
* 更新对象
@@ -217,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());
@@ -226,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<>();
@@ -245,4 +256,33 @@
}
}
+ /**
+ * 联合处置申请-查询组织
+ * @param caseId
+ * @return
+ */
+ public List<SelectTermDTO> superviceUnitChoose(String caseId) {
+ 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);
+ }
+ }
}
--
Gitblit v1.8.0