From bca00a0b5dab62c0db29ce409acfc2e8f4cd94fd Mon Sep 17 00:00:00 2001
From: liao <2948196353@qq.com>
Date: Tue, 16 Nov 2021 17:29:49 +0800
Subject: [PATCH] ~

---
 .../controller/WgdCgfyController.java         | 33 +++++++++----------
 .../controller/WgdFyfyController.java         | 16 ++++-----
 .../controller/WgdSrbController.java          | 16 ++++-----
 .../controller/WgdWbtjController.java         | 16 ++++-----
 .../controller/WgdWbxdController.java         | 16 ++++-----
 .../controller/WgdZcbController.java          | 16 ++++-----
 .../service/impl/WgdCgfyServiceImpl.java      |  4 +--
 7 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java
index e3a2d245..854680d8 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java
@@ -1,70 +1,69 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
-import com.adc.da.base.web.BaseController;
 import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService;
-import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
 
 import java.util.List;
 
 /**
-* <p>
-    * 采购费用信息统计 前端控制器
-    * </p>
-*
-* @author super_liu
-* @since 2021-11-12
-*/
+ * <p>
+ * 委员信息数据统计 前端控制器
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
 @RestController
 @Api(description = "|WgdCgfy|")
 @RequestMapping("api/wgdCensusLeo/wgd-cgfy")
 public class WgdCgfyController extends BaseController<WgdCgfy> {
-
     @Autowired
     IWgdCgfyService iWgdCgfyService;
 
-    @GetMapping("getAllCgfys")
+    @GetMapping("/getAllCgfys")
     public ResponseMessage<Object> getAllWgdCgfys(){//查询所有
         return Result.success(iWgdCgfyService.getAllWgdCgfys());
     }
 
-    @PostMapping("queryAllCgfys")
+    @PostMapping("/queryAllCgfys")
     public ResponseMessage<Object> queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询
         List<WgdCgfy> wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy);
         PageInfo pageInfo = getPageInfo(wgdCgfy.getPager(),wgdCgfys);
         return Result.success(pageInfo);
     }
 
-    @GetMapping("getCgfyById")
+    @GetMapping("/getCgfyById")
     public ResponseMessage<Object> getWgdCgfyById(String id) {//查询详情
         return Result.success(iWgdCgfyService.getWgdCgfyById(id));
     }
 
-    @PostMapping("modCgfy")
+    @PostMapping("/modCgfy")
     ResponseMessage<Object> updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑
         return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy));
     }
 
-    @PostMapping("addCgfy")
+    @PostMapping("/addCgfy")
     ResponseMessage<Object> insertWgdCgfy(WgdCgfy WgdCgfy) {//插入
         return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy));
     }
 
-    @GetMapping("delCgfy")
+    @GetMapping("/delCgfy")
     ResponseMessage<Object> deleteWgdCgfy(String id){//删除
         return Result.success(iWgdCgfyService.deleteWgdCgfy(id));
     }
 
-    @GetMapping("delCgfys")
+    @GetMapping("/delCgfys")
     ResponseMessage<Object> deleteWgdCgfys(String ids){//批量删除
         return Result.success(iWgdCgfyService.deleteWgdCgfys(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java
index be878baa..7ffb5987 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java
@@ -26,44 +26,44 @@ import java.util.List;
 */
 @RestController
 @Api(description = "|WgdFyfy|")
-@RequestMapping("/wgdCensusLeo/wgd-fyfy")
+@RequestMapping("api/wgdCensusLeo/wgd-fyfy")
 public class WgdFyfyController extends BaseController<WgdFyfy> {
     @Autowired
     IWgdFyfyService iWgdFyfyService;
 
-    @GetMapping("getAllFyfys")
+    @GetMapping("/getAllFyfys")
     public ResponseMessage<Object> getAllWgdFyfys(){//查询所有
         return Result.success(iWgdFyfyService.getAllWgdFyfys());
     }
 
-    @PostMapping("queryAllFyfys")
+    @PostMapping("/queryAllFyfys")
     public ResponseMessage<Object> queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询
         List<WgdFyfy> wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy);
         PageInfo pageInfo = getPageInfo(wgdFyfy.getPager(),wgdFyfys);
         return Result.success(pageInfo);
     }
 
-    @GetMapping("getFyfyById")
+    @GetMapping("/getFyfyById")
     public ResponseMessage<Object> getWgdFyfyById(String id) {//查询详情
         return Result.success(iWgdFyfyService.getWgdFyfyById(id));
     }
 
-    @PostMapping("modFyfy")
+    @PostMapping("/modFyfy")
     ResponseMessage<Object> updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑
         return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy));
     }
 
-    @PostMapping("addFyfy")
+    @PostMapping("/addFyfy")
     ResponseMessage<Object> insertWgdFyfy(WgdFyfy WgdFyfy) {//插入
         return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy));
     }
 
