From 716f57dacce347ba154f3b6a994f4e383e3a97a4 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Thu, 05 Sep 2024 11:15:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CaseInfoWebController.java |   37 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 36 insertions(+), 1 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 add1d84..3cc3009 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
@@ -345,6 +345,26 @@
         if (StringUtils.isNotBlank(processName)){
             terms.put("processName", processName);
         }
+        // 意向调解组织编号
+        String wantUnitId = request.getParameter("wantUnitId");
+        if (StringUtils.isNotBlank(wantUnitId)){
+            terms.put("wantUnitId", wantUnitId);
+        }
+        // 意向调解组织名称
+        String wantUnitName = request.getParameter("wantUnitName");
+        if (StringUtils.isNotBlank(wantUnitName)){
+            terms.put("wantUnitName", wantUnitName);
+        }
+        // 意向调解员编号
+        String wantUserId = request.getParameter("wantUserId");
+        if (StringUtils.isNotBlank(wantUserId)){
+            terms.put("wantUserId", wantUserId);
+        }
+        // 意向调解员名称
+        String wantUserName = request.getParameter("wantUserName");
+        if (StringUtils.isNotBlank(wantUserName)){
+            terms.put("wantUserName", wantUserName);
+        }
         // 删除状态,0:未删除,1:已删除
         String deleteStatus = request.getParameter("deleteStatus");
         if (StringUtils.isNotBlank(deleteStatus)){
@@ -456,7 +476,7 @@
 
     /**
      * PC端-纠纷登记-保存纠纷信息-正常案件
-     * @url {ctx}/api/v1/caseInfo/caseRegister
+     * @url {ctx}/api/web/caseInfo/caseRegister
      * @param registerSaveDTO 实体对象
      */
     @PostMapping("/caseRegister")
@@ -468,4 +488,19 @@
             return ReturnFailUtils.getRepInfo(e.getMessage());
         }
     }
+
+    /**
+     * PC端-正式案件-查询纠纷信息
+     * @url {ctx}/api/web/caseInfo/getCaseInfo?id=
+     * @param id 纠纷编号
+     * @return Object
+     */
+    @GetMapping("/getCaseInfo")
+    public Object getCaseInfo(@RequestParam(value = "id") String id) {
+        try {
+            return ReturnSucUtils.getRepInfo(service.getCaseInfo(id));
+        } catch (Exception e) {
+            return ReturnFailUtils.getRepInfo(e.getMessage());
+        }
+    }
 }

--
Gitblit v1.8.0