diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
index b3887516..606e6e98 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java
@@ -86,6 +86,12 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
         return tsInstitutionService.getNext(institutionId,userName);
     }
 
+    @ApiOperation("获得下一级的部门和人员")
+    @GetMapping("/getNextById")
+    public List<TsInstitution> getNextById(String ids){
+        return tsInstitutionService.getNextById(ids);
+    }
+
     @ApiOperation("获得第一级部门目录")
     @GetMapping("/getFirstInstitution")
     public List<TsInstitution> getFirstInstitution(){
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
index bc0b5780..619e6efd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java
@@ -29,6 +29,8 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
      */
     List<TsInstitution> selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName);
 
+    List<TsInstitution> selectNextUserByIds(@Param("ids") List<String> ids);
+
 
     List<TsInstitution> selectTreeByIds(@Param("rootIds") List<String> rootIds);
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
index 48d24c8b..892228b0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java
@@ -37,6 +37,8 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
      */
     public List<TsInstitution> getNext(String institutionId,String userName);
 
+    public List<TsInstitution> getNextById(String ids);
+
     /**
      * 获得第一级的部门
      * @return
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
index ce821462..5f117ceb 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java
@@ -216,6 +216,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
         return tsInstitutions;
     }
 
+    public List<TsInstitution> getNextById(String ids){
+        List<String> strings=new ArrayList<>(Arrays.asList(ids.split(",")));
+        List<TsInstitution> tsUsers=tsInstitutionDao.selectNextUserByIds(strings);
+
+        return tsUsers;
+    }
+
 
    public List<TsInstitution> getFirst(){
         //查询第一层机构
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
index 077f5e0f..a2c3cd93 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandProjectLibrary.controller;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
@@ -100,8 +101,8 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
      **/
     @GetMapping("/queryProjectManager")
     @ApiOperation("查询产品线项目经理")
-    public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize){
-        IPage<SarStandProjectLibrary> list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize);
+    public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize, standDTO standDTO){
+        IPage<SarStandProjectLibrary> list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize, standDTO);
         // 创建一个新的list集合，用于存储去重后的元素
         List<productLineDto> listTemp = new ArrayList();
         for (SarStandProjectLibrary sarStandProjectLibrary:list1.getRecords()){
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
index eff55660..73a61e1c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
@@ -30,4 +30,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         List<String> getAllStand();
         List<SarStandProjectLibrary> updateByProjectId(@Param("id")String id, @Param("version")String version);
         void deleteByProjectId(@Param("projectId")String projectId);
+
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java
new file mode 100644
index 00000000..a5e5ea27
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java
@@ -0,0 +1,11 @@
+package com.adc.da.slrs.sarStandProjectLibrary.dao;
+
+import lombok.Data;
+
+@Data
+public class standDTO {
+
+    private String uname;
+
+    private String productLine;
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
index ccee2c44..e1487e33 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarStandProjectLibrary.service;
 
+import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,7 +18,7 @@ public interface SarStandProjectLibraryService {
     List<String> queryNotMaintenanceProjectsolostar(String type);
     Map<String, Object> solostar();
     List<SarStandProjectLibrary> queryById(String id);
-    IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize);
+    IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize, standDTO standDTO);
     List<SarStandProjectLibrary> queryByProductLine(String productLine);
     List<SarStandProjectLibrary> queryStandId(String standId);
     IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId, String cars);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
index 2553c394..ef5124ef 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl;
 import com.adc.da.ocr.util.UUIDUtils;
 import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
 import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
+import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
 import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
@@ -260,11 +261,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         return list;
     }
     @Override
-    public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) {
+    public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize, standDTO standDTO) {
+        StringBuilder stringBuilder=new StringBuilder();
+        stringBuilder.append("where 1=1 ");
+        if (null!=standDTO.getUname() && !"".equals(standDTO.getUname())){
+            stringBuilder.append("and s.NAME like '%"+standDTO.getUname()+"%' ");
+        }
+        if (null!=standDTO.getProductLine() && !"".equals(standDTO.getProductLine())){
+            stringBuilder.append("and sar_stand_project_library.product_line like '%"+standDTO.getProductLine()+"%' ");
+        }
+
         QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
         wrapper.select("product_line","s.user_id as projectManager","s.NAME AS uName");
         wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" +
-                " and sar_stand_project_library.product_line IS not NULL");
+                " and sar_stand_project_library.product_line IS not NULL "+stringBuilder.toString());
         Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
         IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
         System.out.println("总条数"+userIPage.getTotal());
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 93648137..ca9b942d 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,71 @@
 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 io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+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("/wgdCensusLeo/wgd-cgfy")
+@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")
+    @ApiOperation("查询")
+    @GetMapping("/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")
+    @ApiOperation("更新")
+    @PostMapping("/modCgfy")
     ResponseMessage<Object> updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑
         return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy));
     }
 
-    @PostMapping("addCgfy")
+    @ApiOperation("添加")
+    @PostMapping("/addCgfy")
     ResponseMessage<Object> insertWgdCgfy(WgdCgfy WgdCgfy) {//插入
         return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy));
     }
 