-    @GetMapping("delFyfy")
+    @GetMapping("/delFyfy")
     ResponseMessage<Object> deleteWgdFyfy(String id){//删除
         return Result.success(iWgdFyfyService.deleteWgdFyfy(id));
     }
 
-    @GetMapping("delFyfys")
+    @GetMapping("/delFyfys")
     ResponseMessage<Object> deleteWgdFyfys(String ids){//批量删除
         return Result.success(iWgdFyfyService.deleteWgdFyfys(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java
index 53a5d130..08fd79b4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java
@@ -26,44 +26,44 @@ import java.util.List;
 */
 @RestController
 @Api(description = "|WgdSrb|")
-@RequestMapping("/wgdCensusLeo/wgd-srb")
+@RequestMapping("api/wgdCensusLeo/wgd-srb")
 public class WgdSrbController extends BaseController<WgdSrb> {
     @Autowired
     IWgdSrbService iWgdSrbService;
 
-    @GetMapping("getAllSrbs")
+    @GetMapping("/getAllSrbs")
     public ResponseMessage<Object> getAllWgdSrbs(){//查询所有
         return Result.success(iWgdSrbService.getAllWgdSrbs());
     }
 
-    @PostMapping("queryAllSrbs")
+    @PostMapping("/queryAllSrbs")
     public ResponseMessage<Object> queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询
         List<WgdSrb> wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb);
         PageInfo pageInfo = getPageInfo(wgdSrb.getPager(),wgdSrbs);
         return Result.success(pageInfo);
     }
 
-    @GetMapping("getSrbById")
+    @GetMapping("/getSrbById")
     public ResponseMessage<Object> getWgdSrbById(String id) {//查询详情
         return Result.success(iWgdSrbService.getWgdSrbById(id));
     }
 
-    @PostMapping("modSrb")
+    @PostMapping("/modSrb")
     ResponseMessage<Object> updateWgdSrb(WgdSrb WgdSrb) {//编辑
         return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb));
     }
 
-    @PostMapping("addSrb")
+    @PostMapping("/addSrb")
     ResponseMessage<Object> insertWgdSrb(WgdSrb WgdSrb) {//插入
         return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb));
     }
 
-    @GetMapping("delSrb")
+    @GetMapping("/delSrb")
     ResponseMessage<Object> deleteWgdSrb(String id){//删除
         return Result.success(iWgdSrbService.deleteWgdSrb(id));
     }
 
-    @GetMapping("delSrbs")
+    @GetMapping("/delSrbs")
     ResponseMessage<Object> deleteWgdSrbs(String ids){//批量删除
         return Result.success(iWgdSrbService.deleteWgdSrbs(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java
index e581b18d..55da40a6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java
@@ -26,44 +26,44 @@ import java.util.List;
 */
 @RestController
 @Api(description = "|WgdWbtj|")
-@RequestMapping("/wgdCensusLeo/wgd-wbtj")
+@RequestMapping("api/wgdCensusLeo/wgd-wbtj")
 public class WgdWbtjController extends BaseController<WgdWbtj> {
     @Autowired
     IWgdWbtjService iWgdWbtjService;
 
-    @GetMapping("getAllWbtjs")
+    @GetMapping("/getAllWbtjs")
     public ResponseMessage<Object> getAllWgdWbtjs(){//查询所有
         return Result.success(iWgdWbtjService.getAllWgdWbtjs());
     }
 
-    @PostMapping("queryAllWbtjs")
+    @PostMapping("/queryAllWbtjs")
     public ResponseMessage<Object> queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询
         List<WgdWbtj> wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj);
         PageInfo pageInfo = getPageInfo(wgdWbtj.getPager(),wgdWbtjs);
         return Result.success(pageInfo);
     }
 
-    @GetMapping("getWbtjById")
+    @GetMapping("/getWbtjById")
     public ResponseMessage<Object> getWgdWbtjById(String id) {//查询详情
         return Result.success(iWgdWbtjService.getWgdWbtjById(id));
     }
 
-    @PostMapping("modWbtj")
+    @PostMapping("/modWbtj")
     ResponseMessage<Object> updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑
         return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj));
     }
 
-    @PostMapping("addWbtj")
+    @PostMapping("/addWbtj")
     ResponseMessage<Object> insertWgdWbtj(WgdWbtj WgdWbtj) {//插入
         return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj));
     }
 
-    @GetMapping("delWbtj")
+    @GetMapping("/delWbtj")
     ResponseMessage<Object> deleteWgdWbtj(String id){//删除
         return Result.success(iWgdWbtjService.deleteWgdWbtj(id));
     }
 
