From d8a4d842d57c183322324f324396c33df7265479 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Sun, 08 Sep 2024 10:07:35 +0800
Subject: [PATCH] 综合查询
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index fb0aa04..29d2ee5 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -4,15 +4,11 @@
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.domain.dto.CaseInfoDTO;
+import cn.huge.module.cases.domain.dto.*;
-import cn.huge.module.cases.domain.dto.CaseInfoWeChatDTO;
-import cn.huge.module.cases.domain.dto.CasePersonWechatDTO;
-import cn.huge.module.cases.domain.dto.RegisterSaveDTO;
import cn.huge.module.cases.domain.po.CaseAgent;
import cn.huge.module.cases.domain.po.CaseInfoUnfold;
import cn.huge.module.cases.domain.po.CasePerson;
-import cn.huge.module.client.api.SysClient;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.client.api.impl.SysClientImpl;
import cn.huge.module.client.api.impl.UtilsClientImpl;
@@ -26,10 +22,8 @@
import cn.huge.module.draft.service.CasedraftInfoService;
import cn.huge.module.mediate.dto.WechatBindCaseDTO;
import cn.huge.module.sys.dto.FileIdTypeInfoBaseDTO;
-import cn.huge.module.sys.dto.FileTypeInfoBaseDTO;
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.springframework.beans.BeanUtils;
@@ -703,13 +697,13 @@
}
/**
- * 按条件分页查询
+ * 按条件分页查询-小程序查询
* @param page 分页对象
* @param terms 条件
* @return Page
*/
- public Page<CaseInfoWeChatDTO> pageQueryWechat(String userId,PageRequest page, Map<String, Object> terms){
- List<CaseInfoWeChatDTO> list = new ArrayList<>();
+ public Page<CaseInfoWechatDTO> pageQueryWechat(String userId, PageRequest page, Map<String, Object> terms){
+ List<CaseInfoWechatDTO> list = new ArrayList<>();
String personType = terms.get("personType")+"";
if(ObjectUtils.isEmpty(personType)){
throw new RuntimeException("请选择人员类型");
@@ -724,7 +718,7 @@
}
List<CasePerson> casePersonList = personService.list(personWrapper);
if(ObjectUtils.isEmpty(casePersonList)){
- return new PageImpl<CaseInfoWeChatDTO>(list, page, 0);
+ return new PageImpl<CaseInfoWechatDTO>(list, page, 0);
}
List<String> ids = casePersonList.stream().map(CasePerson::getCaseId).collect(Collectors.toList());
terms.put("idList",ids);
@@ -732,7 +726,7 @@
List<CaseInfo> content = mapper.pageTerms(page, terms);
if(ObjectUtils.isNotEmpty(content)){
for(CaseInfo caseInfo: content){
- CaseInfoWeChatDTO caseInfoWeChatDTO = new CaseInfoWeChatDTO();
+ CaseInfoWechatDTO caseInfoWeChatDTO = new CaseInfoWechatDTO();
BeanUtils.copyProperties(caseInfo, caseInfoWeChatDTO);
if(ObjectUtils.isNotEmpty(caseInfo.getProcess()) && caseInfo.getProcess().equals(1) || caseInfo.getProcess().equals(2)){
caseInfoWeChatDTO.setProcessStatus(1);
@@ -768,6 +762,40 @@
list.add(caseInfoWeChatDTO);
}
}
- return new PageImpl<CaseInfoWeChatDTO>(list, page, total);
+ return new PageImpl<CaseInfoWechatDTO>(list, page, total);
+ }
+
+ /**
+ * 按条件分页查询-综合查询
+ * @param page 分页对象
+ * @param terms 条件
+ * @return Page
+ */
+ public Page<CasePageDTO> pageQueryAll(PageRequest page, Map<String, Object> terms){
+ long total = mapper.countTermsAll(terms);
+ List<CasePageDTO> content = mapper.pageTermsAll(page, terms);
+ if(ObjectUtils.isNotEmpty(content)){
+ for (CasePageDTO casePageDTO : content) {
+ QueryWrapper<CasePerson> personWrapper1 = new QueryWrapper<>();
+ personWrapper1.eq("case_id", casePageDTO.getId());
+ List<CasePerson> casePersonList1 = personService.list(personWrapper1);
+ //申请人集合
+ List<CasePersonWeDTO> plaintiffList = new ArrayList<>();
+ //被申请人集合
+ List<CasePersonWeDTO> defendantList = new ArrayList<>();
+ for (CasePerson casePerson : casePersonList1) {
+ CasePersonWeDTO casePersonWechatDTO = new CasePersonWeDTO();
+ BeanUtils.copyProperties(casePerson, casePersonWechatDTO);
+ if(CaseBaseConstsEnum.PERSON_TYPE_1.getIndex().equals(casePerson.getPerType())){
+ plaintiffList.add(casePersonWechatDTO);
+ }else if(CaseBaseConstsEnum.PERSON_TYPE_2.getIndex().equals(casePerson.getPerType())){
+ defendantList.add(casePersonWechatDTO);
+ }
+ }
+ casePageDTO.setDefendantList(defendantList);
+ casePageDTO.setPlaintiffList(plaintiffList);
+ }
+ }
+ return new PageImpl<CasePageDTO>(content, page, total);
}
}
--
Gitblit v1.8.0