From bfb5b0c14bec340af93779d6de1f9e6e8fe03c37 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Sun, 22 Sep 2024 17:41:41 +0800
Subject: [PATCH] 首页弹窗
---
dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java | 2 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java | 4 +-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java | 15 ++++++-
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java | 4 +
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java | 46 +++++++++++++++++++---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 6 ++-
6 files changed, 62 insertions(+), 15 deletions(-)
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java
index e085d80..6759cca 100644
--- a/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/mediate/constant/CaseBaseConstsEnum.java
@@ -15,6 +15,8 @@
*/
CASE_CANAL_1("22_00001-1", "大厅来访"),
CASE_CANAL_2("22_00001-2", "线上来访"),
+ CASE_CANAL_3("22_00001-3", "自行排查"),
+ CASE_CANAL_4("22_00001-4", "协同推送"),
/**
* 来访形式，24_00002-1：来访，22_024_000020001-2：线上
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java
index 80866bc..711bdfd 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseRegisterInfoWebController.java
@@ -1,5 +1,6 @@
package cn.huge.module.cases.controller.web;
+import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
import cn.huge.module.cases.domain.dto.CaseRegisterDTO;
@@ -113,15 +114,46 @@
private CaseInfoService service;
@GetMapping("/pageQuery")
- public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size, @RequestParam(value = "orderBy") String orderBy) {
+ public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size
+ ) {
try {
- Sort sort = null;
- if (StringUtil.isEmpty(orderBy)) {
- sort = Sort.by(Sort.Direction.DESC, "createTime");
- } else {
- sort = Sort.by(Sort.Direction.DESC, orderBy);
- }
Map<String, Object> terms = getParameter();
+ // 排序
+ 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 = "t1.create_time";
+ break;
+ case 2:
+ sortName = "t1.case_level";
+ break;
+ case 3:
+ sortName = "t3.number";
+ 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, "t1.create_time");
+ }
+
PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
Page<CaseRegisterDTO> caseInfoPage = service.pageQueryRegister(pageRequest, terms);
return ReturnSucUtils.getRepInfo("处理成功", caseInfoPage);
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
index f8ecdc4..34da7a8 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseTaskWebController.java
@@ -965,13 +965,12 @@
* @url {ctx}/api/web/caseTask/pageMyTaskYb
* @param page 页码
* @param size 每页数量
- * @param sortColmn 排序字段（1：办理时间；2：事项等级；3：督办次数）
- * @param sortType 排序方式（1：正序；2：倒序）
+ * sortColmn 排序字段（1：办理时间；2：事项等级；3：督办次数）
+ * sortType 排序方式（1：正序；2：倒序）
* @return
*/
@GetMapping("/pageMyTaskYb")
public Object pageMyTaskYb(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size,
- @RequestParam(value = "sortColmn") int sortColmn, @RequestParam(value = "sortType") int sortType,
@CurrentUser String userId) {
try {
// 条件
@@ -1025,6 +1024,16 @@
// 排序
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 = "t1.handle_time";
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 28e2dba..e43b8c0 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
@@ -40,6 +40,7 @@
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
import java.util.*;
import java.util.stream.Collectors;
@@ -1085,13 +1086,14 @@
* */
public CaseAreaDTO getArea() throws IOException {
Class<?> clazz = CaseAreaDTO.class;
- String path = clazz.getResource("").getPath();
+ String path = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();
ObjectMapper mapper = new ObjectMapper();
- File file = new File(path+"Area.json");
+ File file = new File(path+ "cn"+File.separator+"huge"+File.separator+"module"+File.separator+"cases"+File.separator+"domain"+File.separator+"json"+File.separator+"Area.json");
CaseAreaDTO obj = mapper.readValue(file, CaseAreaDTO.class);
return obj;
}
+
/**
* 根据不同的等级获取不同区域子集合
* @param areaType 1-市级 2-区
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java
index 7134f33..2c5c118 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java
@@ -386,7 +386,7 @@
* @return Object
*/
@GetMapping("/pageQuery")
- public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
+ public Object pageQuery(@CurrentUser String userId,@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
try {
Map<String, Object> terms = getParameter();
Sort sort = Sort.by(Sort.Direction.DESC, "create_time");
@@ -408,7 +408,7 @@
}
PageRequest pageRequest = PageRequest.of(page-1, size, sort);
- Page<CasedraftInfo> casedraftInfoPage = service.pageQuery(pageRequest, terms);
+ Page<CasedraftInfo> casedraftInfoPage = service.pageQuery(pageRequest, terms,userId);
return ReturnSucUtils.getRepInfo( "处理成功", casedraftInfoPage);
} catch (Exception e) {
return ReturnFailUtils.getRepInfo();
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java
index bb65d5c..7d4e76b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java
@@ -135,7 +135,9 @@
* @param terms 条件
* @return Page
*/
- public Page<CasedraftInfo> pageQuery(PageRequest page, Map<String, Object> terms){
+ public Page<CasedraftInfo> pageQuery(PageRequest page, Map<String, Object> terms,String userId){
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ terms.put("inputUnitId", loginUser.getUnitId());
long total = mapper.countTerms(terms);
List<CasedraftInfo> content = mapper.pageTerms(page, terms);
return new PageImpl<CasedraftInfo>(content, page, total);
--
Gitblit v1.8.0