-    @GetMapping("delWbtjs")
+    @GetMapping("/delWbtjs")
     ResponseMessage<Object> deleteWgdWbtjs(String ids){//批量删除
         return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java
index 36566cd7..9909be49 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java
@@ -26,44 +26,44 @@ import java.util.List;
 */
 @RestController
 @Api(description = "|WgdWbxd|")
-@RequestMapping("/wgdCensusLeo/wgd-wbxd")
+@RequestMapping("api/wgdCensusLeo/wgd-wbxd")
 public class WgdWbxdController extends BaseController<WgdWbxd> {
     @Autowired
     IWgdWbxdService iWgdWbxdService;
 
-    @GetMapping("getAllWbxds")
+    @GetMapping("/getAllWbxds")
     public ResponseMessage<Object> getAllWgdWbxds(){//查询所有
         return Result.success(iWgdWbxdService.getAllWgdWbxds());
     }
 
-    @PostMapping("queryAllWbxds")
+    @PostMapping("/queryAllWbxds")
     public ResponseMessage<Object> queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询
         List<WgdWbxd> wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd);
         PageInfo pageInfo = getPageInfo(wgdWbxd.getPager(),wgdWbxds);
         return Result.success(pageInfo);
     }
 
-    @GetMapping("getWbxdById")
+    @GetMapping("/getWbxdById")
     public ResponseMessage<Object> getWgdWbxdById(String id) {//查询详情
         return Result.success(iWgdWbxdService.getWgdWbxdById(id));
     }
 
-    @PostMapping("modWbxd")
+    @PostMapping("/modWbxd")
     ResponseMessage<Object> updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑
         return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd));
     }
 
-    @PostMapping("addWbxd")
+    @PostMapping("/addWbxd")
     ResponseMessage<Object> insertWgdWbxd(WgdWbxd WgdWbxd) {//插入
         return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd));
     }
 
-    @GetMapping("delWbxd")
+    @GetMapping("/delWbxd")
     ResponseMessage<Object> deleteWgdWbxd(String id){//删除
         return Result.success(iWgdWbxdService.deleteWgdWbxd(id));
     }
 
-    @GetMapping("delWbxds")
+    @GetMapping("/delWbxds")
     ResponseMessage<Object> deleteWgdWbxds(String ids){//批量删除
         return Result.success(iWgdWbxdService.deleteWgdWbxds(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java
index d42fb3a0..9763f584 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java
@@ -26,44 +26,44 @@ import java.util.List;
 */
 @RestController
 @Api(description = "|WgdZcb|")
-@RequestMapping("/wgdCensusLeo/wgd-zcb")
+@RequestMapping("api/wgdCensusLeo/wgd-zcb")
 public class WgdZcbController extends BaseController<WgdZcb> {
     @Autowired
     IWgdZcbService iWgdZcbService;
 
-    @GetMapping("getAllZcbs")
+    @GetMapping("/getAllZcbs")
     public ResponseMessage<Object> getAllWgdZcbs(){//查询所有
         return Result.success(iWgdZcbService.getAllWgdZcbs());
     }
 
-    @PostMapping("queryAllZcbs")
+    @PostMapping("/queryAllZcbs")
     public ResponseMessage<Object> queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询
         List<WgdZcb> wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb);
         PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs);
         return Result.success(pageInfo);
     }
 
-    @GetMapping("getZcbById")
+    @GetMapping("/getZcbById")
     public ResponseMessage<Object> getWgdZcbById(String id) {//查询详情
         return Result.success(iWgdZcbService.getWgdZcbById(id));
     }
 
-    @PostMapping("modZcb")
+    @PostMapping("/modZcb")
     ResponseMessage<Object> updateWgdZcb(WgdZcb WgdZcb) {//编辑
         return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb));
     }
 
-    @PostMapping("addZcb")
+    @PostMapping("/addZcb")
     ResponseMessage<Object> insertWgdZcb(WgdZcb WgdZcb) {//插入
         return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb));
     }
 
-    @GetMapping("delZcb")
+    @GetMapping("/delZcb")
     ResponseMessage<Object> deleteWgdZcb(String id){//删除
         return Result.success(iWgdZcbService.deleteWgdZcb(id));
     }
 
-    @GetMapping("delZcbs")
+    @GetMapping("/delZcbs")
     ResponseMessage<Object> deleteWgdZcbs(String ids){//批量删除
         return Result.success(iWgdZcbService.deleteWgdZcbs(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java
index 4150dc78..fe6d36fc 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java
@@ -3,6 +3,7 @@ package com.adc.da.slrs.wgdCensusLeo.service.impl;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService;
+import com.adc.da.util.MD5Util;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +39,7 @@ public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> impleme
 
     @Override
     public WgdCgfy getWgdCgfyById(String id) {
-        return wgdCgfyDao.selectOne(id);
+        return wgdCgfyDao.selectById(id);
     }
 
     @Override
@@ -59,7 +60,6 @@ public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> impleme
 
     @Override
     public int deleteWgdCgfys(String ids) {
-        String[] str = ids.split(",");
         return wgdCgfyDao.deleteBatch();
     }
 }