From dd858aaff4fcfb6af99ab094fbf13fef5f4339a2 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Mon, 21 Oct 2024 10:44:49 +0800
Subject: [PATCH] fix:解纷态势-街道展示区域优化
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java | 175 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 165 insertions(+), 10 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 cb97ed5..cd83e92 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
@@ -5,15 +5,14 @@
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.base.config.CurrentUser;
-import cn.huge.module.cases.domain.dto.CaseInfoWeExcelDTO;
-import cn.huge.module.cases.domain.dto.CasePageDTO;
-import cn.huge.module.cases.domain.dto.CasePersonWeDTO;
-import cn.huge.module.cases.domain.dto.RegisterSaveDTO;
+import cn.huge.module.cases.domain.bo.CasePersonCountBO;
+import cn.huge.module.cases.domain.dto.*;
import cn.huge.module.cases.domain.po.CaseInfo;
import cn.huge.module.cases.service.CaseInfoService;
import cn.huge.module.client.api.impl.CustClientImpl;
import cn.huge.module.cust.dto.CtUserDTO;
import com.alibaba.excel.EasyExcel;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -82,10 +81,11 @@
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 queRoad = request.getParameter("queRoad");
+ if (StringUtils.isNotBlank(queRoad)){
+ terms.put("areaType", "2");
}
+
// 实际调解组织编号
String mediateUnitId = request.getParameter("mediateUnitId");
if (StringUtils.isNotBlank(mediateUnitId)){
@@ -96,11 +96,28 @@
if (StringUtils.isNotBlank(assistUnitId)){
terms.put("assistUnitId", assistUnitId);
}
+
+ // 实际调解组织编号
+ String mediateUnitName = request.getParameter("mediateUnitName");
+ if (StringUtils.isNotBlank(mediateUnitName)){
+ terms.put("mediateUnitName", mediateUnitName);
+ }
+ // 配合组织，多个用,隔开
+ String assistUnitName = request.getParameter("assistUnitName");
+ if (StringUtils.isNotBlank(assistUnitName)){
+ terms.put("assistUnitName", assistUnitName);
+ }
// 配合组织，多个用,隔开
String evaluateGrade = request.getParameter("evaluateGrade");
if (StringUtils.isNotBlank(evaluateGrade)){
terms.put("evaluateGrade", evaluateGrade);
}
+ // 配合组织，多个用,隔开
+ String mediResult = request.getParameter("mediResult");
+ if (StringUtils.isNotBlank(mediResult)){
+ terms.put("mediResult", mediResult);
+ }
+
String peopleNum = request.getParameter("peopleNum");
if (StringUtils.isNotBlank(peopleNum)){
String[] split = peopleNum.split("-");
@@ -441,6 +458,11 @@
if (StringUtils.isNotBlank(infoProcessName)){
terms.put("infoProcessName", infoProcessName);
}
+ // 小程序是否可见，0：不可见，1：可见
+ String partyShow = request.getParameter("partyShow");
+ if (StringUtils.isNotBlank(partyShow)){
+ terms.put("partyShow", partyShow);
+ }
// 意向调解组织编号
String wantUnitId = request.getParameter("wantUnitId");
if (StringUtils.isNotBlank(wantUnitId)){
@@ -627,7 +649,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);
@@ -649,6 +701,7 @@
Map<String, Object> terms = getParameterAll();
Sort sort = Sort.by(Sort.Direction.DESC, "a.create_time");
PageRequest pageRequest = PageRequest.of(0, 1000000, sort);
+ terms.put("report","report");
Page<CasePageDTO> caseInfoPage = service.pageQueryAll(pageRequest, terms);
List<CaseInfoWeExcelDTO> excelList = new ArrayList<>();
if(ObjectUtils.isNotEmpty(caseInfoPage.getContent())){
@@ -674,7 +727,7 @@
}
/**
- * 综合查询
+ * 解纷态势
* @url {ctx}/api/web/caseInfo/statistics
* @return Object
* @CurrentUser String userId
@@ -682,11 +735,113 @@
@GetMapping("/statistics")
public Object statistics() {
try {
+ String userId = "2409190725411031";
Map<String, Object> terms = getParameterAll();
- return ReturnSucUtils.getRepInfo( "处理成功", service.statistics(terms));
+ return ReturnSucUtils.getRepInfo( "处理成功", service.statistics(terms,userId));
} catch (Exception e) {
log.error("Controller接口[CaseInfoWebController.statistics]请求异常："+e, e);
return ReturnFailUtils.getRepInfo();
}
}
+
+ /**
+ * 解纷态势-纠纷类型
+ * @url {ctx}/api/web/caseInfo/statisticsCaseType
+ * @return Object
+ * @CurrentUser String userId
+ */
+ @GetMapping("/statisticsCaseType")
+ public Object statisticsCaseType(@CurrentUser String userId) {
+ try {
+ Map<String, Object> terms = getParameterAll();
+ return ReturnSucUtils.getRepInfo( "处理成功", service.statisticsCaseType(terms,userId));
+ } catch (Exception e) {
+ log.error("Controller接口[CaseInfoWebController.statistics]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 小程序是否可见修改修改
+ * @url {ctx}/api/web/caseInfo/updateVisibleStatus
+ * @return Object
+ * @CurrentUser String userId
+ */
+ @PostMapping("/updateVisibleStatus")
+ public Object updateVisibleStatus(@RequestBody CaseInfo caseInfo) {
+ try {
+ service.updateCaseInfo(caseInfo);
+ return ReturnSucUtils.getRepInfo();
+ } catch (Exception e) {
+ log.error("Controller接口[CaseInfoWebController.statistics]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 个人查询
+ * @url {ctx}/api/web/caseInfo/pagePerson
+ * @param page 页码
+ * @param size 每页数量
+ * @return Object
+ */
+ @GetMapping("/pagePerson")
+ public Object pagePerson(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size, @RequestParam(value = "certiNo") String certiNo) {
+ try {
+ Map<String, Object> terms = getParameterAll();
+ 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.pagePerson(pageRequest, terms,certiNo);
+ return ReturnSucUtils.getRepInfo( "处理成功", caseInfoPage);
+ } catch (Exception e) {
+ log.error("Controller接口[CaseInfoWebController.pageQueryAll]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
+
+ /**
+ * 个人查询统计
+ * @url {ctx}/api/web/caseInfo/countPerson
+ * @return Object
+ */
+ @GetMapping("/countPerson")
+ public Object countPerson(@RequestParam(value = "certiNo") String certiNo) {
+ try {
+ CasePersonCountBO casePersonCountBO = service.countPerson(certiNo);
+ return ReturnSucUtils.getRepInfo( "处理成功", casePersonCountBO);
+ } catch (Exception e) {
+ log.error("Controller接口[CaseInfoWebController.pageQueryAll]请求异常："+e, e);
+ return ReturnFailUtils.getRepInfo();
+ }
+ }
}
--
Gitblit v1.8.0