From 24d3def5fd8dc526ce9439449d2725b529e394f2 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sun, 22 Sep 2024 13:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/controller/web/CasedraftInfoWebController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 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 9ceccdd..7134f33 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;
}
@@ -370,6 +390,23 @@
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);
return ReturnSucUtils.getRepInfo( "处理成功", casedraftInfoPage);
@@ -426,8 +463,8 @@
}
/**
- * PC端-纠纷登记-草稿箱-保存纠纷信息
- * @url {ctx}/api/v1/casedraftInfo/caseDraftRegister
+ * PC端-纠纷登记-保存纠纷信息草稿
+ * @url {ctx}/api/web/casedraftInfo/caseDraftRegister
* @param draftRegisterSaveDTO 实体对象
*/
@PostMapping("/caseDraftRegister")
@@ -439,4 +476,19 @@
return ReturnFailUtils.getRepInfo(e.getMessage());
}
}
+
+ /**
+ * PC端-正式案件-查询纠纷信息草稿
+ * @url {ctx}/api/web/casedraftInfo/getCasedraftInfo?id=
+ * @param id 纠纷编号
+ * @return Object
+ */
+ @GetMapping("/getCasedraftInfo")
+ public Object getCasedraftInfo(@RequestParam(value = "id") String id) {
+ try {
+ return ReturnSucUtils.getRepInfo(service.getCasedraftInfo(id));
+ } catch (Exception e) {
+ return ReturnFailUtils.getRepInfo(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0