-    @GetMapping("delCgfy")
+    @PostMapping("/delCgfy")
     ResponseMessage<Object> deleteWgdCgfy(String id){//删除
         return Result.success(iWgdCgfyService.deleteWgdCgfy(id));
     }
 
-    @GetMapping("delCgfys")
+    @ApiOperation("删除")
+    @PostMapping("/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..37873d6f 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
@@ -6,12 +6,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService;
+import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import java.util.List;
@@ -26,44 +24,48 @@ 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")
+    @ApiOperation("查询")
+    @GetMapping("/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")
+    @ApiOperation("更新")
+    @PostMapping("/modFyfy")
     ResponseMessage<Object> updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑
         return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy));
     }
 
-    @PostMapping("addFyfy")
+    @ApiOperation("添加")
+    @PostMapping("/addFyfy")
     ResponseMessage<Object> insertWgdFyfy(WgdFyfy WgdFyfy) {//插入
         return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy));
     }
 
-    @GetMapping("delFyfy")
+    @PostMapping("/delFyfy")
     ResponseMessage<Object> deleteWgdFyfy(String id){//删除
         return Result.success(iWgdFyfyService.deleteWgdFyfy(id));
     }
 
-    @GetMapping("delFyfys")
+    @ApiOperation("删除")
+    @PostMapping("/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..51249bbf 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
@@ -6,12 +6,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService;
+import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import java.util.List;
@@ -26,44 +24,48 @@ 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")
+    @ApiOperation("查询")
+    @GetMapping("/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")
+    @ApiOperation("更新")
+    @PostMapping("/modSrb")
     ResponseMessage<Object> updateWgdSrb(WgdSrb WgdSrb) {//编辑
         return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb));
     }
 
-    @PostMapping("addSrb")
+    @ApiOperation("添加")
+    @PostMapping("/addSrb")
     ResponseMessage<Object> insertWgdSrb(WgdSrb WgdSrb) {//插入
         return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb));
     }
 
-    @GetMapping("delSrb")
+    @PostMapping("/delSrb")
     ResponseMessage<Object> deleteWgdSrb(String id){//删除
         return Result.success(iWgdSrbService.deleteWgdSrb(id));
     }
 
-    @GetMapping("delSrbs")
+    @ApiOperation("删除")
+    @PostMapping("/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..28694017 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
@@ -6,12 +6,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService;
+import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import java.util.List;
@@ -26,44 +24,48 @@ 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")
+    @ApiOperation("查询")
+    @GetMapping("/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")
+    @ApiOperation("更新")
+    @PostMapping("/modWbtj")
     ResponseMessage<Object> updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑
         return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj));
     }
 
-    @PostMapping("addWbtj")
+    @ApiOperation("添加")
+    @PostMapping("/addWbtj")
     ResponseMessage<Object> insertWgdWbtj(WgdWbtj WgdWbtj) {//插入
         return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj));
     }
 
-    @GetMapping("delWbtj")
+    @PostMapping("/delWbtj")
     ResponseMessage<Object> deleteWgdWbtj(String id){//删除
         return Result.success(iWgdWbtjService.deleteWgdWbtj(id));
     }
 
-    @GetMapping("delWbtjs")
+    @ApiOperation("删除")
+    @PostMapping("/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..dbb61d9f 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
@@ -6,12 +6,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService;
+import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import java.util.List;
@@ -26,44 +24,48 @@ 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")
+    @ApiOperation("查询")
+    @GetMapping("/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")
+    @ApiOperation("更新")
+    @PostMapping("/modWbxd")
     ResponseMessage<Object> updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑
         return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd));
     }
 
-    @PostMapping("addWbxd")
+    @ApiOperation("添加")
+    @PostMapping("/addWbxd")
     ResponseMessage<Object> insertWgdWbxd(WgdWbxd WgdWbxd) {//插入
         return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd));
     }
 
-    @GetMapping("delWbxd")
+    @PostMapping("/delWbxd")
     ResponseMessage<Object> deleteWgdWbxd(String id){//删除
         return Result.success(iWgdWbxdService.deleteWgdWbxd(id));
     }
 
-    @GetMapping("delWbxds")
+    @ApiOperation("删除")
+    @PostMapping("/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..49cbfd3d 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
@@ -6,12 +6,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService;
+import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import java.util.List;
@@ -26,44 +24,48 @@ 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")
+    @ApiOperation("查询")
+    @GetMapping("/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")
+    @ApiOperation("更新")
+    @PostMapping("/modZcb")
     ResponseMessage<Object> updateWgdZcb(WgdZcb WgdZcb) {//编辑
         return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb));
     }
 
-    @PostMapping("addZcb")
+    @ApiOperation("添加")
+    @PostMapping("/addZcb")
     ResponseMessage<Object> insertWgdZcb(WgdZcb WgdZcb) {//插入
         return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb));
     }
 
-    @GetMapping("delZcb")
+    @PostMapping("/delZcb")
     ResponseMessage<Object> deleteWgdZcb(String id){//删除
         return Result.success(iWgdZcbService.deleteWgdZcb(id));
     }
 
