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 | 121 +++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 22 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 b4c070d..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
@@ -55,6 +55,81 @@
@Autowired
private CaseInfoService service;
+ private Map<String,Object> getParameterAll() {
+ Map<String, Object> terms = getParameter();
+// // 来访时间
+ String visitTimeStart = request.getParameter("visitTimeStart");
+ String visitTimeEnd = request.getParameter("visitTimeEnd");
+ if(StringUtils.isNotBlank(visitTimeStart) && StringUtils.isNotBlank(visitTimeEnd)) {
+ terms.put("visitTimeStart", visitTimeStart + " 00:00:00");
+ terms.put("visitTimeEnd", visitTimeEnd + " 23:59:59");
+ }
+ String createStart = request.getParameter("createStart");
+ String createEnd = request.getParameter("createEnd");
+ if(StringUtils.isNotBlank(createStart) && StringUtils.isNotBlank(createEnd)) {
+ terms.put("createStart", createStart+ " 00:00:00");
+ terms.put("createEnd", createEnd+ " 23:59:59");
+ }
+ String closeStart = request.getParameter("closeStart");
+ String closeEnd = request.getParameter("closeEnd");
+ if(StringUtils.isNotBlank(closeStart) && StringUtils.isNotBlank(closeEnd)) {
+ terms.put("createStart", closeStart+ " 00:00:00");
+ terms.put("createEnd", closeEnd+ " 23:59:59");
+ }
+ String fileStart = request.getParameter("fileStart");
+ String fileEnd = request.getParameter("fileEnd");
+ if(StringUtils.isNotBlank(fileStart) && StringUtils.isNotBlank(fileEnd)) {
+ terms.put("createStart", fileStart+ " 00:00:00");
+ terms.put("createEnd", fileEnd+ " 23:59:59");
+ }
+ String areaType = request.getParameter("areaType");
+ if (StringUtils.isNotBlank(areaType)){
+ terms.put("areaType", areaType);
+ }
+ // 实际调解组织编号
+ String mediateUnitId = request.getParameter("mediateUnitId");
+ if (StringUtils.isNotBlank(mediateUnitId)){
+ terms.put("mediateUnitId", mediateUnitId);
+ }
+ // 配合组织，多个用,隔开
+ String assistUnitId = request.getParameter("assistUnitId");
+ if (StringUtils.isNotBlank(assistUnitId)){
+ terms.put("assistUnitId", assistUnitId);
+ }
+ // 配合组织，多个用,隔开
+ String evaluateGrade = request.getParameter("evaluateGrade");
+ if (StringUtils.isNotBlank(evaluateGrade)){
+ terms.put("evaluateGrade", evaluateGrade);
+ }
+ String peopleNum = request.getParameter("peopleNum");
+ if (StringUtils.isNotBlank(peopleNum)){
+ String[] split = peopleNum.split("-");
+ 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("-");
+ 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;
+ }
+
/**
* 获取请求URL参数
* @return Map<String, Object>
@@ -336,7 +411,7 @@
if (StringUtils.isNotBlank(inputWay)){
terms.put("inputWay", inputWay);
}
- // 事项状态，1：待分派，2：待签收，3：待受理，:4：办理中，5：结案审核，6：待评价，7：已归档
+ // 事项状态，1：待分派，2：待签收，3：待受理，4：化解中，5：结案审核，6：待评价，7：已归档，8：不予受理
String status = request.getParameter("status");
if (StringUtils.isNotBlank(status)){
terms.put("status", status);
@@ -356,7 +431,7 @@
if (StringUtils.isNotBlank(processName)){
terms.put("processName", processName);
}
- // 对外展示事项进度，1：待受理，2：办理中，3：已结案
+ // 对外展示事项进度，1：待受理，2：化解中，3：已结案，4：不予受理
String infoProcess = request.getParameter("process");
if (StringUtils.isNotBlank(infoProcess)){
terms.put("infoProcess", infoProcess);
@@ -551,7 +626,7 @@
@GetMapping("/pageQueryAll")
public Object pageQueryAll(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
try {
- Map<String, Object> terms = getParameter();
+ Map<String, Object> terms = getParameterAll();
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);
@@ -571,7 +646,7 @@
@RequestMapping("/exportQueryAll")
public void exportQueryAll(HttpServletResponse response) {
try {
- Map<String, Object> terms = getParameter();
+ Map<String, Object> terms = getParameterAll();
Sort sort = Sort.by(Sort.Direction.DESC, "a.create_time");
PageRequest pageRequest = PageRequest.of(0, 1000000, sort);
Page<CasePageDTO> caseInfoPage = service.pageQueryAll(pageRequest, terms);
@@ -580,24 +655,9 @@
for (CasePageDTO casePageDTO : caseInfoPage.getContent()) {
CaseInfoWeExcelDTO caseInfoWeExcelDTO = new CaseInfoWeExcelDTO();
BeanUtils.copyProperties(casePageDTO,caseInfoWeExcelDTO);
- 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.setCloseTime(DateUtils.DateToString(casePageDTO.getCloseTime(), DateUtils.YYYY_MM_DD));
+ caseInfoWeExcelDTO.setCreateTime(DateUtils.DateToString(casePageDTO.getCreateTime(), DateUtils.YYYY_MM_DD));
+ caseInfoWeExcelDTO.setCaseTypeName(casePageDTO.getCaseTypeFirstName()+"/"+casePageDTO.getCaseTypeName());
excelList.add(caseInfoWeExcelDTO);
}
}
@@ -612,4 +672,21 @@
}
}
+
+ /**
+ * 综合查询
+ * @url {ctx}/api/web/caseInfo/statistics
+ * @return Object
+ * @CurrentUser String userId
+ */
+ @GetMapping("/statistics")
+ public Object statistics() {
+ try {
+ Map<String, Object> terms = getParameterAll();
+ return ReturnSucUtils.getRepInfo( "处理成功", service.statistics(terms));
+ } catch (Exception e) {
+ log.error("Controller接口[CaseInfoWebController.statistics]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
}
--
Gitblit v1.8.0