From dcd669d0f4fad2e9292ee2ae8b2b55de98b1332c Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 24 Sep 2024 19:03:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
index cd27017..cb97ed5 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java
@@ -104,18 +104,27 @@
String peopleNum = request.getParameter("peopleNum");
if (StringUtils.isNotBlank(peopleNum)){
String[] split = peopleNum.split("-");
- terms.put("peopleNumStart", split[0]);
- if(split.length>1){
- terms.put("peopleNumEnd", split[1]);
+ String number = split[0];
+ if(number.equals("0") && split.length==1){
+ terms.put("peopleNumEnd", split[0]);
+ }else{
+ terms.put("peopleNumStart", split[0]);
+ if(split.length>1){
+ terms.put("peopleNumEnd", split[1]);
+ }
}
-
}
String amount = request.getParameter("amount");
if (StringUtils.isNotBlank(amount)){
String[] split = amount.split("-");
- terms.put("amountStart", split[0]);
- if(split.length>1){
- terms.put("amountEnd", split[1]);
+ String number = split[0];
+ if(number.equals("0") && split.length==1){
+ terms.put("amountEnd", split[0]);
+ }else{
+ terms.put("amountStart", split[0]);
+ if(split.length>1){
+ terms.put("amountEnd", split[1]);
+ }
}
}
return terms;
@@ -647,24 +656,8 @@
CaseInfoWeExcelDTO caseInfoWeExcelDTO = new CaseInfoWeExcelDTO();
BeanUtils.copyProperties(casePageDTO,caseInfoWeExcelDTO);
caseInfoWeExcelDTO.setCloseTime(DateUtils.DateToString(casePageDTO.getCloseTime(), DateUtils.YYYY_MM_DD));
- if(ObjectUtils.isNotEmpty(casePageDTO.getPlaintiffList())){
- StringBuffer sb = new StringBuffer();
- for (CasePersonWeDTO casePersonWeDTO : casePageDTO.getPlaintiffList()) {
- sb.append(casePersonWeDTO.getTrueName()).append(",");
- }
- if(ObjectUtils.isNotEmpty(sb)){
- caseInfoWeExcelDTO.setPlaintiffStr(sb.substring(0,sb.length()-1));
- }
- }
- if(ObjectUtils.isNotEmpty(casePageDTO.getDefendantList())){
- StringBuffer sb = new StringBuffer();
- for (CasePersonWeDTO casePersonWeDTO : casePageDTO.getDefendantList()) {
- sb.append(casePersonWeDTO.getTrueName()).append(",");
- }
- if(ObjectUtils.isNotEmpty(sb)){
- caseInfoWeExcelDTO.setDefendantStr(sb.substring(0,sb.length()-1));
- }
- }
+ caseInfoWeExcelDTO.setCreateTime(DateUtils.DateToString(casePageDTO.getCreateTime(), DateUtils.YYYY_MM_DD));
+ caseInfoWeExcelDTO.setCaseTypeName(casePageDTO.getCaseTypeFirstName()+"/"+casePageDTO.getCaseTypeName());
excelList.add(caseInfoWeExcelDTO);
}
}
--
Gitblit v1.8.0