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/controller/web/CaseInfoWebController.java | 75 ++++++++++++++++++++++++-------------
1 files changed, 49 insertions(+), 26 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..9ce80dc 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;
@@ -618,7 +627,37 @@
public Object pageQueryAll(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
try {
Map<String, Object> terms = getParameterAll();
- Sort sort = Sort.by(Sort.Direction.DESC, "a.create_time");
+ Sort sort = null;
+ String sortName = null;
+ String sortColmnStr = request.getParameter("sortColmn");
+ String sortTypeStr = request.getParameter("sortType");
+ int sortColmn = 1;
+ int sortType = 1;
+ if (StringUtils.isNotBlank(sortColmnStr)) {
+ sortColmn = Integer.valueOf(sortColmnStr);
+ }
+ if (StringUtils.isNotBlank(sortTypeStr)) {
+ sortType = Integer.valueOf(sortTypeStr);
+ }
+ switch (sortColmn) {
+ case 1:
+ sortName = "a.create_time";
+ break;
+ case 2:
+ sortName = "b.close_time";
+ break;
+ }
+ switch (sortType) {
+ case 1:
+ sort = Sort.by(Sort.Direction.ASC, sortName);
+ break;
+ case 2:
+ sort = Sort.by(Sort.Direction.DESC, sortName);
+ break;
+ }
+ if (ObjectUtils.isEmpty(sort)) {
+ sort = Sort.by(Sort.Direction.DESC, "a.create_time");
+ }
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
Page<CasePageDTO> caseInfoPage = service.pageQueryAll(pageRequest, terms);
return ReturnSucUtils.getRepInfo( "处理成功", caseInfoPage);
@@ -647,24 +686,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