-    @GetMapping("delZcbs")
+    @ApiOperation("删除")
+    @PostMapping("/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/dao/WgdCgfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java
index b9cecd23..ea2981fd 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java
@@ -22,5 +22,5 @@ public interface WgdCgfyDao extends BaseMapper<WgdCgfy> {
     int updateOne(WgdCgfy wgdCgfy);//编辑
     int insertOne(WgdCgfy wgdCgfy);//插入
     int deleteOne(String id);//删除
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java
index 70532885..ca20525c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java
@@ -28,5 +28,5 @@ public interface WgdFyfyDao extends BaseMapper<WgdFyfy> {
 
     int deleteOne(String id);//删除
 
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java
index b30aa0b0..d3989678 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java
@@ -22,5 +22,5 @@ public interface WgdSrbDao extends BaseMapper<WgdSrb> {
     int updateOne(WgdSrb wgdSrb);//编辑
     int insertOne(WgdSrb wgdSrb);//插入
     int deleteOne(String id);//删除
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java
index 8b432eb2..14577768 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java
@@ -22,5 +22,5 @@ public interface WgdWbtjDao extends BaseMapper<WgdWbtj> {
     int updateOne(WgdWbtj wgdWbtj);//编辑
     int insertOne(WgdWbtj wgdWbtj);//插入
     int deleteOne(String id);//删除
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java
index d20d355e..50b4917d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java
@@ -22,5 +22,5 @@ public interface WgdWbxdDao extends BaseMapper<WgdWbxd> {
     int updateOne(WgdWbxd wgdWbxd);//编辑
     int insertOne(WgdWbxd wgdWbxd);//插入
     int deleteOne(String id);//删除
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java
index a2c3773d..2af97d73 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java
@@ -22,5 +22,5 @@ public interface WgdZcbDao extends BaseMapper<WgdZcb> {
     int updateOne(WgdZcb wgdZcb);//编辑
     int insertOne(WgdZcb wgdZcb);//插入
     int deleteOne(String id);//删除
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java
index b1df6e0e..ab802653 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java
@@ -39,11 +39,11 @@ public class WgdSrb extends BasePage {
     private String source;
 
     @ApiModelProperty(value = "补助金额")
-    private String money;
+    private String cost;
 
     @ApiModelProperty(value = "入账时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private String data;
+    private String time;
 
 
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java
index 20e2e9cf..a47c4c65 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java
@@ -32,7 +32,7 @@ public class WgdZcb extends BasePage {
     private String name;
 
     @ApiModelProperty(value = "支出金额")
-    private String money;
+    private String cost;
 
     @ApiModelProperty(value = "用途")
     private String use;
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..3845fc23 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
@@ -60,6 +61,6 @@ public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> impleme
     @Override
     public int deleteWgdCgfys(String ids) {
         String[] str = ids.split(",");
-        return wgdCgfyDao.deleteBatch();
+        return wgdCgfyDao.deleteBatch(str);
     }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java
index 08e12353..9de7a613 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java
@@ -60,6 +60,6 @@ public class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> impleme
     @Override
     public int deleteWgdFyfys(String ids) {
         String[] str = ids.split(",");
-        return wgdFyfyDao.deleteBatch();
+        return wgdFyfyDao.deleteBatch(str);
     }
 }
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java
index 138551e6..44498d8f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java
@@ -60,6 +60,6 @@ public class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements
     @Override
     public int deleteWgdSrbs(String ids) {
         String[] str = ids.split(",");
-        return wgdSrbDao.deleteBatch();
+        return wgdSrbDao.deleteBatch(str);
     }
 }
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java
index 70c65e7c..123c943c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java
@@ -60,6 +60,6 @@ public class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> impleme
     @Override
     public int deleteWgdWbtjs(String ids) {
         String[] str = ids.split(",");
-        return wgdWbtjDao.deleteBatch();
+        return wgdWbtjDao.deleteBatch(str);
     }
 }
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java
index fa887a85..74bb2122 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java
@@ -60,6 +60,6 @@ public class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> impleme
     @Override
     public int deleteWgdWbxds(String ids) {
         String[] str = ids.split(",");
-        return wgdWbxdDao.deleteBatch();
+        return wgdWbxdDao.deleteBatch(str);
     }
 }
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java
index ca0338c4..920d07e9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java
@@ -60,6 +60,6 @@ public class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements
     @Override
     public int deleteWgdZcbs(String ids) {
         String[] str = ids.split(",");
-        return wgdZcbDao.deleteBatch();
+        return wgdZcbDao.deleteBatch(str);
     }
 }
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java
index 8b2563c1..09891730 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java
@@ -42,7 +42,7 @@ public class WgdAssocCostController extends BaseController<WgdAssocCost> {
     }
 
     @ApiOperation("多条件查询")
-    @PostMapping("queryAllAssocCosts")
+    @GetMapping("queryAllAssocCosts")
     public ResponseMessage<Object> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询
         List<WgdAssocCost> wgdAssocCosts = iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost);
         PageInfo<WgdAssocCost> pageInfo = getPageInfo(wgdAssocCost.getPager(), wgdAssocCosts);
@@ -56,7 +56,7 @@ public class WgdAssocCostController extends BaseController<WgdAssocCost> {
     }
 
     @ApiOperation("编辑")
-    @PostMapping("modAssocCost")
+    @PutMapping("modAssocCost")
     ResponseMessage<Object> updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑
         return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost));
     }
@@ -74,7 +74,7 @@ public class WgdAssocCostController extends BaseController<WgdAssocCost> {
     }
 
     @ApiOperation("批量删除")
-    @GetMapping("delAssocCosts")
+    @DeleteMapping("delAssocCosts")
     ResponseMessage<Object> deleteWgdAssocCosts(String ids){//批量删除
         return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java
index 0823966b..05d0ab24 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java
@@ -5,13 +5,11 @@ import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService;
+import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import java.util.List;
@@ -36,7 +34,8 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
         return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos());
     }
 
