From c35090abedcfd1c9a8d53794570e836f2b0bb866 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 17 Feb 2022 15:25:43 +0800
Subject: [PATCH] 督办单编号唯一性

---
 screen-api/src/main/java/com/moral/api/controller/SupervisionController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java b/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
index 5f07951..9ecaf4b 100644
--- a/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/SupervisionController.java
@@ -5,6 +5,7 @@
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -42,6 +43,7 @@
 
     @ApiOperation(value = "���������������������", notes = "���������������������")
     @ApiImplicitParams({
+            @ApiImplicitParam(name = "organizationId", value = "������id", required = false, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "cityCode", value = "���������", required = false, paramType = "query", dataType = "int"),
             @ApiImplicitParam(name = "start", value = "������������", required = false, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "end", value = "������������", required = false, paramType = "query", dataType = "String"),
@@ -51,7 +53,7 @@
     @GetMapping("select")
     public ResultMessage select(HttpServletRequest request) {
         Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
-        if (!params.containsKey("cityCode")) {
+        if (!params.containsKey("cityCode") && !params.containsKey("organizationId")) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
 
@@ -69,4 +71,14 @@
         return ResultMessage.ok();
     }
 
+    @ApiOperation(value = "���������������", notes = "���������������")
+    @GetMapping("delete")
+    public ResultMessage delete(Integer supervisionId) {
+        if (ObjectUtils.isEmpty(supervisionId)) {
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        }
+        supervisionService.deleteSupervision(supervisionId);
+        return ResultMessage.ok();
+    }
+
 }

--
Gitblit v1.8.0