From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +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/CaseSuperviseService.java | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
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 9347be4..4351a6b 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
@@ -5,6 +5,7 @@
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.FrontPageListDTO;
import cn.huge.module.cases.domain.dto.QuiltUnitDTO;
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.cases.domain.po.CaseInfoUnfold;
@@ -22,6 +23,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -235,27 +237,32 @@
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());
+ if(CollectionUtils.isNotEmpty(caseSuperviseList)){
+ if(1 != type){
+
+ QueryWrapper<CaseInfo>caseInfoQueryWrapper = new QueryWrapper<>();
+ caseInfoQueryWrapper.eq("id", caseId);
+ caseInfo = caseInfoService.getOne(caseInfoQueryWrapper);
+ for(CaseSupervise caseSupervise: caseSuperviseList){
+ if(ObjectUtils.isNotEmpty(caseSupervise.getSupTime()) && ObjectUtils.isNotEmpty(caseSupervise.getReplyTerm())){
+ caseSupervise.setTimeLimit(DateUtils.addHour(caseSupervise.getSupTime(), caseSupervise.getReplyTerm()));
+ }
+ if(ObjectUtils.isNotEmpty(caseInfo)){
+ caseSupervise.setCaseGrade(caseInfo.getCaseLevel());
+ }
}
- }
-
- }
-
- Map<String, Object>map = new HashMap<>();
- map.put("mainId", caseId);
- map.put("ownerIds", "'" + caseSuperviseList.stream().map(CaseSupervise::getId).collect(Collectors.joining("','"))+ "'");
- map.put("types", "'"+ FileOwnerTypeBaseEnum.OWNER_TYPE_506.getIndex()+ "','" +FileOwnerTypeBaseEnum.OWNER_TYPE_507.getIndex()+"'");
- List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(map);
- for(CaseSupervise caseSupervise: caseSuperviseList){
- for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
- if(caseSupervise.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
- caseSupervise.setFileInfoList(fileIdTypeInfoBaseDTO.getFileList());
+ }else{
+ Map<String, Object>map = new HashMap<>();
+ map.put("mainId", caseId);
+ map.put("ownerIds", "'" + caseSuperviseList.stream().map(CaseSupervise::getId).collect(Collectors.joining("','"))+ "'");
+ map.put("types", "'"+ FileOwnerTypeBaseEnum.OWNER_TYPE_506.getIndex()+ "','" +FileOwnerTypeBaseEnum.OWNER_TYPE_507.getIndex()+"'");
+ List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(map);
+ for(CaseSupervise caseSupervise: caseSuperviseList){
+ for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
+ if(caseSupervise.getId().equals(fileIdTypeInfoBaseDTO.getOwnerId())){
+ caseSupervise.setFileInfoList(fileIdTypeInfoBaseDTO.getFileList());
+ }
+ }
}
}
}
@@ -271,11 +278,11 @@
* @param page
* @param terms
*/
- public Page<CaseSupervise> pageMyTaskDb(PageRequest page, Map<String, Object> terms){
+ public Page<FrontPageListDTO> pageMyTaskDb(PageRequest page, Map<String, Object> terms){
try{
long countSuperviseList = mapper.countMyTaskDb(terms);
- List<CaseSupervise> caseSuperviseList = mapper.pageMyTaskDb(page, terms);
- return new PageImpl<CaseSupervise>(caseSuperviseList, page, countSuperviseList);
+ List<FrontPageListDTO> caseSuperviseList = mapper.pageMyTaskDb(page, terms);
+ return new PageImpl<FrontPageListDTO>(caseSuperviseList, page, countSuperviseList);
}catch (Exception e){
log.error("[CaseSuperviseService.pageReplied]调用失败，异常信息："+e, e);
throw new ServiceException("CaseSuperviseService.pageReplied", e);
--
Gitblit v1.8.0