-    @PostMapping("queryAllAssocInfos")
+    @ApiOperation("查询")
+    @GetMapping("queryAllAssocInfos")
     public ResponseMessage<Object> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询
         List<WgdAssocInfo> wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo);
         PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos);
@@ -48,11 +47,13 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
         return Result.success(iWgdAssocInfoService.getWgdAssocInfoById(id));
     }
 
+    @ApiOperation("更改")
     @PostMapping("modAssocInfo")
     ResponseMessage<Object> updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑
         return Result.success(iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo));
     }
 
+    @ApiOperation("添加")
     @PostMapping("addAssocInfo")
     ResponseMessage<Object> insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入
         return Result.success(iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo));
@@ -63,7 +64,8 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
         return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id));
     }
 
-    @GetMapping("delAssocInfos")
+    @ApiOperation("删除")
+    @PostMapping("delAssocInfos")
     ResponseMessage<Object> deleteWgdAssocInfos(String ids){//批量删除
         return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
index b3df81d3..019ab366 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
@@ -6,12 +6,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService;
+import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import java.util.List;
@@ -36,7 +34,8 @@ public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
         return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos());
     }
 
-    @PostMapping("queryAllCommiInfos")
+    @ApiOperation("查询")
+    @GetMapping("queryAllCommiInfos")
     public ResponseMessage<Object> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询
         List<WgdCommiInfo> wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo);
         PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos);
@@ -48,11 +47,13 @@ public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
         return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id));
     }
 
+    @ApiOperation("更新")
     @PostMapping("modCommiInfo")
     ResponseMessage<Object> updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
         return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo));
     }
 
+    @ApiOperation("添加")
     @PostMapping("addCommiInfo")
     ResponseMessage<Object> insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
         return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo));
@@ -63,7 +64,8 @@ public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
         return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id));
     }
 
-    @GetMapping("delCommiInfos")
+    @ApiOperation("删除")
+    @PostMapping("delCommiInfos")
     ResponseMessage<Object> deleteWgdCommiInfos(String ids){//批量删除
         return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java
index b76d0ab5..be484788 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java
@@ -6,12 +6,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService;
+import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 import java.util.List;
@@ -36,7 +34,8 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
         return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts());
     }
 
-    @PostMapping("queryAllExReviseCosts")
+    @ApiOperation("查询")
+    @GetMapping("queryAllExReviseCosts")
     public ResponseMessage<Object> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询
         List<WgdExReviseCost> wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost);
         PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts);
@@ -48,11 +47,13 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
         return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id));
     }
 
-    @PostMapping("modExReviseCost")
+    @ApiOperation("更改")
+    @PutMapping("modExReviseCost")
     ResponseMessage<Object> updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
         return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost));
     }
 
+    @ApiOperation("插入")
     @PostMapping("addExReviseCost")
     ResponseMessage<Object> insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入
         return Result.success(iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost));
@@ -63,7 +64,8 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
         return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id));
     }
 
-    @GetMapping("delExReviseCosts")
+    @ApiOperation("删除")
+    @DeleteMapping("delExReviseCosts")
     ResponseMessage<Object> deleteWgdExReviseCosts(String ids){//批量删除
         return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids));
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java
index 449692a3..c6f4a9e2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java
@@ -6,12 +6,10 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService;
+import io.swagger.annotations.ApiOperation;
 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 org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
 
@@ -30,39 +28,42 @@ public class WgdMeetCostController extends BaseController<WgdMeetCost> {
     @Autowired
     IWgdMeetCostService iWgdMeetCostService;
 
-    @GetMapping("getAllMeetCosts")
-    public ResponseMessage<Object> getAllWgdMeetCosts(){//查询所有
-        return Result.success(iWgdMeetCostService.getAllWgdMeetCosts());
-    }
-
-    @PostMapping("queryAllMeetCosts")
+    @ApiOperation("查询")
+    @GetMapping("queryAllMeetCosts")
     public ResponseMessage<Object> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询
         PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost));
         return Result.success(pageInfo);
     }
 
-    @GetMapping("getMeetCostById")
-    public ResponseMessage<Object> getWgdMeetCostById(String id) {//查询详情
-        return Result.success(iWgdMeetCostService.getWgdMeetCostById(id));
-    }
-
-    @PostMapping("modMeetCost")
+    @ApiOperation("更新")
+    @PutMapping("modMeetCost")
     ResponseMessage<Object> updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
         return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost));
     }
 
