From 8a87336ca8f99ccb79c8eeb3e3796c2e41d207e7 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Tue, 24 Sep 2024 19:03:07 +0800
Subject: [PATCH] 1、流程督办，当时人评价节点优化
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
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 522867e..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
@@ -281,6 +281,11 @@
if (StringUtils.isNotBlank(plaintiffs)){
terms.put("plaintiffs", plaintiffs);
}
+ // 申请方当事人名称关键词
+ String plaintiffsKey = request.getParameter("plaintiffsKey");
+ if (StringUtils.isNotBlank(plaintiffsKey)){
+ terms.put("plaintiffsKey", plaintiffsKey);
+ }
// 申请方代理人名称
String pagents = request.getParameter("pagents");
if (StringUtils.isNotBlank(pagents)){
@@ -290,6 +295,11 @@
String defendants = request.getParameter("defendants");
if (StringUtils.isNotBlank(defendants)){
terms.put("defendants", defendants);
+ }
+ // 被申请方当事人名称关键词
+ String defendantsKey = request.getParameter("defendantsKey");
+ if (StringUtils.isNotBlank(defendantsKey)){
+ terms.put("defendantsKey", defendantsKey);
}
// 被申请方代理人名称
String dagents = request.getParameter("dagents");
@@ -340,6 +350,16 @@
terms.put("updateStart", updateStart);
terms.put("updateEnd", updateEnd);
}
+ // 保存时间排序
+ String saveTimeSort = request.getParameter("saveTimeSort");
+ if (StringUtils.isNotBlank(saveTimeSort)){
+ terms.put("saveTimeSort", saveTimeSort);
+ }
+ // 事件等级排序
+ String caseLevelSort = request.getParameter("caseLevelSort");
+ if (StringUtils.isNotBlank(caseLevelSort)){
+ terms.put("caseLevelSort", caseLevelSort);
+ }
return terms;
}
@@ -366,12 +386,29 @@
* @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");
+ if(terms.get("saveTimeSort") != null) {
+ String saveTimeSort = terms.get("saveTimeSort").toString().toUpperCase();
+ if("ASC".equals(saveTimeSort)) {
+ sort = Sort.by(Sort.Direction.ASC, "update_time");
+ } else if("DESC".equals(saveTimeSort)) {
+ sort = Sort.by(Sort.Direction.DESC, "update_time");
+ }
+ }
+ if (terms.get("caseLevelSort") != null) {
+ String caseLevelSort = terms.get("caseLevelSort").toString().toUpperCase();
+ if("ASC".equals(caseLevelSort)) {
+ sort = Sort.by(Sort.Direction.ASC, "case_level");
+ } else if("DESC".equals(caseLevelSort)) {
+ sort = Sort.by(Sort.Direction.DESC, "case_level");
+ }
+ }
+
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();
--
Gitblit v1.8.0