+    @ApiOperation("添加")
     @PostMapping("addMeetCost")
     ResponseMessage<Object> insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入
         return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost));
     }
 
+    @ApiOperation("删除")
+    @DeleteMapping("delMeetCosts")
+    ResponseMessage<Object> deleteWgdMeetCosts(String ids){//批量删除
+        return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids));
+    }
+
+    @GetMapping("getAllMeetCosts")
+    public ResponseMessage<Object> getAllWgdMeetCosts(){//查询所有
+        return Result.success(iWgdMeetCostService.getAllWgdMeetCosts());
+    }
+    @GetMapping("getMeetCostById")
+    public ResponseMessage<Object> getWgdMeetCostById(String id) {//查询详情
+        return Result.success(iWgdMeetCostService.getWgdMeetCostById(id));
+    }
     @GetMapping("delMeetCost")
     ResponseMessage<Object> deleteWgdMeetCost(String id){//删除
         return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id));
     }
 
-    @GetMapping("delMeetCosts")
-    ResponseMessage<Object> deleteWgdMeetCosts(String ids){//批量删除
-        return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids));
-    }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java
index 48431efb..3491ed99 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java
@@ -24,5 +24,5 @@ public interface WgdAssocInfoDao extends BaseMapper<WgdAssocInfo> {
     int updateOne(WgdAssocInfo wgdAssocInfo);//编辑
     int insertOne(WgdAssocInfo wgdAssocInfo);//插入
     int deleteOne(String id);//删除
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java
index 36980275..08aa17eb 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java
@@ -25,5 +25,5 @@ public interface WgdCommiInfoDao extends BaseMapper<WgdCommiInfo> {
     int updateOne(WgdCommiInfo wgdCommiInfo);//编辑
     int insertOne(WgdCommiInfo wgdCommiInfo);//插入
     int deleteOne(String id);//删除
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java
index 2d67546e..2fa84fb6 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java
@@ -25,5 +25,5 @@ public interface WgdExReviseCostDao extends BaseMapper<WgdExReviseCost> {
     int updateOne(WgdExReviseCost wgdExReviseCost);//编辑
     int insertOne(WgdExReviseCost wgdExReviseCost);//插入
     int deleteOne(String id);//删除
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java
index 71610aa1..d5139ab3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java
@@ -25,5 +25,5 @@ public interface WgdMeetCostDao extends BaseMapper<WgdMeetCost> {
     int updateOne(WgdMeetCost wgdMeetCost);//编辑
     int insertOne(WgdMeetCost wgdMeetCost);//插入
     int deleteOne(String id);//删除
-    int deleteBatch();//批量删除
+    int deleteBatch(String[] ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java
index a6bade22..e862229c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java
@@ -59,6 +59,7 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl<WgdAssocInfoDao, WgdAss
 
     @Override
     public int deleteWgdAssocInfos(String ids) {
-        return wgdAssocInfoDao.deleteBatch();
+        String[] str = ids.split(",");
+        return wgdAssocInfoDao.deleteBatch(str);
     }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java
index fbea8d2a..9d322cb3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java
@@ -25,7 +25,6 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
     @Autowired
     WgdCommiInfoDao wgdCommiInfoDao;
 
-
     @Override
     public List<WgdCommiInfo> getAllWgdCommiInfos() {
         return wgdCommiInfoDao.selectAll();
@@ -63,6 +62,7 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
 
     @Override
     public int deleteWgdCommiInfos(String ids) {
-        return wgdCommiInfoDao.deleteBatch();
+        String[] str = ids.split(",");
+        return wgdCommiInfoDao.deleteBatch(str);
     }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java
index 0e793911..c5436a10 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java
@@ -61,6 +61,7 @@ public class WgdExReviseCostServiceImpl extends ServiceImpl<WgdExReviseCostDao,
 
     @Override
     public int deleteWgdExReviseCosts(String ids) {
-        return wgdExReviseCostDao.deleteBatch();
+        String[] str = ids.split(",");
+        return wgdExReviseCostDao.deleteBatch(str);
     }
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java
index f0124fa6..3571a193 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java
@@ -60,6 +60,7 @@ public class WgdMeetCostServiceImpl extends ServiceImpl<WgdMeetCostDao, WgdMeetC
 
     @Override
     public int deleteWgdMeetCosts(String ids) {
-        return wgdMeetCostDao.deleteBatch();
+        String[] str = ids.split(",");
+        return wgdMeetCostDao.deleteBatch(str);
     }
 }
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
index aedae23d..d466c37e 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml
@@ -48,6 +48,22 @@
         </if>
     </select>
 
+    <select id="selectNextUserByIds" resultMap="TsUser">
+        select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID,
+        ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE,
+        ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE,
+        ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname
+        from ts_user
+		WHERE 1=1
+		<if test="ids != null and ids.size()> 0 ">
+            and ts_user.USID in
+            <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+
+        </if>
+    </select>
+
     <select id="selectTreeByIds" resultMap="TsInstitution">
     <foreach collection="rootIds" item="id">
         SELECT
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
index 9b1ce5e4..883b7e4c 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml
@@ -754,9 +754,9 @@
             <!-- 标准编号111 -->
             <if test="page.standNumber != null and page.standNumber != ''">
                 and (
-                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{page.standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
-                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{page.standNumber}),'%')
+                (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ',''))
                 and SAR_STANDARDS_INFO.STAND_YEAR = '')
                 or (stand_name like concat(concat('%',#{page.standNumber}),'%'))
                 )
@@ -995,9 +995,9 @@
         <if test="mark == 999 ">
             and  sar_standards_info.ID in (select distinct stand_id from sar_stand_items)
         </if>
-        <if test='page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != ""
-         and page.standType != null and page.standType != "" '>
-          <include refid="standSort_in"/>
+        <if test='(page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != "")
+         or (page.standType != null and page.standType != "") '>
+            <include refid="standSort_in"/>
         </if>
         limit ${page.pager.startIndex-1},${page.pageSize}
     </select>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml
index c56391f0..8798b6e3 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml
@@ -32,6 +32,9 @@
                 and cost = #{cost}
             </if>
     </sql>
+    <select id="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_cgfy
+    </select>
     <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy" resultType="java.lang.Integer">
         select count(*) from wgd_cgfy
         <include refid="Conditions"></include>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml
index 5785e9c6..c7ec5b23 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao">
     <!--    基础信息-->
     <sql id="BaseInfo">
-        id,type,number,name,pages,cost,time
+        id,type,number,name,translation,pages,cost,time
     </sql>
     <!--    查询条件-->
     <sql id="Conditions">
@@ -20,6 +20,9 @@
             <if test="name != null and name != ''">
                 and name like concat('%',#{name},'%')
             </if>
+            <if test="translation != null and translation != ''">
+                and translation like concat('%',#{translation},'%')
+            </if>
             <if test="pages != null and pages != ''">
                 and pages = #{pages}
             </if>
@@ -31,6 +34,13 @@
             </if>
         </where>
     </sql>
+    <select id="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_fyfy
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy" resultType="java.lang.Integer">
+        select count(*) from wgd_fyfy
+        <include refid="Conditions"></include>
+    </select>
     <!--    查询所有-->
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy">
         select <include refid="BaseInfo"></include> from wgd_fyfy
@@ -58,6 +68,9 @@
             <if test="name != null and name != ''">
                 name = #{name},
             </if>
+            <if test="translation != null and translation != ''">
+                translation = #{translation},
+            </if>
             <if test="pages != null and pages != ''">
                 pages = #{pages},
             </if>
@@ -86,6 +99,9 @@
             <if test="name != null and name != ''">
                 name,
             </if>
+            <if test="translation != null and translation != ''">
+                translation,
+            </if>
             <if test="pages != null and pages != ''">
                 pages,
             </if>
@@ -110,6 +126,9 @@
             <if test="name != null and name != ''">
                 #{name},
             </if>
+            <if test="translation != null and translation != ''">
+                #{translation},
+            </if>
             <if test="pages != null and pages != ''">
                 #{pages},
             </if>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml
index b03f2d77..4c7f1d5a 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml
@@ -29,6 +29,13 @@
             </if>
         </where>
     </sql>
+    <select id="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_srb
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb" resultType="java.lang.Integer">
+        select count(*) from wgd_srb
+        <include refid="Conditions"></include>
+    </select>
     <!--    查询所有-->
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb">
         select <include refid="BaseInfo"></include> from wgd_srb
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml
index bb9deeca..3cae0025 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml
@@ -52,6 +52,13 @@
             </if>
         </where>
     </sql>
+    <select id="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_wbtj
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj" resultType="java.lang.Integer">
+        select count(*) from wgd_wbtj
+        <include refid="Conditions"></include>
+    </select>
     <!--    查询所有-->
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj">
         select <include refid="BaseInfo"></include> from wgd_wbtj
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml
index fbfc54a7..3ad98715 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml
@@ -76,6 +76,13 @@
             </if>
         </where>
     </sql>
+    <select id="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_wbxd
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd" resultType="java.lang.Integer">
+        select count(*) from wgd_wbxd
+        <include refid="Conditions"></include>
+    </select>
     <!--    查询所有-->
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd">
         select <include refid="BaseInfo"></include> from wgd_wbxd
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml
index ad2b80ea..51767b4d 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml
@@ -26,6 +26,13 @@
             
         </where>
     </sql>
+    <select id="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_zcb
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb" resultType="java.lang.Integer">
+        select count(*) from wgd_zcb
+        <include refid="Conditions"></include>
+    </select>
     <!--    查询所有-->
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb">
         select <include refid="BaseInfo"></include> from wgd_zcb
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml
index 95207969..6c61b91c 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml
@@ -18,13 +18,11 @@
                 and id = #{id}
             </if>
             <if test="scName != null and scName != ''">
-                and sc_name like concat('%',#{scName},'%')
-            </if>
-            <if test="sscName != null and sscName != ''">
-                and ssc_name like concat('%',#{sscName},'%')
-            </if>
-            <if test="wgName != null and wgName != ''">
-                and wg_name like concat('%',#{wgName},'%')
+                and (
+                sc_name like concat('%',#{scName} ,'%')
+                ssc_name like concat('%',#{scName} ,'%')
+                wg_name like concat('%',#{scName} ,'%')
+                )
             </if>
             <if test="payStandard != null and payStandard != ''">
                 and pay_standard = #{payStandard}
@@ -77,16 +75,16 @@
             <if test="wgName != null and wgName != ''">
                 wg_name = #{wgName},
             </if>
-            <if test="payStandard != null and payStandard != ''">
+            <if test="payStandard != null">
                 pay_standard = #{payStandard},
             </if>
-            <if test="payReality != null and payReality != ''">
+            <if test="payReality != null">
                 pay_reality = #{payReality},
             </if>
-            <if test="costOutlay != null and costOutlay != ''">
+            <if test="costOutlay != null">
                 cost_outlay = #{costOutlay},
             </if>
-            <if test="annualPayment != null and annualPayment != ''">
+            <if test="annualPayment != null">
                 annual_payment = #{annualPayment},
             </if>
         </set>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml
index e8ff3351..5d81cb64 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml
@@ -11,7 +11,7 @@
         id,sc_name,ssc_name,wg_name,role,attend,standard,charge,leader,ini_time,
         cur_time,cost_standard,cost_outlay,last_pay_time,pay_period,handler,
         department,as_proper,as_status,as_contact,tel,mail,
-        p17,p18,p19,p20,p21,p22,p23,p34,p25,p26,p27,p28,p29,p30,p31,p32
+        p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32
     </sql>
     <sql id="Conditions">
         WHERE 1=1
@@ -19,13 +19,11 @@
                 and id = #{id}
             </if>
             <if test="scName != null and scName != ''">
-                and sc_name like concat('%',#{scName},'%')
-            </if>
-            <if test="sscName != null and sscName != ''">
-                and ssc_name like concat('%',#{sscName},'%')
-            </if>
-            <if test="wgName != null and wgName != ''">
-                and wg_name like concat('%',#{wgName},'%')
+                and (
+                sc_name like concat('%',#{scName} ,'%')
+                ssc_name like concat('%',#{scName} ,'%')
+                wg_name like concat('%',#{scName} ,'%')
+                )
             </if>
             <if test="role != null and role != ''">
                 and role = #{role}
@@ -43,10 +41,10 @@
                 and leader = #{leader}
             </if>
             <if test="iniTime != null">
-                and ini_time = #{iniTime}
+                and DATE_FORMAT(ini_time,'%Y%m%d') = DATE_FORMAT(iniTime,'%Y%m%d')
             </if>
             <if test="curTime != null">
-                and cur_time = #{curTime}
+                and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d')
             </if>
             <if test="costStandard != null and costStandard != ''">
                 and cost_standard = #{costStandard}
@@ -55,7 +53,7 @@
                 and cost_outlay = #{costOutlay}
             </if>
             <if test="lastPayTime != null">
-                and last_pay_time = #{lastPayTime}
+                and DATE_FORMAT(last_pay_time,'%Y%m%d') = DATE_FORMAT(lastPayTime,'%Y%m%d')
             </if>
             <if test="payPeriod != null and payPeriod != ''">
                 and pay_period = #{payPeriod}
@@ -90,6 +88,7 @@
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
         select <include refid="BaseInfo"></include> from wgd_assoc_info
     </select>
+    <!--    查询-->
     <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
         select <include refid="BaseInfo"></include> from wgd_assoc_info
         <include refid="Conditions"></include>
@@ -99,7 +98,7 @@
         select <include refid="BaseInfo"></include> from wgd_assoc_info
         where id = #{id}
     </select>
-
+<!--    更新-->
     <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
         update wgd_assoc_info
         <set>
@@ -217,6 +216,7 @@
         </set>
         where id = #{id}
     </update>
+<!--    新增-->
     <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
         insert into wgd_assoc_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -456,6 +456,7 @@
     <delete id="deleteOne" parameterType="java.lang.String">
         delete from wgd_assoc_info where id = #{id}
     </delete>
+<!--    删除-->
     <delete id="deleteBatch" parameterType="java.lang.String">
         delete from wgd_assoc_info where id in
         <foreach item="id" collection="array" open="(" close=")" separator=",">
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml
index e9bf66fc..d3708885 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml
@@ -19,13 +19,11 @@
             and unit = #{unit}
         </if>
         <if test="scName != null and scName != ''">
-            and sc_name = #{scName}
-        </if>
-        <if test="sscName != null and sscName != ''">
-            and ssc_name = #{sscName}
-        </if>
-        <if test="wgName != null and wgName != ''">
-            and wg_name = #{wgName}
+            and (
+            sc_name like concat('%',#{scName} ,'%')
+            ssc_name like concat('%',#{scName} ,'%')
+            wg_name like concat('%',#{scName} ,'%')
+            )
         </if>
         <if test="role != null and role != ''">
             and role = #{role}
@@ -34,7 +32,7 @@
             and attend = #{attend}
         </if>
         <if test="curTime != null">
-            and cur_time = #{curTime}
+            and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d')
         </if>
         <if test="job != null and job != ''">
             and job = #{job}
@@ -234,9 +232,9 @@
     <delete id="deleteOne" parameterType="java.lang.String">
         delete from wgd_commi_info where id = #{id}
     </delete>
-    <delete id="deleteBatch">
+    <delete id="deleteBatch" parameterType="java.lang.String">
         delete from wgd_commi_info where id in
-        <foreach collection="array" item="id" separator="," close=")" open="(">
+        <foreach collection="array" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml
index f7060895..f176790c 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml
@@ -50,19 +50,19 @@
     <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
         update wgd_ex_revise_cost
         <set>
-            <if test="type != null and type != ''">
+            <if test="type != null">
                 type = #{type},
             </if>
-            <if test="proId != null and proId != ''">
+            <if test="proId != null">
                 pro_id = #{proId},
             </if>
-            <if test="proName != null and proName != ''">
+            <if test="proName != null">
                 pro_name = #{proName},
             </if>
-            <if test="cost != null and cost != ''">
+            <if test="cost != null">
                 cost = #{cost},
             </if>
-            <if test="costOutlay != null and costOutlay != ''">
+            <if test="costOutlay != null">
                 cost_outlay = #{costOutlay},
             </if>
         </set>
@@ -71,43 +71,43 @@
     <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
         insert into wgd_ex_revise_cost
         <trim prefix="(" suffixOverrides="," suffix=")">
-            <if test="id != null and id != ''">
+            <if test="id != null">
                 id,
             </if>
-            <if test="type != null and type != ''">
+            <if test="type != null">
                 type,
             </if>
-            <if test="proId != null and proId != ''">
-                pro_id
+            <if test="proId != null">
+                pro_id,
             </if>
-            <if test="proName != null and proName != ''">
+            <if test="proName != null">
                 pro_name,
             </if>
-            <if test="cost != null and cost != ''">
+            <if test="cost != null">
                 cost,
             </if>
-            <if test="costOutlay != null and costOutlay != ''">
+            <if test="costOutlay != null">
                 cost_outlay,
             </if>
         </trim>
         values
         <trim prefix="(" suffixOverrides="," suffix=")">
-            <if test="id != null and id != ''">
+            <if test="id != null">
                 #{id},
             </if>
-            <if test="type != null and type != ''">
+            <if test="type != null">
                 #{type},
             </if>
-            <if test="proId != null and proId != ''">
+            <if test="proId != null">
                 #{proId},
             </if>
-            <if test="proName != null and proName != ''">
+            <if test="proName != null">
                 #{proName},
             </if>
-            <if test="cost != null and cost != ''">
+            <if test="cost != null">
                 #{cost},
             </if>
-            <if test="costOutlay != null and costOutlay != ''">
+            <if test="costOutlay != null">
                 #{costOutlay},
             </if>
         </trim>
@@ -115,7 +115,7 @@
     <delete id="deleteOne" parameterType="java.lang.String">
         delete from wgd_ex_revise_cost where id = #{id}
     </delete>
-    <delete id="deleteBatch">
+    <delete id="deleteBatch" parameterType="java.lang.String">
         delete from wgd_ex_revise_cost where id in
         <foreach collection="array" item="id" open="(" separator="," close=")">
             #{id}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml
index f8499871..f948663d 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml
@@ -22,7 +22,7 @@
             and meet_name = #{meetName}
         </if>
         <if test="meetTime != null">
-            and meet_time = #{meetTime}
+            and DATE_FORMAT(meet_time,'%Y%m%d') = DATE_FORMAT(#{meetTime},'%Y%m%d')
         </if>
         <if test="payStandard != null and payStandard != ''">
             and pay_standard = #{payStandard}
@@ -54,22 +54,22 @@
     <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
         update wgd_meet_cost
         <set>
-            <if test="unit != null and unit != ''">
+            <if test="unit != null">
                 unit = #{unit},
             </if>
-            <if test="meetName != null and meetName != ''">
+            <if test="meetName != null">
                 meet_name = #{meetName},
             </if>
-            <if test="meetTime != null">
+            <if test="meetTime">
                 meet_time = #{meetTime},
             </if>
-            <if test="payStandard != null and payStandard != ''">
+            <if test="payStandard != null">
                 pay_standard = #{payStandard},
             </if>
-            <if test="payReality != null and payReality != ''">
+            <if test="payReality != null">
                 pay_reality = #{payReality},
             </if>
-            <if test="costOutlay != null and costOutlay != ''">
+            <if test="costOutlay != null">
                 cost_outlay = #{costOutlay},
             </if>
         </set>
@@ -128,7 +128,7 @@
     <delete id="deleteOne" parameterType="java.lang.String">
         delete from wgd_meet_cost where id = #{id}
     </delete>
-    <delete id="deleteBatch">
+    <delete id="deleteBatch" parameterType="java.lang.String">
         delete from wgd_meet_cost where id in
         <foreach collection="array" item="id" open="(" separator="," close=")">
             #{id}