From 690504bdddf5b29ce1f8a19fe0a971ae26911fd1 Mon Sep 17 00:00:00 2001
From: Kevin <tjpu626@163.com>
Date: Mon, 15 Nov 2021 10:01:54 +0800
Subject: [PATCH 1/5] =?UTF-8?q?zcr:=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EsRevisePlanController.java    |  73 +++
 .../esRevisePlan/dao/EsRevisePlanDao.java     |  26 +
 .../esRevisePlan/entity/EsRevisePlan.java     |  59 +++
 .../service/IEsRevisePlanService.java         |  25 +
 .../service/impl/EsRevisePlanServiceImpl.java |  63 +++
 .../controller/SapMeetingController.java      |   4 +-
 .../controller/WgdAssocCostController.java    |  66 +++
 .../controller/WgdAssocInfoController.java    |  65 +++
 .../controller/WgdCommiInfoController.java    |  65 +++
 .../controller/WgdExReviseCostController.java |  65 +++
 .../controller/WgdMeetCostController.java     |  65 +++
 .../slrs/wgdCensusZ/dao/WgdAssocCostDao.java  |  27 ++
 .../slrs/wgdCensusZ/dao/WgdAssocInfoDao.java  |  27 ++
 .../slrs/wgdCensusZ/dao/WgdCommiInfoDao.java  |  27 ++
 .../wgdCensusZ/dao/WgdExReviseCostDao.java    |  27 ++
 .../slrs/wgdCensusZ/dao/WgdMeetCostDao.java   |  27 ++
 .../slrs/wgdCensusZ/entity/WgdAssocCost.java  |  48 ++
 .../slrs/wgdCensusZ/entity/WgdAssocInfo.java  | 144 ++++++
 .../slrs/wgdCensusZ/entity/WgdCommiInfo.java  |  76 +++
 .../wgdCensusZ/entity/WgdExReviseCost.java    |  42 ++
 .../slrs/wgdCensusZ/entity/WgdMeetCost.java   |  49 ++
 .../service/IWgdAssocCostService.java         |  26 +
 .../service/IWgdAssocInfoService.java         |  25 +
 .../service/IWgdCommiInfoService.java         |  26 +
 .../service/IWgdExReviseCostService.java      |  26 +
 .../service/IWgdMeetCostService.java          |  26 +
 .../service/impl/WgdAssocCostServiceImpl.java |  64 +++
 .../service/impl/WgdAssocInfoServiceImpl.java |  62 +++
 .../service/impl/WgdCommiInfoServiceImpl.java |  65 +++
 .../impl/WgdExReviseCostServiceImpl.java      |  64 +++
 .../service/impl/WgdMeetCostServiceImpl.java  |  63 +++
 .../esRevisePlan/EsRevisePlanMapper.xml       | 195 ++++++++
 .../mapper/wgdCensusZ/WgdAssocCostMapper.xml  | 148 ++++++
 .../mapper/wgdCensusZ/WgdAssocInfoMapper.xml  | 456 ++++++++++++++++++
 .../mapper/wgdCensusZ/WgdCommiInfoMapper.xml  |  36 ++
 .../wgdCensusZ/WgdExReviseCostMapper.xml      |  35 ++
 .../mapper/wgdCensusZ/WgdMeetCostMapper.xml   |  36 ++
 37 files changed, 2421 insertions(+), 2 deletions(-)
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
new file mode 100644
index 00000000..e179e933
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
@@ -0,0 +1,73 @@
+package com.adc.da.slrs.esRevisePlan.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 企标制修订计划 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-14
+*/
+@RestController
+@Api(description = "|EsRevisePlan|")
+@RequestMapping("api/esRevisePlan/es-revise-plan")
+public class EsRevisePlanController extends BaseController<EsRevisePlan> {
+
+    @Autowired
+    IEsRevisePlanService iEsRevisePlanService;
+
+    @ApiOperation(value = "获取所有企标计划")
+    @GetMapping("getAllPlans")
+    public ResponseMessage<Object> getAllPlans(){
+        return Result.success(iEsRevisePlanService.getAllPlans());
+    }
+
+    @ApiOperation(value = "多条件查询企标计划")
+    @PostMapping("queryAllPlans")
+    public ResponseMessage<Object> queryAllPlans(EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.queryAllPlans(esRevisePlan));
+    }
+
+    @ApiOperation(value = "获取单个企标计划详情")
+    @GetMapping("getPlanInfo")
+    public ResponseMessage<Object> getPlanInfo(String id){
+        return Result.success(iEsRevisePlanService.getOnePlan(id));
+    }
+
+    @ApiOperation(value = "编辑企标计划")
+    @PostMapping("modPlan")
+    public ResponseMessage<Object> modPlan(EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.modPlan(esRevisePlan));
+    }
+
+    @ApiOperation(value = "添加企标计划")
+    @PostMapping("addPlan")
+    public ResponseMessage<Object> addPlan(EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.addPlan(esRevisePlan));
+    }
+
+    @ApiOperation(value = "删除单个企标计划")
+    @GetMapping("delPlan")
+    public ResponseMessage<Object> delPlan(String id){
+        return Result.success(iEsRevisePlanService.delPlan(id));
+    }
+
+    @ApiOperation(value = "批量删除企标计划")
+    @GetMapping("delPlans")
+    public ResponseMessage<Object> delPlans(String ids){
+        return Result.success(iEsRevisePlanService.delPlans(ids));
+    }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java
new file mode 100644
index 00000000..fd735200
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java
@@ -0,0 +1,26 @@
+package com.adc.da.slrs.esRevisePlan.dao;
+
+import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企标制修订计划 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-14
+ */
+public interface EsRevisePlanDao extends BaseMapper<EsRevisePlan> {
+    List<EsRevisePlan> selectAll();//查询所有
+    List<EsRevisePlan> queryAll(EsRevisePlan esRevisePlan);//多条件查询
+    EsRevisePlan selectOne(String id);//查询详情
+
+    int updateOne(EsRevisePlan esRevisePlan);//编辑
+    int insertOne(EsRevisePlan esRevisePlan);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch(String[] ids);//批量删除
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
new file mode 100644
index 00000000..5f2b2a39
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
@@ -0,0 +1,59 @@
+package com.adc.da.slrs.esRevisePlan.entity;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+
+/**
+ * <p>
+ * 企标制修订计划
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-14
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="EsRevisePlan对象", description="企标制修订计划")
+public class EsRevisePlan{
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "企标名称")
+    private String esName;
+
+    @ApiModelProperty(value = "计划状态")
+    private String planStatus;
+
+    @ApiModelProperty(value = "制修订状态")
+    private String reviseStatus;
+
+    @ApiModelProperty(value = "起草人")
+    private String drafter;
+
+    @ApiModelProperty(value = "评审责任人")
+    private String resPerson;
+
+    @ApiModelProperty(value = "工作组组长")
+    private String wgLeader;
+
+    @ApiModelProperty(value = "计划标准初稿完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date draftTime;
+
+    @ApiModelProperty(value = "计划标准发布时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date releaseTime;
+
+    @ApiModelProperty(value = "起草责任单位")
+    private String unit;
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
new file mode 100644
index 00000000..bf8c6239
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.esRevisePlan.service;
+
+import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企标制修订计划 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-14
+ */
+public interface IEsRevisePlanService extends IService<EsRevisePlan> {
+    List<EsRevisePlan> getAllPlans();//查询所有
+    List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询
+    EsRevisePlan getOnePlan(String id);//查询详情
+
+    int modPlan(EsRevisePlan esRevisePlan);//编辑
+    int addPlan(EsRevisePlan esRevisePlan);//插入
+    int delPlan(String id);//删除
+    int delPlans(String ids);//批量删除
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
new file mode 100644
index 00000000..31942a44
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
@@ -0,0 +1,63 @@
+package com.adc.da.slrs.esRevisePlan.service.impl;
+
+import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan;
+import com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao;
+import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 企标制修订计划 服务实现类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-14
+ */
+@Service
+public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevisePlan> implements IEsRevisePlanService {
+
+    @Autowired
+    EsRevisePlanDao esRevisePlanDao;
+
+    @Override
+    public List<EsRevisePlan> getAllPlans() {
+        return esRevisePlanDao.selectAll();
+    }
+
+    @Override
+    public List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan) {
+        return esRevisePlanDao.queryAll(esRevisePlan);
+    }
+
+    @Override
+    public EsRevisePlan getOnePlan(String id) {
+        return esRevisePlanDao.selectOne(id);
+    }
+
+    @Override
+    public int modPlan(EsRevisePlan esRevisePlan) {
+        return esRevisePlanDao.updateOne(esRevisePlan);
+    }
+
+    @Override
+    public int addPlan(EsRevisePlan esRevisePlan) {
+        esRevisePlan.setId(UUIDUtils.randomUUID(32));
+        return esRevisePlanDao.insertOne(esRevisePlan);
+    }
+
+    @Override
+    public int delPlan(String id) {
+        return esRevisePlanDao.deleteOne(id);
+    }
+
+    @Override
+    public int delPlans(String ids) {
+        String[] str = ids.split(",");
+        return esRevisePlanDao.deleteBatch(str);
+    }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java
index 3d5997dc..7ec0369e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java
@@ -55,13 +55,13 @@ public class SapMeetingController extends BaseController<SapMeeting> {
         return sapMeetingService.getMeetingsByMonth(date, type);
     }
 
-    @ApiOperation(value = "获取当天")
+    @ApiOperation(value = "获取当天列表")
     @GetMapping("/getMeetingsByDate")
     public List<SapMeeting> getMeetingsByDate(@DateTimeFormat(pattern = "yyyy-MM-dd") Date date,int type){
         return sapMeetingService.getMeetingsByDate(date,type);
     }
 
-    @ApiOperation(value = "插入")
+    @ApiOperation(value = "插入会议")
     @PostMapping("/addMeeting")
     public int addMeeting(@RequestBody SapMeeting sapMeeting){
         return sapMeetingService.addMeeting(sapMeeting);
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
new file mode 100644
index 00000000..2a4cae2c
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java
@@ -0,0 +1,66 @@
+package com.adc.da.slrs.wgdCensusZ.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService;
+import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 协会费用信息统计 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdAssocCost|")
+@RequestMapping("api/wgdCensusZ/wgd-assoc-cost")
+public class WgdAssocCostController extends BaseController<WgdAssocCost> {
+
+    @Autowired
+    IWgdAssocCostService iWgdAssocCostService;
+
+    @GetMapping("getAllAssocCosts")
+    public ResponseMessage<Object> getAllWgdAssocCosts(){//查询所有
+        return Result.success(iWgdAssocCostService.getAllWgdAssocCosts());
+    }
+
+    @PostMapping("queryAllAssocCosts")
+    public ResponseMessage<Object> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询
+        return Result.success(iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost));
+    }
+
+    @GetMapping("getAssocCostById")
+    public ResponseMessage<Object> getWgdAssocCostById(String id) {//查询详情
+        return Result.success(iWgdAssocCostService.getWgdAssocCostById(id));
+    }
+
+    @PostMapping("modAssocCost")
+    ResponseMessage<Object> updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑
+        return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost));
+    }
+
+    @PostMapping("addAssocCost")
+    ResponseMessage<Object> insertWgdAssocCost(WgdAssocCost wgdAssocCost) {//插入
+        return Result.success(iWgdAssocCostService.insertWgdAssocCost(wgdAssocCost));
+    }
+
+    @GetMapping("delAssocCost")
+    ResponseMessage<Object> deleteWgdAssocCost(String id){//删除
+        return Result.success(iWgdAssocCostService.deleteWgdAssocCost(id));
+    }
+
+    @GetMapping("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
new file mode 100644
index 00000000..2a3b53e4
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusZ.controller;
+
+
+import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService;
+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 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;
+
+/**
+* <p>
+    * 协会信息数据统计 前端控制器
+    * </p>
+*
+* @author zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdAssocInfo|")
+@RequestMapping("api/wgdCensusZ/wgd-assoc-info")
+public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
+    @Autowired
+    IWgdAssocInfoService iWgdAssocInfoService;
+
+    @GetMapping("getAllAssocInfos")
+    public List<WgdAssocInfo> getAllWgdAssocInfos(){//查询所有
+        return iWgdAssocInfoService.getAllWgdAssocInfos();
+    }
+
+    @PostMapping("queryAllAssocInfos")
+    public List<WgdAssocInfo> queryAllWgdAssocInfos(WgdAssocInfo WgdAssocInfo){//多条件查询
+        return iWgdAssocInfoService.queryAllWgdAssocInfos(WgdAssocInfo);
+    }
+
+    @GetMapping("getAssocInfoById")
+    public WgdAssocInfo getWgdAssocInfoById(String id) {//查询详情
+        return iWgdAssocInfoService.getWgdAssocInfoById(id);
+    }
+
+    @PostMapping("modAssocInfo")
+    int updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑
+        return iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo);
+    }
+
+    @PostMapping("addAssocInfo")
+    int insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入
+        return iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo);
+    }
+
+    @GetMapping("delAssocInfo")
+    int deleteWgdAssocInfo(String id){//删除
+        return iWgdAssocInfoService.deleteWgdAssocInfo(id);
+    }
+
+    @GetMapping("delAssocInfos")
+    int deleteWgdAssocInfos(String ids){//批量删除
+        return 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
new file mode 100644
index 00000000..a1440258
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusZ.controller;
+
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
+import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService;
+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 zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdCommiInfo|")
+@RequestMapping("api/wgdCensusZ/wgd-commi-info")
+public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
+    @Autowired
+    IWgdCommiInfoService iWgdCommiInfoService;
+
+    @GetMapping("getAllCommiInfos")
+    public List<WgdCommiInfo> getAllWgdCommiInfos(){//查询所有
+        return iWgdCommiInfoService.getAllWgdCommiInfos();
+    }
+
+    @PostMapping("queryAllCommiInfos")
+    public List<WgdCommiInfo> queryAllWgdCommiInfos(WgdCommiInfo WgdCommiInfo){//多条件查询
+        return iWgdCommiInfoService.queryAllWgdCommiInfos(WgdCommiInfo);
+    }
+
+    @GetMapping("getCommiInfoById")
+    public WgdCommiInfo getWgdCommiInfoById(String id) {//查询详情
+        return iWgdCommiInfoService.getWgdCommiInfoById(id);
+    }
+
+    @PostMapping("modCommiInfo")
+    int updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
+        return iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo);
+    }
+
+    @PostMapping("addCommiInfo")
+    int insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
+        return iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo);
+    }
+
+    @GetMapping("delCommiInfo")
+    int deleteWgdCommiInfo(String id){//删除
+        return iWgdCommiInfoService.deleteWgdCommiInfo(id);
+    }
+
+    @GetMapping("delCommiInfos")
+    int deleteWgdCommiInfos(String ids){//批量删除
+        return 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
new file mode 100644
index 00000000..423f5c7b
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusZ.controller;
+
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
+import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService;
+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 zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdExReviseCost|")
+@RequestMapping("api/wgdCensusZ/wgd-ex-revise-cost")
+public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
+    @Autowired
+    IWgdExReviseCostService iWgdExReviseCostService;
+
+    @GetMapping("getAllExReviseCosts")
+    public List<WgdExReviseCost> getAllWgdExReviseCosts(){//查询所有
+        return iWgdExReviseCostService.getAllWgdExReviseCosts();
+    }
+
+    @PostMapping("queryAllExReviseCosts")
+    public List<WgdExReviseCost> queryAllWgdExReviseCosts(WgdExReviseCost WgdExReviseCost){//多条件查询
+        return iWgdExReviseCostService.queryAllWgdExReviseCosts(WgdExReviseCost);
+    }
+
+    @GetMapping("getExReviseCostById")
+    public WgdExReviseCost getWgdExReviseCostById(String id) {//查询详情
+        return iWgdExReviseCostService.getWgdExReviseCostById(id);
+    }
+
+    @PostMapping("modExReviseCost")
+    int updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
+        return iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost);
+    }
+
+    @PostMapping("addExReviseCost")
+    int insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入
+        return iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost);
+    }
+
+    @GetMapping("delExReviseCost")
+    int deleteWgdExReviseCost(String id){//删除
+        return iWgdExReviseCostService.deleteWgdExReviseCost(id);
+    }
+
+    @GetMapping("delExReviseCosts")
+    int deleteWgdExReviseCosts(String ids){//批量删除
+        return 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
new file mode 100644
index 00000000..595b993a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusZ.controller;
+
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
+import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService;
+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 zcr
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdMeetCost|")
+@RequestMapping("api/wgdCensusZ/wgd-meet-cost")
+public class WgdMeetCostController extends BaseController<WgdMeetCost> {
+    @Autowired
+    IWgdMeetCostService iWgdMeetCostService;
+
+    @GetMapping("getAllMeetCosts")
+    public List<WgdMeetCost> getAllWgdMeetCosts(){//查询所有
+        return iWgdMeetCostService.getAllWgdMeetCosts();
+    }
+
+    @PostMapping("queryAllMeetCosts")
+    public List<WgdMeetCost> queryAllWgdMeetCosts(WgdMeetCost WgdMeetCost){//多条件查询
+        return iWgdMeetCostService.queryAllWgdMeetCosts(WgdMeetCost);
+    }
+
+    @GetMapping("getMeetCostById")
+    public WgdMeetCost getWgdMeetCostById(String id) {//查询详情
+        return iWgdMeetCostService.getWgdMeetCostById(id);
+    }
+
+    @PostMapping("modMeetCost")
+    int updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
+        return iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost);
+    }
+
+    @PostMapping("addMeetCost")
+    int insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入
+        return iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost);
+    }
+
+    @GetMapping("delMeetCost")
+    int deleteWgdMeetCost(String id){//删除
+        return iWgdMeetCostService.deleteWgdMeetCost(id);
+    }
+
+    @GetMapping("delMeetCosts")
+    int deleteWgdMeetCosts(String ids){//批量删除
+        return iWgdMeetCostService.deleteWgdMeetCosts(ids);
+    }
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java
new file mode 100644
index 00000000..e5f25c50
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java
@@ -0,0 +1,27 @@
+package com.adc.da.slrs.wgdCensusZ.dao;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 协会费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdAssocCostDao extends BaseMapper<WgdAssocCost> {
+    List<WgdAssocCost> selectAll();//查询所有
+    List<WgdAssocCost> queryAll(WgdAssocCost wgdAssocCost);//多条件查询
+    WgdAssocCost selectOne(String id);//查询详情
+
+    int updateOne(WgdAssocCost wgdAssocCost);//编辑
+    int insertOne(WgdAssocCost wgdAssocCost);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch(String[] 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
new file mode 100644
index 00000000..1630539b
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java
@@ -0,0 +1,27 @@
+package com.adc.da.slrs.wgdCensusZ.dao;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 协会信息数据统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdAssocInfoDao extends BaseMapper<WgdAssocInfo> {
+
+    List<WgdAssocInfo> selectAll();//查询所有
+    List<WgdAssocInfo> queryAll(WgdAssocInfo wgdAssocInfo);//多条件查询
+    WgdAssocInfo selectOne(String id);//查询详情
+
+    int updateOne(WgdAssocInfo wgdAssocInfo);//编辑
+    int insertOne(WgdAssocInfo wgdAssocInfo);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}
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
new file mode 100644
index 00000000..d8833d51
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java
@@ -0,0 +1,27 @@
+package com.adc.da.slrs.wgdCensusZ.dao;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 委员信息数据统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdCommiInfoDao extends BaseMapper<WgdCommiInfo> {
+    List<WgdCommiInfo> selectAll();//查询所有
+    List<WgdCommiInfo> queryAll(WgdCommiInfo wgdCommiInfo);//多条件查询
+    WgdCommiInfo selectOne(String id);//查询详情
+
+    int updateOne(WgdCommiInfo wgdCommiInfo);//编辑
+    int insertOne(WgdCommiInfo wgdCommiInfo);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}
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
new file mode 100644
index 00000000..11ff1eb4
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java
@@ -0,0 +1,27 @@
+package com.adc.da.slrs.wgdCensusZ.dao;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 参与外部标准制修订费用统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdExReviseCostDao extends BaseMapper<WgdExReviseCost> {
+    List<WgdExReviseCost> selectAll();//查询所有
+    List<WgdExReviseCost> queryAll(WgdExReviseCost wgdExReviseCost);//多条件查询
+    WgdExReviseCost selectOne(String id);//查询详情
+
+    int updateOne(WgdExReviseCost wgdExReviseCost);//编辑
+    int insertOne(WgdExReviseCost wgdExReviseCost);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}
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
new file mode 100644
index 00000000..a8b7f934
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java
@@ -0,0 +1,27 @@
+package com.adc.da.slrs.wgdCensusZ.dao;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 参会费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdMeetCostDao extends BaseMapper<WgdMeetCost> {
+    List<WgdMeetCost> selectAll();//查询所有
+    List<WgdMeetCost> queryAll(WgdMeetCost wgdMeetCost);//多条件查询
+    WgdMeetCost selectOne(String id);//查询详情
+
+    int updateOne(WgdMeetCost wgdMeetCost);//编辑
+    int insertOne(WgdMeetCost wgdMeetCost);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch();//批量删除
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java
new file mode 100644
index 00000000..923aa253
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java
@@ -0,0 +1,48 @@
+package com.adc.da.slrs.wgdCensusZ.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 协会费用信息统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdAssocCost对象", description="协会费用信息统计")
+public class WgdAssocCost {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "协会名称-标委会")
+    private String scName;
+
+    @ApiModelProperty(value = "协会名称-分标委")
+    private String sscName;
+
+    @ApiModelProperty(value = "协会名称-工作组")
+    private String wgName;
+
+    @ApiModelProperty(value = "会费标准")
+    private String payStandard;
+
+    @ApiModelProperty(value = "实际发生")
+    private String payReality;
+
+    @ApiModelProperty(value = "费用列支")
+    private String costOutlay;
+
+    @ApiModelProperty(value = "每年缴费情况")
+    private String annualPayment;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java
new file mode 100644
index 00000000..7cf4c87c
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java
@@ -0,0 +1,144 @@
+package com.adc.da.slrs.wgdCensusZ.entity;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 协会信息数据统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计")
+public class WgdAssocInfo  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "协会名称-标委会")
+    private String scName;
+
+    @ApiModelProperty(value = "协会名称-分标委")
+    private String sscName;
+
+    @ApiModelProperty(value = "协会名称-工作组")
+    private String wgName;
+
+    @ApiModelProperty(value = "会员角色")
+    private String role;
+
+    @ApiModelProperty(value = "参与人")
+    private String attend;
+
+    @ApiModelProperty(value = "标准")
+    private String standard;
+
+    @ApiModelProperty(value = "标准负责人")
+    private String charge;
+
+    @ApiModelProperty(value = "责任领导")
+    private String leader;
+
+    @ApiModelProperty(value = "初始入会时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date iniTime;
+
+    @ApiModelProperty(value = "本届入会时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date curTime;
+
+    @ApiModelProperty(value = "费用标准")
+    private String costStandard;
+
+    @ApiModelProperty(value = "费用列支")
+    private String costOutlay;
+
+    @ApiModelProperty(value = "上次缴纳时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lastPayTime;
+
+    @ApiModelProperty(value = "缴费年限")
+    private String payPeriod;
+
+    @ApiModelProperty(value = "经办人")
+    private String handler;
+
+    @ApiModelProperty(value = "部门")
+    private String department;
+
+    @ApiModelProperty(value = "协会性质")
+    private String asProper;
+
+    @ApiModelProperty(value = "协会状态")
+    private String asStatus;
+
+    @ApiModelProperty(value = "协会联络人")
+    private String asContact;
+
+    @ApiModelProperty(value = "协会联络人电话")
+    private String tel;
+
+    @ApiModelProperty(value = "协会联络人邮箱")
+    private String mail;
+
+    @ApiModelProperty(value = "2017缴费")
+    private String p17;
+
+    @ApiModelProperty(value = "2018缴费")
+    private String p18;
+
+    @ApiModelProperty(value = "2019缴费")
+    private String p19;
+
+    @ApiModelProperty(value = "2020缴费")
+    private String p20;
+
+    @ApiModelProperty(value = "2021缴费")
+    private String p21;
+
+    @ApiModelProperty(value = "2022缴费")
+    private String p22;
+
+    @ApiModelProperty(value = "2023缴费")
+    private String p23;
+
+    @ApiModelProperty(value = "2024缴费")
+    private String p24;
+
+    @ApiModelProperty(value = "2025缴费")
+    private String p25;
+
+    @ApiModelProperty(value = "2026缴费")
+    private String p26;
+
+    @ApiModelProperty(value = "2027缴费")
+    private String p27;
+
+    @ApiModelProperty(value = "2028缴费")
+    private String p28;
+
+    @ApiModelProperty(value = "2029缴费")
+    private String p29;
+
+    @ApiModelProperty(value = "2030缴费")
+    private String p30;
+
+    @ApiModelProperty(value = "2031缴费")
+    private String p31;
+
+    @ApiModelProperty(value = "2032缴费")
+    private String p32;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java
new file mode 100644
index 00000000..f8d4bd6c
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java
@@ -0,0 +1,76 @@
+package com.adc.da.slrs.wgdCensusZ.entity;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 委员信息数据统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计")
+public class WgdCommiInfo {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "提报单位名称")
+    private String unit;
+
+    @ApiModelProperty(value = "协会名称-标委会")
+    private String scName;
+
+    @ApiModelProperty(value = "协会名称-分标委")
+    private String sscName;
+
+    @ApiModelProperty(value = "协会名称-工作组")
+    private String wgName;
+
+    @ApiModelProperty(value = "会员角色")
+    private String role;
+
+    @ApiModelProperty(value = "参与人")
+    private String attend;
+
+    @ApiModelProperty(value = "本届入会时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date curTime;
+
+    @ApiModelProperty(value = "职务")
+    private String job;
+
+    @ApiModelProperty(value = "所在部门")
+    private String department;
+
+    @ApiModelProperty(value = "联系方式")
+    private String tel;
+
+    @ApiModelProperty(value = "任期")
+    private String term;
+
+    @ApiModelProperty(value = "证书")
+    private String certificate;
+
+    @ApiModelProperty(value = "账号")
+    private String account;
+
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java
new file mode 100644
index 00000000..56af460e
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java
@@ -0,0 +1,42 @@
+package com.adc.da.slrs.wgdCensusZ.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 参与外部标准制修订费用统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计")
+public class WgdExReviseCost  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "类型")
+    private String type;
+
+    @ApiModelProperty(value = "项目编号")
+    private String proId;
+
+    @ApiModelProperty(value = "项目名称")
+    private String proName;
+
+    @ApiModelProperty(value = "费用列支项")
+    private String costOutlay;
+
+    @ApiModelProperty(value = "费用支出")
+    private String cost;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java
new file mode 100644
index 00000000..9c6fbff3
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java
@@ -0,0 +1,49 @@
+package com.adc.da.slrs.wgdCensusZ.entity;
+
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 参会费用信息统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdMeetCost对象", description="参会费用信息统计")
+public class WgdMeetCost {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "主办单位")
+    private String unit;
+
+    @ApiModelProperty(value = "会议名称")
+    private String meetName;
+
+    @ApiModelProperty(value = "会议时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date meetTime;
+
+    @ApiModelProperty(value = "会费标准")
+    private String payStandard;
+
+    @ApiModelProperty(value = "实际发生")
+    private String payReality;
+
+    @ApiModelProperty(value = "费用列支")
+    private String costOutlay;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java
new file mode 100644
index 00000000..323fe734
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java
@@ -0,0 +1,26 @@
+package com.adc.da.slrs.wgdCensusZ.service;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 协会费用信息统计 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface IWgdAssocCostService extends IService<WgdAssocCost> {
+    List<WgdAssocCost> getAllWgdAssocCosts();//查询所有
+    List<WgdAssocCost> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost);//多条件查询
+    WgdAssocCost getWgdAssocCostById(String id);//查询详情
+
+    int updateWgdAssocCost(WgdAssocCost wgdAssocCost);//编辑
+    int insertWgdAssocCost(WgdAssocCost wgdAssocCost);//插入
+    int deleteWgdAssocCost(String id);//删除
+    int deleteWgdAssocCosts(String ids);//批量删除
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java
new file mode 100644
index 00000000..e6d18c29
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocInfoService.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.wgdCensusZ.service;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 协会信息数据统计 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface IWgdAssocInfoService extends IService<WgdAssocInfo> {
+    List<WgdAssocInfo> getAllWgdAssocInfos();//查询所有
+    List<WgdAssocInfo> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo);//多条件查询
+    WgdAssocInfo getWgdAssocInfoById(String id);//查询详情
+
+    int updateWgdAssocInfo(WgdAssocInfo wgdAssocInfo);//编辑
+    int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo);//插入
+    int deleteWgdAssocInfo(String id);//删除
+    int deleteWgdAssocInfos(String ids);//批量删除
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java
new file mode 100644
index 00000000..292efa56
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdCommiInfoService.java
@@ -0,0 +1,26 @@
+package com.adc.da.slrs.wgdCensusZ.service;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 委员信息数据统计 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface IWgdCommiInfoService extends IService<WgdCommiInfo> {
+    List<WgdCommiInfo> getAllWgdCommiInfos();//查询所有
+    List<WgdCommiInfo> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo);//多条件查询
+    WgdCommiInfo getWgdCommiInfoById(String id);//查询详情
+
+    int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo);//编辑
+    int insertWgdCommiInfo(WgdCommiInfo wgdCommiInfo);//插入
+    int deleteWgdCommiInfo(String id);//删除
+    int deleteWgdCommiInfos(String ids);//批量删除
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java
new file mode 100644
index 00000000..14e3ba95
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdExReviseCostService.java
@@ -0,0 +1,26 @@
+package com.adc.da.slrs.wgdCensusZ.service;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参与外部标准制修订费用统计 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface IWgdExReviseCostService extends IService<WgdExReviseCost> {
+    List<WgdExReviseCost> getAllWgdExReviseCosts();//查询所有
+    List<WgdExReviseCost> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost);//多条件查询
+    WgdExReviseCost getWgdExReviseCostById(String id);//查询详情
+
+    int updateWgdExReviseCost(WgdExReviseCost wgdExReviseCost);//编辑
+    int insertWgdExReviseCost(WgdExReviseCost wgdExReviseCost);//插入
+    int deleteWgdExReviseCost(String id);//删除
+    int deleteWgdExReviseCosts(String ids);//批量删除
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java
new file mode 100644
index 00000000..908def81
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdMeetCostService.java
@@ -0,0 +1,26 @@
+package com.adc.da.slrs.wgdCensusZ.service;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参会费用信息统计 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface IWgdMeetCostService extends IService<WgdMeetCost> {
+    List<WgdMeetCost> getAllWgdMeetCosts();//查询所有
+    List<WgdMeetCost> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost);//多条件查询
+    WgdMeetCost getWgdMeetCostById(String id);//查询详情
+
+    int updateWgdMeetCost(WgdMeetCost wgdMeetCost);//编辑
+    int insertWgdMeetCost(WgdMeetCost wgdMeetCost);//插入
+    int deleteWgdMeetCost(String id);//删除
+    int deleteWgdMeetCosts(String ids);//批量删除
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java
new file mode 100644
index 00000000..54fe553c
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java
@@ -0,0 +1,64 @@
+package com.adc.da.slrs.wgdCensusZ.service.impl;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
+import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao;
+import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 协会费用信息统计 服务实现类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Service
+public class WgdAssocCostServiceImpl extends ServiceImpl<WgdAssocCostDao, WgdAssocCost> implements IWgdAssocCostService {
+
+    @Autowired
+    WgdAssocCostDao wgdAssocCostDao;
+
+    @Override
+    public List<WgdAssocCost> getAllWgdAssocCosts() {
+        return wgdAssocCostDao.selectAll();
+    }
+
+    @Override
+    public List<WgdAssocCost> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost) {
+        return wgdAssocCostDao.queryAll(wgdAssocCost);
+    }
+
+    @Override
+    public WgdAssocCost getWgdAssocCostById(String id) {
+        return wgdAssocCostDao.selectOne(id);
+    }
+
+    @Override
+    public int updateWgdAssocCost(WgdAssocCost wgdAssocCost) {
+        return wgdAssocCostDao.updateOne(wgdAssocCost);
+    }
+
+    @Override
+    public int insertWgdAssocCost(WgdAssocCost wgdAssocCost) {
+        wgdAssocCost.setId(UUIDUtils.randomUUID(32));
+        return wgdAssocCostDao.insertOne(wgdAssocCost);
+    }
+
+    @Override
+    public int deleteWgdAssocCost(String id) {
+        return wgdAssocCostDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdAssocCosts(String ids) {
+        String[] str = ids.split(",");
+        return wgdAssocCostDao.deleteBatch(str);
+    }
+}
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
new file mode 100644
index 00000000..b4c2e382
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java
@@ -0,0 +1,62 @@
+package com.adc.da.slrs.wgdCensusZ.service.impl;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocInfoDao;
+import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 协会信息数据统计 服务实现类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Service
+public class WgdAssocInfoServiceImpl extends ServiceImpl<WgdAssocInfoDao, WgdAssocInfo> implements IWgdAssocInfoService {
+
+    @Autowired
+    WgdAssocInfoDao wgdAssocInfoDao;
+
+    @Override
+    public List<WgdAssocInfo> getAllWgdAssocInfos() {
+        return wgdAssocInfoDao.selectAll();
+    }
+
+    @Override
+    public List<WgdAssocInfo> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo) {
+        return wgdAssocInfoDao.queryAll(wgdAssocInfo);
+    }
+
+    @Override
+    public WgdAssocInfo getWgdAssocInfoById(String id) {
+        return wgdAssocInfoDao.selectById(id);
+    }
+
+    @Override
+    public int updateWgdAssocInfo(WgdAssocInfo wgdAssocInfo) {
+        return wgdAssocInfoDao.updateOne(wgdAssocInfo);
+    }
+
+    @Override
+    public int insertWgdAssocInfo(WgdAssocInfo wgdAssocInfo) {
+        wgdAssocInfo.setId(UUIDUtils.randomUUID(32));
+        return wgdAssocInfoDao.insertOne(wgdAssocInfo);
+    }
+
+    @Override
+    public int deleteWgdAssocInfo(String id) {
+        return wgdAssocInfoDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdAssocInfos(String ids) {
+        return wgdAssocInfoDao.deleteBatch();
+    }
+}
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
new file mode 100644
index 00000000..3c1a8059
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusZ.service.impl;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
+import com.adc.da.slrs.wgdCensusZ.dao.WgdCommiInfoDao;
+import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService;
+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;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 委员信息数据统计 服务实现类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Service
+public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCommiInfo> implements IWgdCommiInfoService {
+
+    @Autowired
+    WgdCommiInfoDao wgdCommiInfoDao;
+
+
+    @Override
+    public List<WgdCommiInfo> getAllWgdCommiInfos() {
+        return wgdCommiInfoDao.selectAll();
+    }
+
+    @Override
+    public List<WgdCommiInfo> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo) {
+        return wgdCommiInfoDao.queryAll(wgdCommiInfo);
+    }
+
+    @Override
+    public WgdCommiInfo getWgdCommiInfoById(String id) {
+        return wgdCommiInfoDao.selectById(id);
+    }
+
+    @Override
+    public int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo) {
+        return wgdCommiInfoDao.updateOne(wgdCommiInfo);
+    }
+
+    @Override
+    public int insertWgdCommiInfo(WgdCommiInfo wgdCommiInfo) {
+        wgdCommiInfo.setId(UUIDUtils.randomUUID(32));
+        wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword()));
+        return wgdCommiInfoDao.insertOne(wgdCommiInfo);
+    }
+
+    @Override
+    public int deleteWgdCommiInfo(String id) {
+        return wgdCommiInfoDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdCommiInfos(String ids) {
+        return wgdCommiInfoDao.deleteBatch();
+    }
+}
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
new file mode 100644
index 00000000..adc1198f
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java
@@ -0,0 +1,64 @@
+package com.adc.da.slrs.wgdCensusZ.service.impl;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
+import com.adc.da.slrs.wgdCensusZ.dao.WgdExReviseCostDao;
+import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参与外部标准制修订费用统计 服务实现类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Service
+public class WgdExReviseCostServiceImpl extends ServiceImpl<WgdExReviseCostDao, WgdExReviseCost> implements IWgdExReviseCostService {
+
+    @Autowired
+    WgdExReviseCostDao wgdExReviseCostDao;
+
+
+    @Override
+    public List<WgdExReviseCost> getAllWgdExReviseCosts() {
+        return wgdExReviseCostDao.selectAll();
+    }
+
+    @Override
+    public List<WgdExReviseCost> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost) {
+        return wgdExReviseCostDao.queryAll(wgdExReviseCost);
+    }
+
+    @Override
+    public WgdExReviseCost getWgdExReviseCostById(String id) {
+        return wgdExReviseCostDao.selectById(id);
+    }
+
+    @Override
+    public int updateWgdExReviseCost(WgdExReviseCost wgdExReviseCost) {
+        return wgdExReviseCostDao.updateOne(wgdExReviseCost);
+    }
+
+    @Override
+    public int insertWgdExReviseCost(WgdExReviseCost wgdExReviseCost) {
+        wgdExReviseCost.setId(UUIDUtils.randomUUID(32));
+        return wgdExReviseCostDao.insertOne(wgdExReviseCost);
+    }
+
+    @Override
+    public int deleteWgdExReviseCost(String id) {
+        return wgdExReviseCostDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdExReviseCosts(String ids) {
+        return wgdExReviseCostDao.deleteBatch();
+    }
+}
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
new file mode 100644
index 00000000..ee98a8d0
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java
@@ -0,0 +1,63 @@
+package com.adc.da.slrs.wgdCensusZ.service.impl;
+
+import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
+import com.adc.da.slrs.wgdCensusZ.dao.WgdMeetCostDao;
+import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参会费用信息统计 服务实现类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Service
+public class WgdMeetCostServiceImpl extends ServiceImpl<WgdMeetCostDao, WgdMeetCost> implements IWgdMeetCostService {
+
+    @Autowired
+    WgdMeetCostDao wgdMeetCostDao;
+
+    @Override
+    public List<WgdMeetCost> getAllWgdMeetCosts() {
+        return wgdMeetCostDao.selectAll();
+    }
+
+    @Override
+    public List<WgdMeetCost> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost) {
+        return wgdMeetCostDao.queryAll(wgdMeetCost);
+    }
+
+    @Override
+    public WgdMeetCost getWgdMeetCostById(String id) {
+        return wgdMeetCostDao.selectById(id);
+    }
+
+    @Override
+    public int updateWgdMeetCost(WgdMeetCost wgdMeetCost) {
+        return wgdMeetCostDao.updateOne(wgdMeetCost);
+    }
+
+    @Override
+    public int insertWgdMeetCost(WgdMeetCost wgdMeetCost) {
+        wgdMeetCost.setId(UUIDUtils.randomUUID(32));
+        return wgdMeetCostDao.insertOne(wgdMeetCost);
+    }
+
+    @Override
+    public int deleteWgdMeetCost(String id) {
+        return wgdMeetCostDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdMeetCosts(String ids) {
+        return wgdMeetCostDao.deleteBatch();
+    }
+}
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
new file mode 100644
index 00000000..6cea67c4
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao">
+    <!--    基础信息-->
+    <sql id="BaseInfo">
+        id,
+        es_name,
+        plan_status,
+        revise_status,
+        drafter,
+        res_person,
+        wg_leader,
+        draft_time,
+        release_time,
+        unit
+    </sql>
+    <resultMap id="BaseInfoMap" type="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan">
+        <id property="id" column="id"></id>
+        <result property="esName" column="es_name"></result>
+        <result property="planStatus" column="plan_status"></result>
+        <result property="reviseStatus" column="revise_status"></result>
+        <result property="drafter" column="drafter"></result>
+        <result property="resPerson" column="res_person"></result>
+        <result property="wgLeader" column="wg_leader"></result>
+        <result property="draftTime" column="draft_time"></result>
+        <result property="releaseTime" column="release_time"></result>
+        <result property="unit" column="unit"></result>
+    </resultMap>
+    <!--    查询条件-->
+    <sql id="Conditions">
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="esName != null and esName != ''">
+                and es_name like concat('%',#{esName},'%')
+            </if>
+            <if test="planStatus != null and planStatus != ''">
+                and plan_status = #{planStatus}
+            </if>
+            <if test="reviseStatus != null and reviseStatus != ''">
+                and revise_status = #{reviseStatus}
+            </if>
+            <if test="drafter != null and drafter != ''">
+                and drafter = #{drafter}
+            </if>
+            <if test="resPerson != null and resPerson != ''">
+                and res_person = #{resPerson}
+            </if>
+            <if test="wgLeader != null and wgLeader != ''">
+                and wg_leader = #{wgLeader}
+            </if>
+            <if test="draftTime != null">
+                and DATE_FORMAT(draft_time,'%Y-%m-%d')=DATE_FORMAT(#{draftTime},'%Y-%m-%d')
+            </if>
+            <if test="releaseTime != null">
+                and DATE_FORMAT(release_time,'%Y-%m-%d')=DATE_FORMAT(#{releaseTime},'%Y-%m-%d')
+            </if>
+            <if test="unit != null and unit != ''">
+                and unit like concat('%',#{unit},'%')
+            </if>
+        </where>
+    </sql>
+    <!--    查询所有-->
+    <select id="selectAll" resultMap="BaseInfoMap" >
+        select <include refid="BaseInfo"></include> from es_revise_plan
+    </select>
+    <!--    多条件查询-->
+    <select id="queryAll" parameterType="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan" resultMap="BaseInfoMap">
+        select <include refid="BaseInfo"></include> from es_revise_plan
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询详情-->
+    <select id="selectOne" parameterType="java.lang.String" resultMap="BaseInfoMap">
+        select <include refid="BaseInfo"></include> from es_revise_plan
+        where id = #{id}
+    </select>
+    <!--    修改-->
+    <update id="updateOne" parameterType="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan">
+        update es_revise_plan
+        <set>
+            <if test="id != null and id != ''">
+                id = #{id},
+            </if>
+            <if test="esName != null and esName != ''">
+                es_name = #{esName},
+            </if>
+            <if test="planStatus != null and planStatus != ''">
+                plan_status = #{planStatus},
+            </if>
+            <if test="reviseStatus != null and reviseStatus != ''">
+                revise_status = #{reviseStatus},
+            </if>
+            <if test="drafter != null and drafter != ''">
+                drafter = #{drafter},
+            </if>
+            <if test="resPerson != null and resPerson != ''">
+                res_person = #{resPerson},
+            </if>
+            <if test="wgLeader != null and wgLeader != ''">
+                wg_leader = #{wgLeader},
+            </if>
+            <if test="draftTime != null">
+                draft_time = #{draftTime},
+            </if>
+            <if test="releaseTime != null">
+                release_time = #{releaseTime},
+            </if>
+            <if test="unit != null and unit != ''">
+                unit = #{unit},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+    <!--    插入一条数据-->
+    <insert id="insertOne" parameterType="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan">
+        insert into es_revise_plan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="esName != null and esName != ''">
+                es_name,
+            </if>
+            <if test="planStatus != null and planStatus != ''">
+                plan_status,
+            </if>
+            <if test="reviseStatus != null and reviseStatus != ''">
+                revise_status,
+            </if>
+            <if test="drafter != null and drafter != ''">
+                drafter,
+            </if>
+            <if test="resPerson != null and resPerson != ''">
+                res_person,
+            </if>
+            <if test="wgLeader != null and wgLeader != ''">
+                wg_leader,
+            </if>
+            <if test="draftTime != null">
+                draft_time,
+            </if>
+            <if test="releaseTime != null">
+                release_time,
+            </if>
+            <if test="unit != null and unit != ''">
+                unit,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="esName != null and esName != ''">
+                #{esName},
+            </if>
+            <if test="planStatus != null and planStatus != ''">
+                #{planStatus},
+            </if>
+            <if test="reviseStatus != null and reviseStatus != ''">
+                #{reviseStatus},
+            </if>
+            <if test="drafter != null and drafter != ''">
+                #{drafter},
+            </if>
+            <if test="resPerson != null and resPerson != ''">
+                #{resPerson},
+            </if>
+            <if test="wgLeader != null and wgLeader != ''">
+                #{wgLeader},
+            </if>
+            <if test="draftTime != null">
+                #{draftTime},
+            </if>
+            <if test="releaseTime != null">
+                #{releaseTime},
+            </if>
+            <if test="unit != null and unit != ''">
+                #{unit},
+            </if>
+        </trim>
+    </insert>
+    <!--    删除-->
+    <delete id="deleteOne" parameterType="java.lang.String">
+        delete from es_revise_plan where id = #{id}
+    </delete>
+    <!--    批量删除-->
+    <delete id="deleteBatch" parameterType="java.lang.String">
+        delete from es_revise_plan where id in
+        <foreach collection="array" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
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
new file mode 100644
index 00000000..aa3a16da
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao">
+
+<!--    基础信息-->
+    <sql id="BaseInfo">
+        id,sc_name,ssc_name,wg_name,pay_standard,pay_reality,cost_outlay,annual_payment
+    </sql>
+<!--    查询条件-->
+    <sql id="Conditions">
+        <where>
+            <if test="id != null and id != ''">
+                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},'%')
+            </if>
+            <if test="payStandard != null and payStandard != ''">
+                and pay_standard = #{payStandard}
+            </if>
+            <if test="payReality != null and payReality != ''">
+                and pay_reality = #{payReality}
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                and cost_outlay = #{costOutlay}
+            </if>
+            <if test="annualPayment != null and annualPayment != ''">
+                and annual_payment = #{annualPayment}
+            </if>
+        </where>
+    </sql>
+<!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost">
+        select <include refid="BaseInfo"></include> from wgd_assoc_cost
+    </select>
+<!--    多条件查询-->
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost">
+        select <include refid="BaseInfo"></include> from wgd_assoc_cost
+        <include refid="Conditions"></include>
+    </select>
+<!--    查询详情-->
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost">
+        select <include refid="BaseInfo"></include> from wgd_assoc_cost
+        where id = #{id}
+    </select>
+<!--    修改-->
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost">
+        update wgd_assoc_cost
+        <set>
+            <if test="scName != null and scName != ''">
+                sc_name = #{scName},
+            </if>
+            <if test="sscName != null and sscName != ''">
+                ssc_name = #{sscName},
+            </if>
+            <if test="wgName != null and wgName != ''">
+                wg_name = #{wgName},
+            </if>
+            <if test="payStandard != null and payStandard != ''">
+                pay_standard = #{payStandard},
+            </if>
+            <if test="payReality != null and payReality != ''">
+                pay_reality = #{payReality},
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                cost_outlay = #{costOutlay},
+            </if>
+            <if test="annualPayment != null and annualPayment != ''">
+                annual_payment = #{annualPayment},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+<!--    插入一条数据-->
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost">
+        insert into wgd_assoc_cost
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="scName != null and scName != ''">
+                sc_name,
+            </if>
+            <if test="sscName != null and sscName != ''">
+                ssc_name,
+            </if>
+            <if test="wgName != null and wgName != ''">
+                wg_name,
+            </if>
+            <if test="payStandard != null and payStandard != ''">
+                pay_standard,
+            </if>
+            <if test="payReality != null and payReality != ''">
+                pay_reality,
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                cost_outlay,
+            </if>
+            <if test="annualPayment != null and annualPayment != ''">
+                annual_payment,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="scName != null and scName != ''">
+                #{scName},
+            </if>
+            <if test="sscName != null and sscName != ''">
+                #{sscName},
+            </if>
+            <if test="wgName != null and wgName != ''">
+                #{wgName},
+            </if>
+            <if test="payStandard != null and payStandard != ''">
+                #{payStandard},
+            </if>
+            <if test="payReality != null and payReality != ''">
+                #{payReality},
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                #{costOutlay},
+            </if>
+            <if test="annualPayment != null and annualPayment != ''">
+                #{annualPayment},
+            </if>
+        </trim>
+    </insert>
+<!--    删除-->
+    <delete id="deleteOne" parameterType="java.lang.String">
+        delete from wgd_assoc_cost where id = #{id}
+    </delete>
+<!--    批量删除-->
+    <delete id="deleteBatch" parameterType="java.lang.String">
+        delete from wgd_assoc_cost where id in
+        <foreach collection="array" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
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
new file mode 100644
index 00000000..4cd1b820
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml
@@ -0,0 +1,456 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdAssocInfoDao">
+
+    <sql id="BaseInfo">
+        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
+    </sql>
+    <sql id="Conditions">
+        <where>
+            <if test="id != null and id != ''">
+                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},'%')
+            </if>
+            <if test="role != null and role != ''">
+                and role = #{role}
+            </if>
+            <if test="attend != null and attend != ''">
+                and attend = #{attend}
+            </if>
+            <if test="standard != null and standard != ''">
+                and standard = #{standard}
+            </if>
+            <if test="charge != null and charge != ''">
+                and charge = #{charge}
+            </if>
+            <if test="leader != null and leader != ''">
+                and leader = #{leader}
+            </if>
+            <if test="iniTime != null">
+                and ini_time = #{iniTime}
+            </if>
+            <if test="curTime != null">
+                and cur_time = #{curTime}
+            </if>
+            <if test="costStandard != null and costStandard != ''">
+                and cost_standard = #{costStandard}
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                and cost_outlay = #{costOutlay}
+            </if>
+            <if test="lastPayTime != null">
+                and last_pay_time = #{lastPayTime}
+            </if>
+            <if test="payPeriod != null and payPeriod != ''">
+                and pay_period = #{payPeriod}
+            </if>
+            <if test="handler != null and handler != ''">
+                and handler = #{handler}
+            </if>
+            <if test="department != null and department != ''">
+                and department = #{department}
+            </if>
+            <if test="asProper != null and asProper != ''">
+                and as_proper = #{asProper}
+            </if>
+            <if test="asStatus != null and asStatus != ''">
+                and as_status = #{asStatus}
+            </if>
+            <if test="asContact != null and asContact != ''">
+                and as_contact = #{asContact}
+            </if>
+            <if test="tel != null and tel != ''">
+                and tel = #{tel}
+            </if>
+            <if test="mail != null and mail != ''">
+                and mail = #{mail}
+            </if>
+        </where>
+    </sql>
+    <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>
+    </select>
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
+        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>
+            <if test="scName != null and scName != ''">
+                sc_name = #{scName},
+            </if>
+            <if test="sscName != null and sscName != ''">
+                ssc_name = #{sscName},
+            </if>
+            <if test="wgName != null and wgName != ''">
+                wg_name = #{wgName},
+            </if>
+            <if test="role != null and role != ''">
+                role = #{role},
+            </if>
+            <if test="attend != null and attend != ''">
+                attend = #{attend},
+            </if>
+            <if test="standard != null and standard != ''">
+                standard = #{standard},
+            </if>
+            <if test="charge != null and charge != ''">
+                charge = #{charge},
+            </if>
+            <if test="leader != null and leader != ''">
+                leader = #{leader},
+            </if>
+            <if test="iniTime != null">
+                ini_time = #{iniTime},
+            </if>
+            <if test="curTime != null">
+                cur_time = #{curTime},
+            </if>
+            <if test="costStandard != null and costStandard != ''">
+                cost_standard = #{costStandard},
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                 cost_outlay = #{costOutlay},
+            </if>
+            <if test="lastPayTime != null">
+                 last_pay_time = #{lastPayTime},
+            </if>
+            <if test="payPeriod != null and payPeriod != ''">
+                 pay_period = #{payPeriod},
+            </if>
+            <if test="handler != null and handler != ''">
+                 handler = #{handler},
+            </if>
+            <if test="department != null and department != ''">
+                 department = #{department},
+            </if>
+            <if test="asProper != null and asProper != ''">
+                 as_proper = #{asProper},
+            </if>
+            <if test="asStatus != null and asStatus != ''">
+                 as_status = #{asStatus},
+            </if>
+            <if test="asContact != null and asContact != ''">
+                 as_contact = #{asContact},
+            </if>
+            <if test="tel != null and tel != ''">
+                 tel = #{tel},
+            </if>
+            <if test="mail != null and mail != ''">
+                 mail = #{mail},
+            </if>
+            <if test="p17 != null and p17 != ''">
+                p17 = #{p17},
+            </if>
+            <if test="p18 != null and p18 != ''">
+                p18 = #{p18},
+            </if>
+            <if test="p19 != null and p19 != ''">
+                p19 = #{p19},
+            </if>
+            <if test="p20 != null and p20 != ''">
+                p20 = #{p20},
+            </if>
+            <if test="p21 != null and p21 != ''">
+                p21 = #{p21},
+            </if>
+            <if test="p22 != null and p22 != ''">
+                p22 = #{p22},
+            </if>
+            <if test="p23 != null and p23 != ''">
+                p23 = #{p23},
+            </if>
+            <if test="p24 != null and p24 != ''">
+                p24 = #{p24},
+            </if>
+            <if test="p25 != null and p25 != ''">
+                p25 = #{p25},
+            </if>
+            <if test="p26 != null and p26 != ''">
+                p26 = #{p26},
+            </if>
+            <if test="p27 != null and p27 != ''">
+                p27 = #{p27},
+            </if>
+            <if test="p28 != null and p28 != ''">
+                p28 = #{p28},
+            </if>
+            <if test="p29 != null and p29 != ''">
+                p29 = #{p29},
+            </if>
+            <if test="p30 != null and p30 != ''">
+                p30 = #{p30},
+            </if>
+            <if test="p31 != null and p31 != ''">
+                p31 = #{p31},
+            </if>
+            <if test="p32 != null and p32 != ''">
+                p32 = #{p32},
+            </if>
+        </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=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="scName != null and scName != ''">
+                sc_name,
+            </if>
+            <if test="sscName != null and sscName != ''">
+                ssc_name,
+            </if>
+            <if test="wgName != null and wgName != ''">
+                wg_name,
+            </if>
+            <if test="role != null and role != ''">
+                role,
+            </if>
+            <if test="attend != null and attend != ''">
+                attend,
+            </if>
+            <if test="standard != null and standard != ''">
+                standard,
+            </if>
+            <if test="charge != null and charge != ''">
+                charge,
+            </if>
+            <if test="leader != null and leader != ''">
+                leader,
+            </if>
+            <if test="iniTime != null">
+                ini_time,
+            </if>
+            <if test="curTime != null">
+                cur_time,
+            </if>
+            <if test="costStandard != null and costStandard != ''">
+                cost_standard,
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                cost_outlay,
+            </if>
+            <if test="lastPayTime != null">
+                last_pay_time,
+            </if>
+            <if test="payPeriod != null and payPeriod != ''">
+                pay_period,
+            </if>
+            <if test="handler != null and handler != ''">
+                handler,
+            </if>
+            <if test="department != null and department != ''">
+                department,
+            </if>
+            <if test="asProper != null and asProper != ''">
+                as_proper,
+            </if>
+            <if test="asStatus != null and asStatus != ''">
+                as_status,
+            </if>
+            <if test="asContact != null and asContact != ''">
+                as_contact,
+            </if>
+            <if test="tel != null and tel != ''">
+                tel,
+            </if>
+            <if test="mail != null and mail != ''">
+                mail,
+            </if>
+            <if test="p17 != null and p17 != ''">
+                p17,
+            </if>
+            <if test="p18 != null and p18 != ''">
+                p18,
+            </if>
+            <if test="p19 != null and p19 != ''">
+                p19,
+            </if>
+            <if test="p20 != null and p20 != ''">
+                p20,
+            </if>
+            <if test="p21 != null and p21 != ''">
+                p21,
+            </if>
+            <if test="p22 != null and p22 != ''">
+                p22,
+            </if>
+            <if test="p23 != null and p23 != ''">
+                p23,
+            </if>
+            <if test="p24 != null and p24 != ''">
+                p24,
+            </if>
+            <if test="p25 != null and p25 != ''">
+                p25,
+            </if>
+            <if test="p26 != null and p26 != ''">
+                p26,
+            </if>
+            <if test="p27 != null and p27 != ''">
+                p27,
+            </if>
+            <if test="p28 != null and p28 != ''">
+                p28,
+            </if>
+            <if test="p29 != null and p29 != ''">
+                p29,
+            </if>
+            <if test="p30 != null and p30 != ''">
+                p30,
+            </if>
+            <if test="p31 != null and p31 != ''">
+                p31,
+            </if>
+            <if test="p32 != null and p32 != ''">
+                p32,
+            </if>
+        </trim>
+        values
+        <trim suffixOverrides="," suffix=")" prefix="(">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="scName != null and scName != ''">
+                #{scName},
+            </if>
+            <if test="sscName != null and sscName != ''">
+                #{sscName},
+            </if>
+            <if test="wgName != null and wgName != ''">
+                #{wgName},
+            </if>
+            <if test="role != null and role != ''">
+                #{role},
+            </if>
+            <if test="attend != null and attend != ''">
+                #{attend},
+            </if>
+            <if test="standard != null and standard != ''">
+                #{standard},
+            </if>
+            <if test="charge != null and charge != ''">
+                #{charge},
+            </if>
+            <if test="leader != null and leader != ''">
+                #{leader},
+            </if>
+            <if test="iniTime != null">
+                #{iniTime},
+            </if>
+            <if test="curTime != null">
+                #{curTime},
+            </if>
+            <if test="costStandard != null and costStandard != ''">
+                #{costStandard},
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                #{costOutlay},
+            </if>
+            <if test="lastPayTime != null">
+                #{lastPayTime},
+            </if>
+            <if test="payPeriod != null and payPeriod != ''">
+                #{payPeriod},
+            </if>
+            <if test="handler != null and handler != ''">
+                #{handler},
+            </if>
+            <if test="department != null and department != ''">
+                #{department},
+            </if>
+            <if test="asProper != null and asProper != ''">
+                #{asProper},
+            </if>
+            <if test="asStatus != null and asStatus != ''">
+                #{asStatus},
+            </if>
+            <if test="asContact != null and asContact != ''">
+                #{asContact},
+            </if>
+            <if test="tel != null and tel != ''">
+                #{tel},
+            </if>
+            <if test="mail != null and mail != ''">
+                #{mail},
+            </if>
+            <if test="p17 != null and p17 != ''">
+                #{p17},
+            </if>
+            <if test="p18 != null and p18 != ''">
+                #{p18},
+            </if>
+            <if test="p19 != null and p19 != ''">
+                #{p19},
+            </if>
+            <if test="p20 != null and p20 != ''">
+                #{p20},
+            </if>
+            <if test="p21 != null and p21 != ''">
+                #{p21},
+            </if>
+            <if test="p22 != null and p22 != ''">
+                #{p22},
+            </if>
+            <if test="p23 != null and p23 != ''">
+                #{p23},
+            </if>
+            <if test="p24 != null and p24 != ''">
+                #{p24},
+            </if>
+            <if test="p25 != null and p25 != ''">
+                #{p25},
+            </if>
+            <if test="p26 != null and p26 != ''">
+                #{p26},
+            </if>
+            <if test="p27 != null and p27 != ''">
+                #{p27},
+            </if>
+            <if test="p28 != null and p28 != ''">
+                #{p28},
+            </if>
+            <if test="p29 != null and p29 != ''">
+                #{p29},
+            </if>
+            <if test="p30 != null and p30 != ''">
+                #{p30},
+            </if>
+            <if test="p31 != null and p31 != ''">
+                #{p31},
+            </if>
+            <if test="p32 != null and p32 != ''">
+                #{p32},
+            </if>
+        </trim>
+    </insert>
+    <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=",">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>
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
new file mode 100644
index 00000000..9b574587
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdCommiInfoDao">
+
+    <sql id="BaseInfo">
+        id,unit,sc_name,ssc_name,wg_name,role,attend,cur_time,job,department,
+        tel,term,certificate,account,password,remark
+    </sql>
+    <sql id="Conditions">
+
+    </sql>
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
+        select <include refid="BaseInfo"></include> from wgd_commi_info
+    </select>
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
+        select <include refid="BaseInfo"></include> from wgd_commi_info
+        <include refid="Conditions"></include>
+    </select>
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
+        select <include refid="BaseInfo"></include> from wgd_commi_info
+        where id = #{id}
+    </select>
+
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
+
+    </update>
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
+
+    </insert>
+    <delete id="deleteOne" parameterType="java.lang.String">
+
+    </delete>
+    <delete id="deleteBatch">
+
+    </delete>
+</mapper>
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
new file mode 100644
index 00000000..911262e9
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdExReviseCostDao">
+
+    <sql id="BaseInfo">
+        id,type,pro_id,pro_name,cost_outlay,cost
+    </sql>
+    <sql id="Conditions">
+
+    </sql>
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
+        select <include refid="BaseInfo"></include> from wgd_ex_revise_cost
+    </select>
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
+        select <include refid="BaseInfo"></include> from wgd_ex_revise_cost
+        <include refid="Conditions"></include>
+    </select>
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
+        select <include refid="BaseInfo"></include> from wgd_ex_revise_cost
+        where id = #{id}
+    </select>
+
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
+
+    </update>
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
+
+    </insert>
+    <delete id="deleteOne" parameterType="java.lang.String">
+
+    </delete>
+    <delete id="deleteBatch">
+
+    </delete>
+</mapper>
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
new file mode 100644
index 00000000..5a7b9b68
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdMeetCostDao">
+
+    <sql id="BaseInfo">
+        id,unit,meet_name,meet_time,pay_standard,pay_reality,cost_outlay
+    </sql>
+
+    <sql id="Conditions">
+
+    </sql>
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
+        select <include refid="BaseInfo"></include> from wgd_meet_cost
+    </select>
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
+        select <include refid="BaseInfo"></include> from wgd_meet_cost
+        <include refid="Conditions"></include>
+    </select>
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
+        select <include refid="BaseInfo"></include> from wgd_meet_cost
+        where id = #{id}
+    </select>
+
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
+
+    </update>
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
+
+    </insert>
+    <delete id="deleteOne" parameterType="java.lang.String">
+
+    </delete>
+    <delete id="deleteBatch">
+
+    </delete>
+</mapper>

From a15f3f4934edae700ded5bb6bb79097250423e96 Mon Sep 17 00:00:00 2001
From: liao <2948196353@qq.com>
Date: Mon, 15 Nov 2021 13:36:58 +0800
Subject: [PATCH 2/5] ~

---
 .../controller/WgdCgfyController.java         | 66 +++++++++++++
 .../controller/WgdFyfyController.java         | 65 +++++++++++++
 .../controller/WgdSrbController.java          | 65 +++++++++++++
 .../controller/WgdWbtjController.java         | 65 +++++++++++++
 .../controller/WgdWbxdController.java         | 65 +++++++++++++
 .../controller/WgdZcbController.java          | 65 +++++++++++++
 .../da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java  | 25 +++++
 .../da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java  | 25 +++++
 .../da/slrs/wgdCensusLeo/dao/WgdSrbDao.java   | 25 +++++
 .../da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java  | 25 +++++
 .../da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java  | 25 +++++
 .../da/slrs/wgdCensusLeo/dao/WgdZcbDao.java   | 25 +++++
 .../da/slrs/wgdCensusLeo/entity/WgdCgfy.java  | 46 +++++++++
 .../da/slrs/wgdCensusLeo/entity/WgdFyfy.java  | 52 +++++++++++
 .../da/slrs/wgdCensusLeo/entity/WgdSrb.java   | 45 +++++++++
 .../da/slrs/wgdCensusLeo/entity/WgdWbtj.java  | 70 ++++++++++++++
 .../da/slrs/wgdCensusLeo/entity/WgdWbxd.java  | 93 +++++++++++++++++++
 .../da/slrs/wgdCensusLeo/entity/WgdZcb.java   | 42 +++++++++
 .../wgdCensusLeo/service/IWgdCgfyService.java | 37 ++++++++
 .../wgdCensusLeo/service/IWgdFyfyService.java | 35 +++++++
 .../wgdCensusLeo/service/IWgdSrbService.java  | 35 +++++++
 .../wgdCensusLeo/service/IWgdWbtjService.java | 35 +++++++
 .../wgdCensusLeo/service/IWgdWbxdService.java | 35 +++++++
 .../wgdCensusLeo/service/IWgdZcbService.java  | 35 +++++++
 .../service/impl/WgdCgfyServiceImpl.java      | 63 +++++++++++++
 .../service/impl/WgdFyfyServiceImpl.java      | 62 +++++++++++++
 .../service/impl/WgdSrbServiceImpl.java       | 61 ++++++++++++
 .../service/impl/WgdWbtjServiceImpl.java      | 62 +++++++++++++
 .../service/impl/WgdWbxdServiceImpl.java      | 62 +++++++++++++
 .../service/impl/WgdZcbServiceImpl.java       | 62 +++++++++++++
 .../mapper/wgdCensusLeo/WgdCgfyMapper.xml     |  5 +
 .../mapper/wgdCensusLeo/WgdFyfyMapper.xml     |  5 +
 .../mapper/wgdCensusLeo/WgdSrbMapper.xml      |  5 +
 .../mapper/wgdCensusLeo/WgdWbtjMapper.xml     |  5 +
 .../mapper/wgdCensusLeo/WgdWbxdMapper.xml     |  5 +
 .../mapper/wgdCensusLeo/WgdZcbMapper.xml      |  5 +
 36 files changed, 1503 insertions(+)
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml
 create mode 100644 adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml

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
new file mode 100644
index 00000000..a15c77d7
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java
@@ -0,0 +1,66 @@
+package com.adc.da.slrs.wgdCensusLeo.controller;
+
+
+import com.adc.da.base.web.BaseController;
+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 org.springframework.web.bind.annotation.RestController;
+
+/**
+* <p>
+    * 采购费用信息统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdCgfy|")
+@RequestMapping("/wgdCensusLeo/wgd-cgfy")
+public class WgdCgfyController extends BaseController<WgdCgfy> {
+
+    @Autowired
+    IWgdCgfyService iWgdCgfyService;
+
+    @GetMapping("getAllCgfy")
+    public ResponseMessage<Object> getAllWgdCgfy(){//查询所有
+        return Result.success(iWgdCgfyService.getAllWgdCgfy());
+    }
+
+    @PostMapping("queryAllCgfy")
+    public ResponseMessage<Object> queryAllWgdCgfy(WgdCgfy wgdCgfy){//多条件查询
+        return Result.success(iWgdCgfyService.queryAllWgdCgfy(wgdCgfy));
+    }
+
+    @GetMapping("getCgfyById")
+    public ResponseMessage<Object> getWgdCgfyById(String id) {//查询详情
+        return Result.success(iWgdCgfyService.getWgdCgfyById(id));
+    }
+
+    @PostMapping("modCgfy")
+    ResponseMessage<Object> updateWgdCgfy(WgdCgfy wgdCgfy) {//编辑
+        return Result.success(iWgdCgfyService.updateWgdCgfy(wgdCgfy));
+    }
+
+    @PostMapping("addCgfy")
+    ResponseMessage<Object> insertWgdCgfy(WgdCgfy wgdCgfy) {//插入
+        return Result.success(iWgdCgfyService.insertWgdCgfy(wgdCgfy));
+    }
+
+    @GetMapping("delCgfy")
+    ResponseMessage<Object> deleteWgdCgfy(String id){//删除
+        return Result.success(iWgdCgfyService.deleteWgdCgfy(id));
+    }
+
+    @GetMapping("delCgfys")
+    ResponseMessage<Object> deleteWgdCgfys(String ids){//批量删除
+        return Result.success(iWgdCgfyService.deleteWgdCgfy(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
new file mode 100644
index 00000000..eeefef57
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusLeo.controller;
+
+
+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 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;
+
+/**
+* <p>
+    * 翻译费用信息统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdFyfy|")
+@RequestMapping("/wgdCensusLeo/wgd-fyfy")
+public class WgdFyfyController extends BaseController<WgdFyfy> {
+    @Autowired
+    IWgdFyfyService iWgdFyfyService;
+
+    @GetMapping("getAllFyfy")
+    public ResponseMessage<Object> getAllWgdFyfy(){//查询所有
+        return Result.success(iWgdFyfyService.getAllWgdFyfy());
+    }
+
+    @PostMapping("queryAllFyfy")
+    public ResponseMessage<Object> queryAllWgdCgfy(WgdFyfy wgdFyfy){//多条件查询
+        return Result.success(iWgdFyfyService.queryAllWgdFyfy(wgdFyfy));
+    }
+
+    @GetMapping("getFyfyById")
+    public ResponseMessage<Object> getWgdFyfyById(String id) {//查询详情
+        return Result.success(iWgdFyfyService.getWgdFyfyById(id));
+    }
+
+    @PostMapping("modFyfy")
+    ResponseMessage<Object> updateWgdFyfy(WgdFyfy wgdFyfy) {//编辑
+        return Result.success(iWgdFyfyService.updateWgdFyfy(wgdFyfy));
+    }
+
+    @PostMapping("addFyfy")
+    ResponseMessage<Object> insertWgdFyfy(WgdFyfy wgdFyfy) {//插入
+        return Result.success(iWgdFyfyService.insertWgdFyfy(wgdFyfy));
+    }
+
+    @GetMapping("delFyfy")
+    ResponseMessage<Object> deleteWgdFyfy(String id){//删除
+        return Result.success(iWgdFyfyService.deleteWgdFyfy(id));
+    }
+
+    @GetMapping("delFyfys")
+    ResponseMessage<Object> deleteWgdFyfys(String ids){//批量删除
+        return Result.success(iWgdFyfyService.deleteWgdFyfy(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
new file mode 100644
index 00000000..5b432de3
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusLeo.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService;
+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 com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 标准制修订补助资金收支统计收入表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdSrb|")
+@RequestMapping("/wgdCensusLeo/wgd-srb")
+public class WgdSrbController extends BaseController<WgdSrb> {
+    @Autowired
+    IWgdSrbService iWgdSrbService;
+
+    @GetMapping("getAllSrb")
+    public ResponseMessage<Object> getAllWgdSrb(){//查询所有
+        return Result.success(iWgdSrbService.getAllWgdSrb());
+    }
+
+    @PostMapping("queryAllSrb")
+    public ResponseMessage<Object> queryAllWgdSrb(WgdSrb wgdSrb){//多条件查询
+        return Result.success(iWgdSrbService.queryAllWgdSrb(wgdSrb));
+    }
+
+    @GetMapping("getSrbById")
+    public ResponseMessage<Object> getWgdSrbById(String id) {//查询详情
+        return Result.success(iWgdSrbService.getWgdSrbById(id));
+    }
+
+    @PostMapping("modSrb")
+    ResponseMessage<Object> updateWgdSrb(WgdSrb wgdSrb) {//编辑
+        return Result.success(iWgdSrbService.updateWgdSrb(wgdSrb));
+    }
+
+    @PostMapping("addSrb")
+    ResponseMessage<Object> insertWgdSrb(WgdSrb wgdSrb) {//插入
+        return Result.success(iWgdSrbService.insertWgdSrb(wgdSrb));
+    }
+
+    @GetMapping("delSrb")
+    ResponseMessage<Object> deleteWgdSrb(String id){//删除
+        return Result.success(iWgdSrbService.deleteWgdSrb(id));
+    }
+
+    @GetMapping("delSrbs")
+    ResponseMessage<Object> deleteWgdSrbs(String ids){//批量删除
+        return Result.success(iWgdSrbService.deleteWgdSrb(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
new file mode 100644
index 00000000..d8709374
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusLeo.controller;
+
+
+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 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;
+
+/**
+* <p>
+    * 参与外部协会会议统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdWbtj|")
+@RequestMapping("/wgdCensusLeo/wgd-wbtj")
+public class WgdWbtjController extends BaseController<WgdWbtj> {
+    @Autowired
+    IWgdWbtjService iWgdWbtjService;
+
+    @GetMapping("getAllWbtj")
+    public ResponseMessage<Object> getAllWgdWbtj(){//查询所有
+        return Result.success(iWgdWbtjService.getAllWgdWbtj());
+    }
+
+    @PostMapping("queryAllWbtj")
+    public ResponseMessage<Object> queryAllWgdWbtj(WgdWbtj wgdWbtj){//多条件查询
+        return Result.success(iWgdWbtjService.queryAllWgdWbtj(wgdWbtj));
+    }
+
+    @GetMapping("getWbtjById")
+    public ResponseMessage<Object> getWgdWbtjById(String id) {//查询详情
+        return Result.success(iWgdWbtjService.getWgdWbtjById(id));
+    }
+
+    @PostMapping("modWbtj")
+    ResponseMessage<Object> updateWgdWbtj(WgdWbtj wgdWbtj) {//编辑
+        return Result.success(iWgdWbtjService.updateWgdWbtj(wgdWbtj));
+    }
+
+    @PostMapping("addWbtj")
+    ResponseMessage<Object> insertWgdWbtj(WgdWbtj wgdWbtj) {//插入
+        return Result.success(iWgdWbtjService.insertWgdWbtj(wgdWbtj));
+    }
+
+    @GetMapping("delWbtj")
+    ResponseMessage<Object> deleteWgdWbtj(String id){//删除
+        return Result.success(iWgdWbtjService.deleteWgdWbtj(id));
+    }
+
+    @GetMapping("delWbtjs")
+    ResponseMessage<Object> deleteWgdWbtjs(String ids){//批量删除
+        return Result.success(iWgdWbtjService.deleteWgdWbtj(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
new file mode 100644
index 00000000..799d66b7
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusLeo.controller;
+
+
+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 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;
+
+/**
+* <p>
+    * 参与外部标准制修订信息统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdWbxd|")
+@RequestMapping("/wgdCensusLeo/wgd-wbxd")
+public class WgdWbxdController extends BaseController<WgdWbxd> {
+    @Autowired
+    IWgdWbxdService iWgdWbxdService;
+
+    @GetMapping("getAllWbxd")
+    public ResponseMessage<Object> getAllWgdWbxd(){//查询所有
+        return Result.success(iWgdWbxdService.getAllWgdWbxd());
+    }
+
+    @PostMapping("queryAllWbxd")
+    public ResponseMessage<Object> queryAllWgdWbxd(WgdWbxd wgdWbxd){//多条件查询
+        return Result.success(iWgdWbxdService.queryAllWgdWbxd(wgdWbxd));
+    }
+
+    @GetMapping("getWbxdById")
+    public ResponseMessage<Object> getWgdWbxdById(String id) {//查询详情
+        return Result.success(iWgdWbxdService.getWgdWbxdById(id));
+    }
+
+    @PostMapping("modWbxd")
+    ResponseMessage<Object> updateWgdWbxd(WgdWbxd wgdWbxd) {//编辑
+        return Result.success(iWgdWbxdService.updateWgdWbxd(wgdWbxd));
+    }
+
+    @PostMapping("addWbxd")
+    ResponseMessage<Object> insertWgdWbxd(WgdWbxd wgdWbxd) {//插入
+        return Result.success(iWgdWbxdService.insertWgdWbxd(wgdWbxd));
+    }
+
+    @GetMapping("delWbxd")
+    ResponseMessage<Object> deleteWgdWbxd(String id){//删除
+        return Result.success(iWgdWbxdService.deleteWgdWbxd(id));
+    }
+
+    @GetMapping("delWbxds")
+    ResponseMessage<Object> deleteWgdWbxds(String ids){//批量删除
+        return Result.success(iWgdWbxdService.deleteWgdWbxd(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
new file mode 100644
index 00000000..3eb648b7
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java
@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusLeo.controller;
+
+
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService;
+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 com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.adc.da.base.web.BaseController;
+
+/**
+* <p>
+    * 标准制修订补助资金收支统计支出表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdZcb|")
+@RequestMapping("/wgdCensusLeo/wgd-zcb")
+public class WgdZcbController extends BaseController<WgdZcb> {
+    @Autowired
+    IWgdZcbService iWgdZcbService;
+
+    @GetMapping("getAllZcb")
+    public ResponseMessage<Object> getAllWgdZcb(){//查询所有
+        return Result.success(iWgdZcbService.getAllWgdZcb());
+    }
+
+    @PostMapping("queryAllZcb")
+    public ResponseMessage<Object> queryAllWgdZcb(WgdZcb wgdZcb){//多条件查询
+        return Result.success(iWgdZcbService.queryAllWgdZcb(wgdZcb));
+    }
+
+    @GetMapping("getZcbById")
+    public ResponseMessage<Object> getWgdZcbById(String id) {//查询详情
+        return Result.success(iWgdZcbService.getWgdZcbById(id));
+    }
+
+    @PostMapping("modZcb")
+    ResponseMessage<Object> updateWgdZcb(WgdZcb wgdZcb) {//编辑
+        return Result.success(iWgdZcbService.updateWgdZcb(wgdZcb));
+    }
+
+    @PostMapping("addZcb")
+    ResponseMessage<Object> insertWgdZcb(WgdZcb wgdZcb) {//插入
+        return Result.success(iWgdZcbService.insertWgdZcb(wgdZcb));
+    }
+
+    @GetMapping("delZcb")
+    ResponseMessage<Object> deleteWgdZcb(String id){//删除
+        return Result.success(iWgdZcbService.deleteWgdZcb(id));
+    }
+
+    @GetMapping("delZcbs")
+    ResponseMessage<Object> deleteWgdZcbs(String ids){//批量删除
+        return Result.success(iWgdZcbService.deleteWgdZcb(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
new file mode 100644
index 00000000..f42f56f8
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.wgdCensusLeo.dao;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 采购费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdCgfyDao extends BaseMapper<WgdCgfy> {
+    List<WgdCgfy> selectAll();//查询所有
+    List<WgdCgfy> queryAll(WgdCgfy wgdCgfy);//多条件查询
+    WgdCgfy selectOne(String id);//查询详情
+
+    int updateOne(WgdCgfy wgdCgfy);//编辑
+    int insertOne(WgdCgfy wgdCgfy);//插入
+    int deleteOne(String id);//删除
+    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
new file mode 100644
index 00000000..3be601a5
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.wgdCensusLeo.dao;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 翻译费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdFyfyDao extends BaseMapper<WgdFyfy> {
+    List<WgdFyfy> selectAll();//查询所有
+    List<WgdFyfy> queryAll(WgdFyfy wgdFyfy);//多条件查询
+    WgdFyfy selectOne(String id);//查询详情
+
+    int updateOne(WgdFyfy wgdFyfy);//编辑
+    int insertOne(WgdFyfy wgdFyfy);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch(String[] ids);//批量删除
+}
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
new file mode 100644
index 00000000..e219f5cb
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.wgdCensusLeo.dao;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计收入表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdSrbDao extends BaseMapper<WgdSrb> {
+    List<WgdSrb> selectAll();//查询所有
+    List<WgdSrb> queryAll(WgdSrb wgdSrb);//多条件查询
+    WgdSrb selectOne(String id);//查询详情
+
+    int updateOne(WgdSrb wgdSrb);//编辑
+    int insertOne(WgdSrb wgdSrb);//插入
+    int deleteOne(String id);//删除
+    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
new file mode 100644
index 00000000..64821346
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.wgdCensusLeo.dao;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参与外部协会会议统计 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdWbtjDao extends BaseMapper<WgdWbtj> {
+    List<WgdWbtj> selectAll();//查询所有
+    List<WgdWbtj> queryAll(WgdWbtj wgdWbtj);//多条件查询
+    WgdWbtj selectOne(String id);//查询详情
+
+    int updateOne(WgdWbtj wgdWbtj);//编辑
+    int insertOne(WgdWbtj wgdWbtj);//插入
+    int deleteOne(String id);//删除
+    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
new file mode 100644
index 00000000..686defcc
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.wgdCensusLeo.dao;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参与外部标准制修订信息统计 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdWbxdDao extends BaseMapper<WgdWbxd> {
+    List<WgdWbxd> selectAll();//查询所有
+    List<WgdWbxd> queryAll(WgdWbxd wgdWbxd);//多条件查询
+    WgdWbxd selectOne(String id);//查询详情
+
+    int updateOne(WgdWbxd wgdWbxd);//编辑
+    int insertOne(WgdWbxd wgdWbxd);//插入
+    int deleteOne(String id);//删除
+    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
new file mode 100644
index 00000000..00c8df4e
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java
@@ -0,0 +1,25 @@
+package com.adc.da.slrs.wgdCensusLeo.dao;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计支出表 Mapper 接口
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface WgdZcbDao extends BaseMapper<WgdZcb> {
+    List<WgdZcb> selectAll();//查询所有
+    List<WgdZcb> queryAll(WgdZcb wgdZcb);//多条件查询
+    WgdZcb selectOne(String id);//查询详情
+
+    int updateOne(WgdZcb wgdZcb);//编辑
+    int insertOne(WgdZcb wgdZcb);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch(String[] ids);//批量删除
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java
new file mode 100644
index 00000000..a71fc8a7
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java
@@ -0,0 +1,46 @@
+package com.adc.da.slrs.wgdCensusLeo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 采购费用信息统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdCgfy对象", description="采购费用信息统计")
+public class WgdCgfy extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "标准类型")
+    private String type;
+
+    @ApiModelProperty(value = "标准代号")
+    private String number;
+
+    @ApiModelProperty(value = "标准名称")
+    private String name;
+
+    @ApiModelProperty(value = "页数")
+    private String pages;
+
+    @ApiModelProperty(value = "费用")
+    private String cost;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java
new file mode 100644
index 00000000..66116ea1
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java
@@ -0,0 +1,52 @@
+package com.adc.da.slrs.wgdCensusLeo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 翻译费用信息统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdFyfy对象", description="翻译费用信息统计")
+public class WgdFyfy extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "标准类型")
+    private String type;
+
+    @ApiModelProperty(value = "标准代号")
+    private String number;
+
+    @ApiModelProperty(value = "标准名称")
+    private String name;
+
+    @ApiModelProperty(value = "翻译类型")
+    private String translation;
+
+    @ApiModelProperty(value = "页数")
+    private String pages;
+
+    @ApiModelProperty(value = "费用")
+    private String cost;
+
+    @ApiModelProperty(value = "翻译完成时间")
+    private String time;
+
+
+}
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
new file mode 100644
index 00000000..250f0954
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java
@@ -0,0 +1,45 @@
+package com.adc.da.slrs.wgdCensusLeo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计收入表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdSrb对象", description="标准制修订补助资金收支统计收入表")
+public class WgdSrb extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "标准名称")
+    private String name;
+
+    @ApiModelProperty(value = "标准编号")
+    private String number;
+
+    @ApiModelProperty(value = "补助来源")
+    private String source;
+
+    @ApiModelProperty(value = "补助金额")
+    private String money;
+
+    @ApiModelProperty(value = "入账时间")
+    private String data;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java
new file mode 100644
index 00000000..27f7d004
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java
@@ -0,0 +1,70 @@
+package com.adc.da.slrs.wgdCensusLeo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 参与外部协会会议统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdWbtj对象", description="参与外部协会会议统计")
+public class WgdWbtj extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "主办单位")
+    private String host;
+
+    @ApiModelProperty(value = "会议名称")
+    private String meeting;
+
+    @ApiModelProperty(value = "会议时间")
+    private String time;
+
+    @ApiModelProperty(value = "会议地点")
+    private String place;
+
+    @ApiModelProperty(value = "会费标准")
+    private String contributions;
+
+    @ApiModelProperty(value = "会费实际发生")
+    private String occurs;
+
+    @ApiModelProperty(value = "费用列支")
+    private String expenses;
+
+    @ApiModelProperty(value = "参会人员")
+    private String user;
+
+    @ApiModelProperty(value = "主管领导")
+    private String leadership;
+
+    @ApiModelProperty(value = "参会单位")
+    private String participants;
+
+    @ApiModelProperty(value = "会议资料")
+    private String information;
+
+    @ApiModelProperty(value = "会议录音")
+    private String recording;
+
+    @ApiModelProperty(value = "主要议题")
+    @TableField("Issues")
+    private String Issues;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java
new file mode 100644
index 00000000..0ec6e035
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java
@@ -0,0 +1,93 @@
+package com.adc.da.slrs.wgdCensusLeo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 参与外部标准制修订信息统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdWbxd对象", description="参与外部标准制修订信息统计")
+public class WgdWbxd extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "所处阶段")
+    private String stage;
+
+    @ApiModelProperty(value = "标准号")
+    private String number;
+
+    @ApiModelProperty(value = "标准名称")
+    private String name;
+
+    @ApiModelProperty(value = "项目代号")
+    private String projectId;
+
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
+    @ApiModelProperty(value = "标准类型")
+    private String type;
+
+    @ApiModelProperty(value = "主持或参与")
+    private String preside;
+
+    @ApiModelProperty(value = "发布日期")
+    private String dataStart;
+
+    @ApiModelProperty(value = "实施日期")
+    private String dataImplement;
+
+    @ApiModelProperty(value = "颁布机构")
+    private String body;
+
+    @ApiModelProperty(value = "牵头起草单位")
+    private String drafting;
+
+    @ApiModelProperty(value = "备案时间")
+    private String dataRecord;
+
+    @ApiModelProperty(value = "提报单位名称")
+    private String report;
+
+    @ApiModelProperty(value = "参与人")
+    private String participants;
+
+    @ApiModelProperty(value = "署名人")
+    private String celebrity;
+
+    @ApiModelProperty(value = "制标费用")
+    private String costMarking;
+
+    @ApiModelProperty(value = "其他费用")
+    private String costOther;
+
+    @ApiModelProperty(value = "标准制/修订")
+    private String revised;
+
+    @ApiModelProperty(value = "获奖情况")
+    private String status;
+
+    @ApiModelProperty(value = "署名排序")
+    private String signature;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+
+}
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
new file mode 100644
index 00000000..ce6bc7eb
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java
@@ -0,0 +1,42 @@
+package com.adc.da.slrs.wgdCensusLeo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import java.math.BigDecimal;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计支出表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdZcb对象", description="标准制修订补助资金收支统计支出表")
+public class WgdZcb extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+    @ApiModelProperty(value = "支出金额")
+    private String money;
+
+    @ApiModelProperty(value = "用途")
+    private String use;
+
+    @ApiModelProperty(value = "详细附件")
+    private String annex;
+
+
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java
new file mode 100644
index 00000000..f0e8fa75
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java
@@ -0,0 +1,37 @@
+package com.adc.da.slrs.wgdCensusLeo.service;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 采购费用信息统计 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdCgfyService extends IService<WgdCgfy> {
+
+    Object getAllWgdCgfy();
+
+    Object queryAllWgdCgfy(WgdCgfy wgdCgfy);
+
+    List<WgdCgfy> queryAllWgdAssocCosts(WgdCgfy wgdAssocCost);
+
+    List<WgdCgfy> getAllWgdCgfys();
+
+    List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy);
+
+    Object getWgdCgfyById(String id);
+
+    int updateWgdCgfy(WgdCgfy wgdCgfy);
+
+    int insertWgdCgfy(WgdCgfy wgdCgfy);
+
+    int deleteWgdCgfy(String id);
+
+    int deleteWgdCgfys(String ids);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java
new file mode 100644
index 00000000..1bef9456
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java
@@ -0,0 +1,35 @@
+package com.adc.da.slrs.wgdCensusLeo.service;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 翻译费用信息统计 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdFyfyService extends IService<WgdFyfy> {
+
+    Object getAllWgdFyfy();
+
+    Object queryAllWgdFyfy(WgdFyfy wgdFyfy);
+
+    List<WgdFyfy> getAllWgdFyfys();
+
+    List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy);
+
+    Object getWgdFyfyById(String id);
+
+    int updateWgdFyfy(WgdFyfy wgdFyfy);
+
+    int insertWgdFyfy(WgdFyfy wgdFyfy);
+
+    int deleteWgdFyfy(String id);
+
+    int deleteWgdFyfys(String ids);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java
new file mode 100644
index 00000000..32cf2f3e
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java
@@ -0,0 +1,35 @@
+package com.adc.da.slrs.wgdCensusLeo.service;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计收入表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdSrbService extends IService<WgdSrb> {
+
+    Object getAllWgdSrb();
+
+    Object queryAllWgdSrb(WgdSrb wgdSrb);
+
+    List<WgdSrb> getAllWgdSrbs();
+
+    List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb);
+
+    Object getWgdSrbById(String id);
+
+    int updateWgdSrb(WgdSrb wgdSrb);
+
+    int insertWgdSrb(WgdSrb wgdSrb);
+
+    int deleteWgdSrb(String id);
+
+    int deleteWgdSrbs(String ids);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java
new file mode 100644
index 00000000..a4953148
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java
@@ -0,0 +1,35 @@
+package com.adc.da.slrs.wgdCensusLeo.service;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参与外部协会会议统计 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdWbtjService extends IService<WgdWbtj> {
+
+    Object getAllWgdWbtj();
+
+    Object queryAllWgdWbtj(WgdWbtj wgdWbtj);
+
+    List<WgdWbtj> getAllWgdWbtjs();
+
+    List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj);
+
+    Object getWgdWbtjById(String id);
+
+    int updateWgdWbtj(WgdWbtj wgdWbtj);
+
+    int insertWgdWbtj(WgdWbtj wgdWbtj);
+
+    int deleteWgdWbtj(String id);
+
+    int deleteWgdWbtjs(String ids);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java
new file mode 100644
index 00000000..cc532b28
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java
@@ -0,0 +1,35 @@
+package com.adc.da.slrs.wgdCensusLeo.service;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参与外部标准制修订信息统计 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdWbxdService extends IService<WgdWbxd> {
+
+    Object getAllWgdWbxd();
+
+    Object queryAllWgdWbxd(WgdWbxd wgdWbxd);
+
+    List<WgdWbxd> getAllWgdWbxds();
+
+    List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd);
+
+    Object getWgdWbxdById(String id);
+
+    int updateWgdWbxd(WgdWbxd wgdWbxd);
+
+    int insertWgdWbxd(WgdWbxd wgdWbxd);
+
+    int deleteWgdWbxd(String id);
+
+    int deleteWgdWbxds(String ids);
+}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java
new file mode 100644
index 00000000..b97f7b0a
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java
@@ -0,0 +1,35 @@
+package com.adc.da.slrs.wgdCensusLeo.service;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计支出表 服务类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+public interface IWgdZcbService extends IService<WgdZcb> {
+
+    Object getAllWgdZcb();
+
+    Object queryAllWgdZcb(WgdZcb wgdZcb);
+
+    List<WgdZcb> getAllWgdZcbs();
+
+    List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb);
+
+    Object getWgdZcbById(String id);
+
+    int updateWgdZcb(WgdZcb wgdZcb);
+
+    int insertWgdZcb(WgdZcb wgdZcb);
+
+    int deleteWgdZcb(String id);
+
+    int deleteWgdZcbs(String 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
new file mode 100644
index 00000000..30bb76a3
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java
@@ -0,0 +1,63 @@
+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.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 采购费用信息统计 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public abstract class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> implements IWgdCgfyService {
+
+    @Autowired
+    WgdCgfyDao wgdCgfyDao;
+
+    @Override
+    public List<WgdCgfy> getAllWgdCgfys() {
+        return wgdCgfyDao.selectAll();
+    }
+
+    @Override
+    public List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy) {
+        return wgdCgfyDao.queryAll(wgdCgfy);
+    }
+
+    @Override
+    public WgdCgfy getWgdCgfyById(String id) {
+        return wgdCgfyDao.selectOne(id);
+    }
+
+    @Override
+    public int updateWgdCgfy(WgdCgfy wgdCgfy) {
+        return wgdCgfyDao.updateOne(wgdCgfy);
+    }
+
+    @Override
+    public int insertWgdCgfy(WgdCgfy wgdCgfy) {
+        wgdCgfy.setId(UUIDUtils.randomUUID(32));
+        return wgdCgfyDao.insertOne(wgdCgfy);
+    }
+
+    @Override
+    public int deleteWgdCgfy(String id) {
+        return wgdCgfyDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdCgfys(String ids) {
+        String[] str = ids.split(",");
+        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
new file mode 100644
index 00000000..d08ff56d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java
@@ -0,0 +1,62 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
+import com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 翻译费用信息统计 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public abstract class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> implements IWgdFyfyService {
+    @Autowired
+    WgdFyfyDao wgdFyfyDao;
+
+    @Override
+    public List<WgdFyfy> getAllWgdFyfys() {
+        return wgdFyfyDao.selectAll();
+    }
+
+    @Override
+    public List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy) {
+        return wgdFyfyDao.queryAll(wgdFyfy);
+    }
+
+    @Override
+    public WgdFyfy getWgdFyfyById(String id) {
+        return wgdFyfyDao.selectOne(id);
+    }
+
+    @Override
+    public int updateWgdFyfy(WgdFyfy wgdFyfy) {
+        return wgdFyfyDao.updateOne(wgdFyfy);
+    }
+
+    @Override
+    public int insertWgdFyfy(WgdFyfy wgdFyfy) {
+        wgdFyfy.setId(UUIDUtils.randomUUID(32));
+        return wgdFyfyDao.insertOne(wgdFyfy);
+    }
+
+    @Override
+    public int deleteWgdFyfy(String id) {
+        return wgdFyfyDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdFyfys(String ids) {
+        String[] str = ids.split(",");
+        return wgdFyfyDao.deleteBatch(str);
+    }
+}
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
new file mode 100644
index 00000000..730b0f1d
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java
@@ -0,0 +1,61 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
+import com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计收入表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public abstract class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements IWgdSrbService {
+    @Autowired
+    WgdSrbDao wgdSrbDao;
+    @Override
+    public List<WgdSrb> getAllWgdSrbs() {
+        return wgdSrbDao.selectAll();
+    }
+
+    @Override
+    public List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb) {
+        return wgdSrbDao.queryAll(wgdSrb);
+    }
+
+    @Override
+    public WgdSrb getWgdSrbById(String id) {
+        return wgdSrbDao.selectOne(id);
+    }
+
+    @Override
+    public int updateWgdSrb(WgdSrb wgdSrb) {
+        return wgdSrbDao.updateOne(wgdSrb);
+    }
+
+    @Override
+    public int insertWgdSrb(WgdSrb wgdSrb) {
+        wgdSrb.setId(UUIDUtils.randomUUID(32));
+        return wgdSrbDao.insertOne(wgdSrb);
+    }
+
+    @Override
+    public int deleteWgdSrb(String id) {
+        return wgdSrbDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdSrbs(String ids) {
+        String[] str = ids.split(",");
+        return wgdSrbDao.deleteBatch(str);
+    }
+}
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
new file mode 100644
index 00000000..d08dece4
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java
@@ -0,0 +1,62 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbtjDao;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参与外部协会会议统计 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public abstract class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> implements IWgdWbtjService {
+    @Autowired
+    WgdWbtjDao wgdWbtjDao;
+
+    @Override
+    public List<WgdWbtj> getAllWgdWbtjs() {
+        return wgdWbtjDao.selectAll();
+    }
+
+    @Override
+    public List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj) {
+        return wgdWbtjDao.queryAll(wgdWbtj);
+    }
+
+    @Override
+    public WgdWbtj getWgdWbtjById(String id) {
+        return wgdWbtjDao.selectOne(id);
+    }
+
+    @Override
+    public int updateWgdWbtj(WgdWbtj wgdWbtj) {
+        return wgdWbtjDao.updateOne(wgdWbtj);
+    }
+
+    @Override
+    public int insertWgdWbtj(WgdWbtj wgdWbtj) {
+        wgdWbtj.setId(UUIDUtils.randomUUID(32));
+        return wgdWbtjDao.insertOne(wgdWbtj);
+    }
+
+    @Override
+    public int deleteWgdWbtj(String id) {
+        return wgdWbtjDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdWbtjs(String ids) {
+        String[] str = ids.split(",");
+        return wgdWbtjDao.deleteBatch(str);
+    }
+}
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
new file mode 100644
index 00000000..dda4435e
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java
@@ -0,0 +1,62 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+import com.adc.da.slrs.wgdCensusLeo.dao.WgdWbxdDao;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 参与外部标准制修订信息统计 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public abstract class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> implements IWgdWbxdService {
+    @Autowired
+    WgdWbxdDao wgdWbxdDao;
+
+    @Override
+    public List<WgdWbxd> getAllWgdWbxds() {
+        return wgdWbxdDao.selectAll();
+    }
+
+    @Override
+    public List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd) {
+        return wgdWbxdDao.queryAll(wgdWbxd);
+    }
+
+    @Override
+    public WgdWbxd getWgdWbxdById(String id) {
+        return wgdWbxdDao.selectOne(id);
+    }
+
+    @Override
+    public int updateWgdWbxd(WgdWbxd wgdWbxd) {
+        return wgdWbxdDao.updateOne(wgdWbxd);
+    }
+
+    @Override
+    public int insertWgdWbxd(WgdWbxd wgdWbxd) {
+        wgdWbxd.setId(UUIDUtils.randomUUID(32));
+        return wgdWbxdDao.insertOne(wgdWbxd);
+    }
+
+    @Override
+    public int deleteWgdWbxd(String id) {
+        return wgdWbxdDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdWbxds(String ids) {
+        String[] str = ids.split(",");
+        return wgdWbxdDao.deleteBatch(str);
+    }
+}
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
new file mode 100644
index 00000000..7f29d37f
--- /dev/null
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java
@@ -0,0 +1,62 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+import com.adc.da.slrs.wgdCensusLeo.dao.WgdZcbDao;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计支出表 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public abstract class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements IWgdZcbService {
+    @Autowired
+    WgdZcbDao wgdZcbDao;
+
+    @Override
+    public List<WgdZcb> getAllWgdZcbs() {
+        return wgdZcbDao.selectAll();
+    }
+
+    @Override
+    public List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb) {
+        return wgdZcbDao.queryAll(wgdZcb);
+    }
+
+    @Override
+    public WgdZcb getWgdZcbById(String id) {
+        return wgdZcbDao.selectOne(id);
+    }
+
+    @Override
+    public int updateWgdZcb(WgdZcb wgdZcb) {
+        return wgdZcbDao.updateOne(wgdZcb);
+    }
+
+    @Override
+    public int insertWgdZcb(WgdZcb wgdZcb) {
+        wgdZcb.setId(UUIDUtils.randomUUID(32));
+        return wgdZcbDao.insertOne(wgdZcb);
+    }
+
+    @Override
+    public int deleteWgdZcb(String id) {
+        return wgdZcbDao.deleteOne(id);
+    }
+
+    @Override
+    public int deleteWgdZcbs(String ids) {
+        String[] str = ids.split(",");
+        return wgdZcbDao.deleteBatch(str);
+    }
+}
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
new file mode 100644
index 00000000..ec273d5f
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao">
+
+</mapper>
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
new file mode 100644
index 00000000..29b21b50
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao">
+
+</mapper>
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
new file mode 100644
index 00000000..4b18592a
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao">
+
+</mapper>
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
new file mode 100644
index 00000000..5cf1f0c7
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdWbtjDao">
+
+</mapper>
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
new file mode 100644
index 00000000..96b72f75
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdWbxdDao">
+
+</mapper>
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
new file mode 100644
index 00000000..f8c09d9e
--- /dev/null
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdZcbDao">
+
+</mapper>

From 303640aa27b5284bb6989a1a0a07ea5c83eebe7a Mon Sep 17 00:00:00 2001
From: liao <2948196353@qq.com>
Date: Mon, 15 Nov 2021 14:35:40 +0800
Subject: [PATCH 3/5] ~

---
 .../mapper/wgdCensusLeo/WgdCgfyMapper.xml     | 121 ++++++-
 .../mapper/wgdCensusLeo/WgdFyfyMapper.xml     | 132 +++++++-
 .../mapper/wgdCensusLeo/WgdSrbMapper.xml      | 122 +++++++
 .../mapper/wgdCensusLeo/WgdWbtjMapper.xml     | 216 +++++++++++-
 .../mapper/wgdCensusLeo/WgdWbxdMapper.xml     | 311 ++++++++++++++++++
 .../mapper/wgdCensusLeo/WgdZcbMapper.xml      | 112 ++++++-
 6 files changed, 1010 insertions(+), 4 deletions(-)

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 ec273d5f..0355c78d 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
@@ -1,5 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao">
-
+    <!--    基础信息-->
+    <sql id="BaseInfo">
+        id,type,number,name,pages,cost
+    </sql>
+    <!--    查询条件-->
+    <sql id="Conditions">
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="type != null and type != ''">
+                and type like concat('%',#{type},'%')
+            </if>
+            <if test="number != null and number != ''">
+                and number like concat('%',#{number},'%')
+            </if>
+            <if test="name != null and name != ''">
+                and name like concat('%',#{name},'%')
+            </if>
+            <if test="pages != null and pages != ''">
+                and pages = #{pages}
+            </if>
+            <if test="cost != null and cost != ''">
+                and cost = #{cost}
+            </if>
+        </where>
+    </sql>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
+        select <include refid="BaseInfo"></include> from wgd_cgfy
+    </select>
+    <!--    多条件查询-->
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
+        select <include refid="BaseInfo"></include> from wgd_cgfy
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询详情-->
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
+        select <include refid="BaseInfo"></include> from wgd_cgfy
+        where id = #{id}
+    </select>
+    <!--    修改-->
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
+        update wgd_cgfy
+        <set>
+            <if test="type != null and type != ''">
+                type = #{type},
+            </if>
+            <if test="number != null and number != ''">
+                number = #{number},
+            </if>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="pages != null and pages != ''">
+                pages = #{pages},
+            </if>
+            <if test="cost != null and cost != ''">
+                cost = #{cost},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+    <!--    插入一条数据-->
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
+        insert into wgd_cgfy
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="type != null and type != ''">
+                type,
+            </if>
+            <if test="number != null and number != ''">
+                number,
+            </if>
+            <if test="name != null and name != ''">
+                name,
+            </if>
+            <if test="pages != null and pages != ''">
+                pages,
+            </if>
+            <if test="cost != null and cost != ''">
+                cost,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="type != null and type != ''">
+                #{type},
+            </if>
+            <if test="number != null and number != ''">
+                #{number},
+            </if>
+            <if test="name != null and name != ''">
+                #{name},
+            </if>
+            <if test="pages != null and pages != ''">
+                #{pages},
+            </if>
+            <if test="cost != null and cost != ''">
+                #{cost},
+            </if>
+        </trim>
+    </insert>
+    <!--    删除-->
+    <delete id="deleteOne" parameterType="java.lang.String">
+        delete from wgd_cgfy where id = #{id}
+    </delete>
+    <!--    批量删除-->
+    <delete id="deleteBatch" parameterType="java.lang.String">
+        delete from wgd_cgfy where id in
+        <foreach collection="array" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>
+
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 29b21b50..5785e9c6 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
@@ -1,5 +1,135 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao">
-
+    <!--    基础信息-->
+    <sql id="BaseInfo">
+        id,type,number,name,pages,cost,time
+    </sql>
+    <!--    查询条件-->
+    <sql id="Conditions">
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="type != null and type != ''">
+                and type like concat('%',#{type},'%')
+            </if>
+            <if test="number != null and number != ''">
+                and number like concat('%',#{number},'%')
+            </if>
+            <if test="name != null and name != ''">
+                and name like concat('%',#{name},'%')
+            </if>
+            <if test="pages != null and pages != ''">
+                and pages = #{pages}
+            </if>
+            <if test="cost != null and cost != ''">
+                and cost = #{cost}
+            </if>
+            <if test="time != null and time != ''">
+                and time = #{time}
+            </if>
+        </where>
+    </sql>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy">
+        select <include refid="BaseInfo"></include> from wgd_fyfy
+    </select>
+    <!--    多条件查询-->
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy">
+        select <include refid="BaseInfo"></include> from wgd_fyfy
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询详情-->
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy">
+        select <include refid="BaseInfo"></include> from wgd_fyfy
+        where id = #{id}
+    </select>
+    <!--    修改-->
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy">
+        update wgd_fyfy
+        <set>
+            <if test="type != null and type != ''">
+                type = #{type},
+            </if>
+            <if test="number != null and number != ''">
+                number = #{number},
+            </if>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="pages != null and pages != ''">
+                pages = #{pages},
+            </if>
+            <if test="cost != null and cost != ''">
+                cost = #{cost},
+            </if>
+            <if test="time != null and time != ''">
+                time = #{time},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+    <!--    插入一条数据-->
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy">
+        insert into wgd_fyfy
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="type != null and type != ''">
+                type,
+            </if>
+            <if test="number != null and number != ''">
+                number,
+            </if>
+            <if test="name != null and name != ''">
+                name,
+            </if>
+            <if test="pages != null and pages != ''">
+                pages,
+            </if>
+            <if test="cost != null and cost != ''">
+                cost,
+            </if>
+            <if test="time != null and time != ''">
+                time,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="type != null and type != ''">
+                #{type},
+            </if>
+            <if test="number != null and number != ''">
+                #{number},
+            </if>
+            <if test="name != null and name != ''">
+                #{name},
+            </if>
+            <if test="pages != null and pages != ''">
+                #{pages},
+            </if>
+            <if test="cost != null and cost != ''">
+                #{cost},
+            </if>
+            <if test="time != null and time != ''">
+                #{time},
+            </if>
+        </trim>
+    </insert>
+    <!--    删除-->
+    <delete id="deleteOne" parameterType="java.lang.String">
+        delete from wgd_fyfy where id = #{id}
+    </delete>
+    <!--    批量删除-->
+    <delete id="deleteBatch" parameterType="java.lang.String">
+        delete from wgd_fyfy where id in
+        <foreach collection="array" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>
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 4b18592a..b03f2d77 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
@@ -1,5 +1,127 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao">
+    <!--    基础信息-->
+    <sql id="BaseInfo">
+        id,name,number,source,cost,time
+    </sql>
+    <!--    查询条件-->
+    <sql id="Conditions">
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="name != null and name != ''">
+                and name like concat('%',#{name},'%')
+            </if>
+            <if test="number != null and number != ''">
+                and number like concat('%',#{number},'%')
+            </if>
+            
+            <if test="source != null and source != ''">
+                and source = #{source}
+            </if>
+            <if test="cost != null and cost != ''">
+                and cost = #{cost}
+            </if>
+            <if test="time != null and time != ''">
+                and time = #{time}
+            </if>
+        </where>
+    </sql>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb">
+        select <include refid="BaseInfo"></include> from wgd_srb
+    </select>
+    <!--    多条件查询-->
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb">
+        select <include refid="BaseInfo"></include> from wgd_srb
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询详情-->
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb">
+        select <include refid="BaseInfo"></include> from wgd_srb
+        where id = #{id}
+    </select>
+    <!--    修改-->
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb">
+        update wgd_srb
+        <set>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="number != null and number != ''">
+                number = #{number},
+            </if>
 
+            <if test="source != null and source != ''">
+                source = #{source},
+            </if>
+            <if test="cost != null and cost != ''">
+                cost = #{cost},
+            </if>
+            <if test="time != null and time != ''">
+                time = #{time},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+    <!--    插入一条数据-->
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb">
+        insert into wgd_srb
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="name != null and name != ''">
+                name,
+            </if>
+            <if test="number != null and number != ''">
+                number,
+            </if>
+
+            <if test="source != null and source != ''">
+                source,
+            </if>
+            <if test="cost != null and cost != ''">
+                cost,
+            </if>
+            <if test="time != null and time != ''">
+                time,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="name != null and name != ''">
+                #{name},
+            </if>
+            <if test="number != null and number != ''">
+                #{number},
+            </if>
+
+            <if test="source != null and source != ''">
+                #{source},
+            </if>
+            <if test="cost != null and cost != ''">
+                #{cost},
+            </if>
+            <if test="time != null and time != ''">
+                #{time},
+            </if>
+        </trim>
+    </insert>
+    <!--    删除-->
+    <delete id="deleteOne" parameterType="java.lang.String">
+        delete from wgd_srb where id = #{id}
+    </delete>
+    <!--    批量删除-->
+    <delete id="deleteBatch" parameterType="java.lang.String">
+        delete from wgd_srb where id in
+        <foreach collection="array" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>
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 5cf1f0c7..bb9deeca 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
@@ -1,5 +1,219 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdWbtjDao">
-
+    <!--    基础信息-->
+    <sql id="BaseInfo">
+        id,host,meeting,time,place,contributions,occurs,expenses,user,leadership,participants,information,recording,Issues
+    </sql>
+    <!--    查询条件-->
+    <sql id="Conditions">
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="host != null and host != ''">
+                and host like concat('%',#{host},'%')
+            </if>
+            <if test="meeting != null and meeting != ''">
+                and meeting like concat('%',#{meeting},'%')
+            </if>
+            <if test="time != null and time != ''">
+                and time like concat('%',#{time},'%')
+            </if>
+            <if test="place != null and place != ''">
+                and place = #{place}
+            </if>
+            <if test="contributions != null and contributions != ''">
+                and contributions = #{contributions}
+            </if>
+            <if test="occurs != null and occurs != ''">
+                and occurs = #{occurs}
+            </if>
+            <if test="expenses != null and expenses != ''">
+                and expenses = #{expenses}
+            </if>
+            <if test="user != null and user != ''">
+                and user = #{user}
+            </if>
+            <if test="leadership != null and leadership != ''">
+                and leadership = #{leadership}
+            </if>
+            <if test="participants != null and participants != ''">
+                and participants = #{participants}
+            </if>
+            <if test="information != null and information != ''">
+                and information = #{information}
+            </if>
+            <if test="recording != null and recording != ''">
+                and recording = #{recording}
+            </if>
+            <if test="Issues != null and Issues != ''">
+                and Issues = #{Issues}
+            </if>
+        </where>
+    </sql>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj">
+        select <include refid="BaseInfo"></include> from wgd_wbtj
+    </select>
+    <!--    多条件查询-->
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj">
+        select <include refid="BaseInfo"></include> from wgd_wbtj
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询详情-->
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj">
+        select <include refid="BaseInfo"></include> from wgd_wbtj
+        where id = #{id}
+    </select>
+    <!--    修改-->
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj">
+        update wgd_wbtj
+        <set>
+            <if test="host != null and host != ''">
+                host = #{host},
+            </if>
+            <if test="meeting != null and meeting != ''">
+                meeting = #{meeting},
+            </if>
+            <if test="time != null and time != ''">
+                time = #{time},
+            </if>
+            <if test="place != null and place != ''">
+                place = #{place},
+            </if>
+            <if test="contributions != null and contributions != ''">
+                contributions = #{contributions},
+            </if>
+            <if test="occurs != null and occurs != ''">
+                occurs = #{occurs},
+            </if>
+            <if test="expenses != null and expenses != ''">
+                expenses = #{expenses},
+            </if>
+            <if test="user != null and user != ''">
+                user = #{user},
+            </if>
+            <if test="leadership != null and leadership != ''">
+                leadership = #{leadership},
+            </if>
+            <if test="participants != null and participants != ''">
+                participants = #{participants},
+            </if>
+            <if test="information != null and information != ''">
+                information = #{information},
+            </if>
+            <if test="recording != null and recording != ''">
+                recording = #{recording},
+            </if>
+            <if test="Issues != null and Issues != ''">
+                Issues = #{Issues},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+    <!--    插入一条数据-->
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj">
+        insert into wgd_wbtj
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="host != null and host != ''">
+                host,
+            </if>
+            <if test="meeting != null and meeting != ''">
+                meeting,
+            </if>
+            <if test="time != null and time != ''">
+                time,
+            </if>
+            <if test="place != null and place != ''">
+                place,
+            </if>
+            <if test="contributions != null and contributions != ''">
+                contributions,
+            </if>
+            <if test="occurs != null and occurs != ''">
+                occurs,
+            </if>
+            <if test="expenses != null and expenses != ''">
+                expenses,
+            </if>
+            <if test="user != null and user != ''">
+                user,
+            </if>
+            <if test="leadership != null and leadership != ''">
+                leadership,
+            </if>
+            <if test="participants != null and participants != ''">
+                participants,
+            </if>
+            <if test="information != null and information != ''">
+                information,
+            </if>
+            <if test="recording != null and recording != ''">
+                recording,
+            </if>
+            <if test="Issues != null and Issues != ''">
+                Issues,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="host != null and host != ''">
+                #{host},
+            </if>
+            <if test="meeting != null and meeting != ''">
+                #{meeting},
+            </if>
+            <if test="time != null and time != ''">
+                #{time},
+            </if>
+            <if test="place != null and place != ''">
+                #{place},
+            </if>
+            <if test="contributions != null and contributions != ''">
+                #{contributions},
+            </if>
+            <if test="occurs != null and occurs != ''">
+                #{occurs},
+            </if>
+            <if test="expenses != null and expenses != ''">
+                #{expenses},
+            </if>
+            <if test="user != null and user != ''">
+                #{user},
+            </if>
+            <if test="leadership != null and leadership != ''">
+                #{leadership},
+            </if>
+            <if test="participants != null and participants != ''">
+                #{participants},
+            </if>
+            <if test="information != null and information != ''">
+                #{information},
+            </if>
+            <if test="recording != null and recording != ''">
+                #{recording},
+            </if>
+            <if test="Issues != null and Issues != ''">
+                #{Issues},
+            </if>
+        </trim>
+    </insert>
+    <!--    删除-->
+    <delete id="deleteOne" parameterType="java.lang.String">
+        delete from wgd_wbtj where id = #{id}
+    </delete>
+    <!--    批量删除-->
+    <delete id="deleteBatch" parameterType="java.lang.String">
+        delete from wgd_wbtj where id in
+        <foreach collection="array" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>
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 96b72f75..fbfc54a7 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
@@ -1,5 +1,316 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdWbxdDao">
+    <!--    基础信息-->
+    <sql id="BaseInfo">
+        id,stage,number,name,project_id,project_name,type,preside,data_start,data_implement,body,drafting,data_record,report,participants,celebrity,cost_marking,cost_other,revised,status,signature,remark
+    </sql>
+    <!--    查询条件-->
+    <sql id="Conditions">
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="stage != null and stage != ''">
+                and stage like concat('%',#{stage},'%')
+            </if>
+            <if test="number != null and number != ''">
+                and number like concat('%',#{number},'%')
+            </if>
+            <if test="name != null and name != ''">
+                and name like concat('%',#{name},'%')
+            </if>
+            <if test="project_id != null and project_id != ''">
+                and project_id = #{project_id}
+            </if>
+            <if test="project_name != null and project_name != ''">
+                and project_name = #{project_name}
+            </if>
+            <if test="type != null and type != ''">
+                and type = #{type}
+            </if>
+            <if test="preside != null and preside != ''">
+                and preside = #{preside}
+            </if>
+            <if test="data_start != null and data_start != ''">
+                and data_start = #{data_start}
+            </if>
+            <if test="data_implement != null and data_implement != ''">
+                and data_implement = #{data_implement}
+            </if>
+            <if test="body != null and body != ''">
+                and body = #{body}
+            </if>
+            <if test="drafting != null and drafting != ''">
+                and drafting = #{drafting}
+            </if>
+            <if test="data_record != null and data_record != ''">
+                and data_record = #{data_record}
+            </if>
+            <if test="report != null and report != ''">
+                and report = #{report}
+            </if>
+            <if test="participants != null and participants != ''">
+                and participants = #{participants}
+            </if>
+            <if test="celebrity != null and celebrity != ''">
+                and celebrity = #{celebrity}
+            </if>
+            <if test="cost_marking != null and cost_marking != ''">
+                and cost_marking = #{cost_marking}
+            </if>
+            <if test="cost_other != null and cost_other != ''">
+                and cost_other = #{cost_other}
+            </if>
+            <if test="revised != null and revised != ''">
+                and revised = #{revised}
+            </if>
+            <if test="status != null and status != ''">
+                and status = #{status}
+            </if>
+            <if test="signature != null and signature != ''">
+                and signature = #{signature}
+            </if>
+            <if test="remark != null and remark != ''">
+                and remark = #{remark}
+            </if>
+        </where>
+    </sql>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd">
+        select <include refid="BaseInfo"></include> from wgd_wbxd
+    </select>
+    <!--    多条件查询-->
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd">
+        select <include refid="BaseInfo"></include> from wgd_wbxd
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询详情-->
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd">
+        select <include refid="BaseInfo"></include> from wgd_wbxd
+        where id = #{id}
+    </select>
+    <!--    修改-->
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd">
+        update wgd_wbxd
+        <set>
+            <if test="stage != null and stage != ''">
+                stage = #{stage},
+            </if>
+            <if test="number != null and number != ''">
+                number = #{number},
+            </if>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="project_id != null and project_id != ''">
+                project_id = #{project_id},
+            </if>
+            <if test="project_name != null and project_name != ''">
+                project_name = #{project_name},
+            </if>
+            <if test="type != null and type != ''">
+                type = #{type},
+            </if>
+            <if test="preside != null and preside != ''">
+                preside = #{preside},
+            </if>
+            <if test="data_start != null and data_start != ''">
+                data_start = #{data_start},
+            </if>
+            <if test="data_implement != null and data_implement != ''">
+                data_implement = #{data_implement},
+            </if>
+            <if test="body != null and body != ''">
+                body = #{body},
+            </if>
+            <if test="drafting != null and drafting != ''">
+                drafting = #{drafting},
+            </if>
+            <if test="data_record != null and data_record != ''">
+                data_record = #{data_record},
+            </if>
+            <if test="report != null and report != ''">
+                report = #{report},
+            </if>
+            <if test="participants != null and participants != ''">
+                participants = #{participants},
+            </if>
+            <if test="celebrity != null and celebrity != ''">
+                celebrity = #{celebrity},
+            </if>
+            <if test="cost_marking != null and cost_marking != ''">
+                cost_marking = #{cost_marking},
+            </if>
+            <if test="cost_other != null and cost_other != ''">
+                cost_other = #{cost_other},
+            </if>
+            <if test="revised != null and revised != ''">
+                revised = #{revised},
+            </if>
+            <if test="status != null and status != ''">
+                status = #{status},
+            </if>
+            <if test="signature != null and signature != ''">
+                signature = #{signature},
+            </if>
+            <if test="remark != null and remark != ''">
+                remark = #{remark},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+    <!--    插入一条数据-->
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd">
+        insert into wgd_wbxd
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="stage != null and stage != ''">
+                stage,
+            </if>
+            <if test="number != null and number != ''">
+                number,
+            </if>
+            <if test="name != null and name != ''">
+                name,
+            </if>
+            <if test="project_id != null and project_id != ''">
+                project_id,
+            </if>
+            <if test="project_name != null and project_name != ''">
+                project_name,
+            </if>
+            <if test="type != null and type != ''">
+                type,
+            </if>
+            <if test="preside != null and preside != ''">
+                preside,
+            </if>
+            <if test="data_start != null and data_start != ''">
+                data_start,
+            </if>
+            <if test="data_implement != null and data_implement != ''">
+                data_implement,
+            </if>
+            <if test="body != null and body != ''">
+                body,
+            </if>
+            <if test="drafting != null and drafting != ''">
+                drafting,
+            </if>
+            <if test="data_record != null and data_record != ''">
+                data_record,
+            </if>
+            <if test="report != null and report != ''">
+                report,
+            </if>
+            <if test="participants != null and participants != ''">
+                participants,
+            </if>
+            <if test="celebrity != null and celebrity != ''">
+                celebrity,
+            </if>
+            <if test="cost_marking != null and cost_marking != ''">
+                cost_marking,
+            </if>
+            <if test="cost_other != null and cost_other != ''">
+                cost_other,
+            </if>
+            <if test="revised != null and revised != ''">
+                revised,
+            </if>
+            <if test="status != null and status != ''">
+                status,
+            </if>
+            <if test="signature != null and signature != ''">
+                signature,
+            </if>
+            <if test="remark != null and remark != ''">
+                remark,
+            </if>
 
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="stage != null and stage != ''">
+                #{stage},
+            </if>
+            <if test="number != null and number != ''">
+                #{number},
+            </if>
+            <if test="name != null and name != ''">
+                #{name},
+            </if>
+            <if test="project_id != null and project_id != ''">
+                #{project_id},
+            </if>
+            <if test="project_name != null and project_name != ''">
+                #{project_name},
+            </if>
+            <if test="type != null and type != ''">
+                #{type},
+            </if>
+            <if test="preside != null and preside != ''">
+                #{preside},
+            </if>
+            <if test="data_start != null and data_start != ''">
+                #{data_start},
+            </if>
+            <if test="data_implement != null and data_implement != ''">
+                #{data_implement},
+            </if>
+            <if test="body != null and body != ''">
+                #{body},
+            </if>
+            <if test="drafting != null and drafting != ''">
+                #{drafting},
+            </if>
+            <if test="data_record != null and data_record != ''">
+                #{data_record},
+            </if>
+            <if test="report != null and report != ''">
+                #{report},
+            </if>
+            <if test="participants != null and participants != ''">
+                #{participants},
+            </if>
+            <if test="celebrity != null and celebrity != ''">
+                #{celebrity},
+            </if>
+            <if test="cost_marking != null and cost_marking != ''">
+                #{cost_marking},
+            </if>
+            <if test="cost_other != null and cost_other != ''">
+                #{cost_other},
+            </if>
+            <if test="revised != null and revised != ''">
+                #{revised},
+            </if>
+            <if test="status != null and status != ''">
+                #{status},
+            </if>
+            <if test="signature != null and signature != ''">
+                #{signature},
+            </if>
+            <if test="remark != null and remark != ''">
+                #{remark},
+            </if>
+        </trim>
+    </insert>
+    <!--    删除-->
+    <delete id="deleteOne" parameterType="java.lang.String">
+        delete from wgd_wbxd where id = #{id}
+    </delete>
+    <!--    批量删除-->
+    <delete id="deleteBatch" parameterType="java.lang.String">
+        delete from wgd_wbxd where id in
+        <foreach collection="array" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>
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 f8c09d9e..ad2b80ea 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
@@ -1,5 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdZcbDao">
-
+    <!--    基础信息-->
+    <sql id="BaseInfo">
+        id,name,cost,use,annex
+    </sql>
+    <!--    查询条件-->
+    <sql id="Conditions">
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="name != null and name != ''">
+                and name like concat('%',#{name},'%')
+            </if>
+            <if test="cost != null and cost != ''">
+                and cost like concat('%',#{cost},'%')
+            </if>
+            <if test="use != null and use != ''">
+                and use like concat('%',#{use},'%')
+            </if>
+            <if test="annex != null and annex != ''">
+                and annex = #{annex}
+            </if>
+            
+        </where>
+    </sql>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb">
+        select <include refid="BaseInfo"></include> from wgd_zcb
+    </select>
+    <!--    多条件查询-->
+    <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb">
+        select <include refid="BaseInfo"></include> from wgd_zcb
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询详情-->
+    <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb">
+        select <include refid="BaseInfo"></include> from wgd_zcb
+        where id = #{id}
+    </select>
+    <!--    修改-->
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb">
+        update wgd_zcb
+        <set>
+            <if test="name != null and name != ''">
+                name = #{name},
+            </if>
+            <if test="cost != null and cost != ''">
+                cost = #{cost},
+            </if>
+            <if test="use != null and use != ''">
+                use = #{use},
+            </if>
+            <if test="annex != null and annex != ''">
+                annex = #{annex},
+            </if>
+            
+        </set>
+        where id = #{id}
+    </update>
+    <!--    插入一条数据-->
+    <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb">
+        insert into wgd_zcb
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="name != null and name != ''">
+                name,
+            </if>
+            <if test="cost != null and cost != ''">
+                cost,
+            </if>
+            <if test="use != null and use != ''">
+                use,
+            </if>
+            <if test="annex != null and annex != ''">
+                annex,
+            </if>
+            
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="name != null and name != ''">
+                #{name},
+            </if>
+            <if test="cost != null and cost != ''">
+                #{cost},
+            </if>
+            <if test="use != null and use != ''">
+                #{use},
+            </if>
+            <if test="annex != null and annex != ''">
+                #{annex},
+            </if>
+            
+        </trim>
+    </insert>
+    <!--    删除-->
+    <delete id="deleteOne" parameterType="java.lang.String">
+        delete from wgd_zcb where id = #{id}
+    </delete>
+    <!--    批量删除-->
+    <delete id="deleteBatch" parameterType="java.lang.String">
+        delete from wgd_zcb where id in
+        <foreach collection="array" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

From a5d0745aa095705eb79746967bddfa8a28c68ab7 Mon Sep 17 00:00:00 2001
From: Kevin <tjpu626@163.com>
Date: Tue, 16 Nov 2021 09:17:06 +0800
Subject: [PATCH 4/5] =?UTF-8?q?zcr:=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EsRevisePlanController.java    |  11 +-
 .../esRevisePlan/dao/EsRevisePlanDao.java     |   4 +-
 .../esRevisePlan/entity/EsRevisePlan.java     |   3 +-
 .../service/IEsRevisePlanService.java         |   2 +-
 .../service/impl/EsRevisePlanServiceImpl.java |  12 +-
 .../controller/WgdAssocCostController.java    |  21 +-
 .../controller/WgdAssocInfoController.java    |  33 +--
 .../controller/WgdCommiInfoController.java    |  33 +--
 .../controller/WgdExReviseCostController.java |  33 +--
 .../controller/WgdMeetCostController.java     |  33 +--
 .../slrs/wgdCensusZ/dao/WgdAssocCostDao.java  |   7 +-
 .../slrs/wgdCensusZ/dao/WgdAssocInfoDao.java  |   3 +-
 .../slrs/wgdCensusZ/dao/WgdCommiInfoDao.java  |   2 +
 .../wgdCensusZ/dao/WgdExReviseCostDao.java    |   2 +
 .../slrs/wgdCensusZ/dao/WgdMeetCostDao.java   |   2 +
 .../slrs/wgdCensusZ/entity/WgdAssocCost.java  |   3 +-
 .../slrs/wgdCensusZ/entity/WgdAssocInfo.java  |   3 +-
 .../slrs/wgdCensusZ/entity/WgdCommiInfo.java  |   3 +-
 .../wgdCensusZ/entity/WgdExReviseCost.java    |   3 +-
 .../slrs/wgdCensusZ/entity/WgdMeetCost.java   |   3 +-
 .../service/IWgdAssocCostService.java         |   4 +-
 .../service/impl/WgdAssocCostServiceImpl.java |  14 +-
 .../service/impl/WgdAssocInfoServiceImpl.java |   2 +
 .../service/impl/WgdCommiInfoServiceImpl.java |   3 +
 .../impl/WgdExReviseCostServiceImpl.java      |   2 +
 .../service/impl/WgdMeetCostServiceImpl.java  |   2 +
 .../esRevisePlan/EsRevisePlanMapper.xml       |  22 +-
 .../mapper/wgdCensusZ/WgdAssocCostMapper.xml  |  15 ++
 .../mapper/wgdCensusZ/WgdAssocInfoMapper.xml  |  14 +-
 .../mapper/wgdCensusZ/WgdCommiInfoMapper.xml  | 217 +++++++++++++++++-
 .../wgdCensusZ/WgdExReviseCostMapper.xml      | 101 +++++++-
 .../mapper/wgdCensusZ/WgdMeetCostMapper.xml   | 113 ++++++++-
 32 files changed, 622 insertions(+), 103 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
index e179e933..63852873 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.esRevisePlan.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
@@ -31,14 +32,18 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
 
     @ApiOperation(value = "获取所有企标计划")
     @GetMapping("getAllPlans")
-    public ResponseMessage<Object> getAllPlans(){
-        return Result.success(iEsRevisePlanService.getAllPlans());
+    public ResponseMessage<Object> getAllPlans(EsRevisePlan esRevisePlan){
+        List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.getAllPlans(esRevisePlan);
+        PageInfo<EsRevisePlan> pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans);
+        return Result.success(pageInfo);
     }
 
     @ApiOperation(value = "多条件查询企标计划")
     @PostMapping("queryAllPlans")
     public ResponseMessage<Object> queryAllPlans(EsRevisePlan esRevisePlan){
-        return Result.success(iEsRevisePlanService.queryAllPlans(esRevisePlan));
+        List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.queryAllPlans(esRevisePlan);
+        PageInfo<EsRevisePlan> pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans);
+        return Result.success(pageInfo);
     }
 
     @ApiOperation(value = "获取单个企标计划详情")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java
index fd735200..dee08a19 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java
@@ -15,7 +15,9 @@ import java.util.List;
  * @since 2021-11-14
  */
 public interface EsRevisePlanDao extends BaseMapper<EsRevisePlan> {
-    List<EsRevisePlan> selectAll();//查询所有
+    Integer getTotal();
+    Integer getQueryTotal(EsRevisePlan esRevisePlan);
+    List<EsRevisePlan> selectAll(EsRevisePlan esRevisePlan);//查询所有
     List<EsRevisePlan> queryAll(EsRevisePlan esRevisePlan);//多条件查询
     EsRevisePlan selectOne(String id);//查询详情
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
index 5f2b2a39..93cfa32f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.esRevisePlan.entity;
 
 import java.util.Date;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="EsRevisePlan对象", description="企标制修订计划")
-public class EsRevisePlan{
+public class EsRevisePlan extends BasePage {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
index bf8c6239..cc5eab90 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java
@@ -14,7 +14,7 @@ import java.util.List;
  * @since 2021-11-14
  */
 public interface IEsRevisePlanService extends IService<EsRevisePlan> {
-    List<EsRevisePlan> getAllPlans();//查询所有
+    List<EsRevisePlan> getAllPlans(EsRevisePlan esRevisePlan);//查询所有
     List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询
     EsRevisePlan getOnePlan(String id);//查询详情
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
index 31942a44..0e7a4ade 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java
@@ -25,13 +25,19 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     EsRevisePlanDao esRevisePlanDao;
 
     @Override
-    public List<EsRevisePlan> getAllPlans() {
-        return esRevisePlanDao.selectAll();
+    public List<EsRevisePlan> getAllPlans(EsRevisePlan esRevisePlan) {
+        Integer count = esRevisePlanDao.getTotal();
+        esRevisePlan.getPager().setRowCount(count);
+        List<EsRevisePlan> esRevisePlans = esRevisePlanDao.selectAll(esRevisePlan);
+        return esRevisePlans;
     }
 
     @Override
     public List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan) {
-        return esRevisePlanDao.queryAll(esRevisePlan);
+        Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
+        esRevisePlan.getPager().setRowCount(count);
+        List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan);
+        return esRevisePlans;
     }
 
     @Override
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 2a4cae2c..8b2563c1 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
@@ -1,10 +1,14 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
@@ -29,36 +33,47 @@ public class WgdAssocCostController extends BaseController<WgdAssocCost> {
     @Autowired
     IWgdAssocCostService iWgdAssocCostService;
 
+    @ApiOperation("查询所有信息")
     @GetMapping("getAllAssocCosts")
-    public ResponseMessage<Object> getAllWgdAssocCosts(){//查询所有
-        return Result.success(iWgdAssocCostService.getAllWgdAssocCosts());
+    public ResponseMessage<Object> getAllWgdAssocCosts(WgdAssocCost page){//查询所有
+        List<WgdAssocCost> wgdAssocCosts = iWgdAssocCostService.getAllWgdAssocCosts(page);
+        PageInfo<WgdAssocCost> pageInfo = getPageInfo(page.getPager(), wgdAssocCosts);
+        return Result.success(pageInfo);
     }
 
+    @ApiOperation("多条件查询")
     @PostMapping("queryAllAssocCosts")
     public ResponseMessage<Object> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询
-        return Result.success(iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost));
+        List<WgdAssocCost> wgdAssocCosts = iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost);
+        PageInfo<WgdAssocCost> pageInfo = getPageInfo(wgdAssocCost.getPager(), wgdAssocCosts);
+        return Result.success(pageInfo);
     }
 
+    @ApiOperation("查询详情")
     @GetMapping("getAssocCostById")
     public ResponseMessage<Object> getWgdAssocCostById(String id) {//查询详情
         return Result.success(iWgdAssocCostService.getWgdAssocCostById(id));
     }
 
+    @ApiOperation("编辑")
     @PostMapping("modAssocCost")
     ResponseMessage<Object> updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑
         return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost));
     }
 
+    @ApiOperation("插入")
     @PostMapping("addAssocCost")
     ResponseMessage<Object> insertWgdAssocCost(WgdAssocCost wgdAssocCost) {//插入
         return Result.success(iWgdAssocCostService.insertWgdAssocCost(wgdAssocCost));
     }
 
+    @ApiOperation("删除")
     @GetMapping("delAssocCost")
     ResponseMessage<Object> deleteWgdAssocCost(String id){//删除
         return Result.success(iWgdAssocCostService.deleteWgdAssocCost(id));
     }
 
+    @ApiOperation("批量删除")
     @GetMapping("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 2a3b53e4..0823966b 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
@@ -1,6 +1,9 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,37 +32,39 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
     IWgdAssocInfoService iWgdAssocInfoService;
 
     @GetMapping("getAllAssocInfos")
-    public List<WgdAssocInfo> getAllWgdAssocInfos(){//查询所有
-        return iWgdAssocInfoService.getAllWgdAssocInfos();
+    public ResponseMessage<Object> getAllWgdAssocInfos(){//查询所有
+        return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos());
     }
 
     @PostMapping("queryAllAssocInfos")
-    public List<WgdAssocInfo> queryAllWgdAssocInfos(WgdAssocInfo WgdAssocInfo){//多条件查询
-        return iWgdAssocInfoService.queryAllWgdAssocInfos(WgdAssocInfo);
+    public ResponseMessage<Object> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询
+        List<WgdAssocInfo> wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo);
+        PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getAssocInfoById")
-    public WgdAssocInfo getWgdAssocInfoById(String id) {//查询详情
-        return iWgdAssocInfoService.getWgdAssocInfoById(id);
+    public ResponseMessage<Object> getWgdAssocInfoById(String id) {//查询详情
+        return Result.success(iWgdAssocInfoService.getWgdAssocInfoById(id));
     }
 
     @PostMapping("modAssocInfo")
-    int updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑
-        return iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo);
+    ResponseMessage<Object> updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑
+        return Result.success(iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo));
     }
 
     @PostMapping("addAssocInfo")
-    int insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入
-        return iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo);
+    ResponseMessage<Object> insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入
+        return Result.success(iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo));
     }
 
     @GetMapping("delAssocInfo")
-    int deleteWgdAssocInfo(String id){//删除
-        return iWgdAssocInfoService.deleteWgdAssocInfo(id);
+    ResponseMessage<Object> deleteWgdAssocInfo(String id){//删除
+        return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id));
     }
 
     @GetMapping("delAssocInfos")
-    int deleteWgdAssocInfos(String ids){//批量删除
-        return iWgdAssocInfoService.deleteWgdAssocInfos(ids);
+    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 a1440258..b3df81d3 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
@@ -1,6 +1,9 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+import com.adc.da.http.PageInfo;
+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 org.springframework.beans.factory.annotation.Autowired;
@@ -29,37 +32,39 @@ public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
     IWgdCommiInfoService iWgdCommiInfoService;
 
     @GetMapping("getAllCommiInfos")
-    public List<WgdCommiInfo> getAllWgdCommiInfos(){//查询所有
-        return iWgdCommiInfoService.getAllWgdCommiInfos();
+    public ResponseMessage<Object> getAllWgdCommiInfos(){//查询所有
+        return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos());
     }
 
     @PostMapping("queryAllCommiInfos")
-    public List<WgdCommiInfo> queryAllWgdCommiInfos(WgdCommiInfo WgdCommiInfo){//多条件查询
-        return iWgdCommiInfoService.queryAllWgdCommiInfos(WgdCommiInfo);
+    public ResponseMessage<Object> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询
+        List<WgdCommiInfo> wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo);
+        PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getCommiInfoById")
-    public WgdCommiInfo getWgdCommiInfoById(String id) {//查询详情
-        return iWgdCommiInfoService.getWgdCommiInfoById(id);
+    public ResponseMessage<Object> getWgdCommiInfoById(String id) {//查询详情
+        return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id));
     }
 
     @PostMapping("modCommiInfo")
-    int updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
-        return iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo);
+    ResponseMessage<Object> updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
+        return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo));
     }
 
     @PostMapping("addCommiInfo")
-    int insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
-        return iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo);
+    ResponseMessage<Object> insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
+        return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo));
     }
 
     @GetMapping("delCommiInfo")
-    int deleteWgdCommiInfo(String id){//删除
-        return iWgdCommiInfoService.deleteWgdCommiInfo(id);
+    ResponseMessage<Object> deleteWgdCommiInfo(String id){//删除
+        return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id));
     }
 
     @GetMapping("delCommiInfos")
-    int deleteWgdCommiInfos(String ids){//批量删除
-        return iWgdCommiInfoService.deleteWgdCommiInfos(ids);
+    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 423f5c7b..b76d0ab5 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
@@ -1,6 +1,9 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+import com.adc.da.http.PageInfo;
+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 org.springframework.beans.factory.annotation.Autowired;
@@ -29,37 +32,39 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
     IWgdExReviseCostService iWgdExReviseCostService;
 
     @GetMapping("getAllExReviseCosts")
-    public List<WgdExReviseCost> getAllWgdExReviseCosts(){//查询所有
-        return iWgdExReviseCostService.getAllWgdExReviseCosts();
+    public ResponseMessage<Object> getAllWgdExReviseCosts(){//查询所有
+        return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts());
     }
 
     @PostMapping("queryAllExReviseCosts")
-    public List<WgdExReviseCost> queryAllWgdExReviseCosts(WgdExReviseCost WgdExReviseCost){//多条件查询
-        return iWgdExReviseCostService.queryAllWgdExReviseCosts(WgdExReviseCost);
+    public ResponseMessage<Object> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询
+        List<WgdExReviseCost> wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost);
+        PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getExReviseCostById")
-    public WgdExReviseCost getWgdExReviseCostById(String id) {//查询详情
-        return iWgdExReviseCostService.getWgdExReviseCostById(id);
+    public ResponseMessage<Object> getWgdExReviseCostById(String id) {//查询详情
+        return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id));
     }
 
     @PostMapping("modExReviseCost")
-    int updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
-        return iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost);
+    ResponseMessage<Object> updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
+        return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost));
     }
 
     @PostMapping("addExReviseCost")
-    int insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入
-        return iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost);
+    ResponseMessage<Object> insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入
+        return Result.success(iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost));
     }
 
     @GetMapping("delExReviseCost")
-    int deleteWgdExReviseCost(String id){//删除
-        return iWgdExReviseCostService.deleteWgdExReviseCost(id);
+    ResponseMessage<Object> deleteWgdExReviseCost(String id){//删除
+        return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id));
     }
 
     @GetMapping("delExReviseCosts")
-    int deleteWgdExReviseCosts(String ids){//批量删除
-        return iWgdExReviseCostService.deleteWgdExReviseCosts(ids);
+    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 595b993a..449692a3 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
@@ -1,6 +1,9 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+import com.adc.da.http.PageInfo;
+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 org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +14,6 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
-import java.util.List;
 
 /**
 * <p>
@@ -29,37 +31,38 @@ public class WgdMeetCostController extends BaseController<WgdMeetCost> {
     IWgdMeetCostService iWgdMeetCostService;
 
     @GetMapping("getAllMeetCosts")
-    public List<WgdMeetCost> getAllWgdMeetCosts(){//查询所有
-        return iWgdMeetCostService.getAllWgdMeetCosts();
+    public ResponseMessage<Object> getAllWgdMeetCosts(){//查询所有
+        return Result.success(iWgdMeetCostService.getAllWgdMeetCosts());
     }
 
     @PostMapping("queryAllMeetCosts")
-    public List<WgdMeetCost> queryAllWgdMeetCosts(WgdMeetCost WgdMeetCost){//多条件查询
-        return iWgdMeetCostService.queryAllWgdMeetCosts(WgdMeetCost);
+    public ResponseMessage<Object> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询
+        PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost));
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getMeetCostById")
-    public WgdMeetCost getWgdMeetCostById(String id) {//查询详情
-        return iWgdMeetCostService.getWgdMeetCostById(id);
+    public ResponseMessage<Object> getWgdMeetCostById(String id) {//查询详情
+        return Result.success(iWgdMeetCostService.getWgdMeetCostById(id));
     }
 
     @PostMapping("modMeetCost")
-    int updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
-        return iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost);
+    ResponseMessage<Object> updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
+        return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost));
     }
 
     @PostMapping("addMeetCost")
-    int insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入
-        return iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost);
+    ResponseMessage<Object> insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入
+        return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost));
     }
 
     @GetMapping("delMeetCost")
-    int deleteWgdMeetCost(String id){//删除
-        return iWgdMeetCostService.deleteWgdMeetCost(id);
+    ResponseMessage<Object> deleteWgdMeetCost(String id){//删除
+        return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id));
     }
 
     @GetMapping("delMeetCosts")
-    int deleteWgdMeetCosts(String ids){//批量删除
-        return iWgdMeetCostService.deleteWgdMeetCosts(ids);
+    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/WgdAssocCostDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java
index e5f25c50..e7b19e41 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java
@@ -3,6 +3,7 @@ package com.adc.da.slrs.wgdCensusZ.dao;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 import java.util.Map;
@@ -16,7 +17,9 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdAssocCostDao extends BaseMapper<WgdAssocCost> {
-    List<WgdAssocCost> selectAll();//查询所有
+    Integer getTotal();//总数
+    Integer getQueryTotal(WgdAssocCost wgdAssocCost);//总数
+    List<WgdAssocCost> selectAll(WgdAssocCost page);//查询所有
     List<WgdAssocCost> queryAll(WgdAssocCost wgdAssocCost);//多条件查询
     WgdAssocCost selectOne(String id);//查询详情
 
@@ -24,4 +27,6 @@ public interface WgdAssocCostDao extends BaseMapper<WgdAssocCost> {
     int insertOne(WgdAssocCost wgdAssocCost);//插入
     int deleteOne(String id);//删除
     int deleteBatch(String[] 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 1630539b..48431efb 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
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.dao;
 
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,7 +16,7 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdAssocInfoDao extends BaseMapper<WgdAssocInfo> {
-
+    Integer getQueryTotal(WgdAssocInfo WgdAssocInfo);//总数
     List<WgdAssocInfo> selectAll();//查询所有
     List<WgdAssocInfo> queryAll(WgdAssocInfo wgdAssocInfo);//多条件查询
     WgdAssocInfo selectOne(String id);//查询详情
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 d8833d51..36980275 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
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.dao;
 
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,7 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdCommiInfoDao extends BaseMapper<WgdCommiInfo> {
+    Integer getQueryTotal(WgdCommiInfo WgdCommiInfo);//总数
     List<WgdCommiInfo> selectAll();//查询所有
     List<WgdCommiInfo> queryAll(WgdCommiInfo wgdCommiInfo);//多条件查询
     WgdCommiInfo selectOne(String id);//查询详情
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 11ff1eb4..2d67546e 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
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.dao;
 
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,7 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdExReviseCostDao extends BaseMapper<WgdExReviseCost> {
+    Integer getQueryTotal(WgdExReviseCost WgdExReviseCost);//总数
     List<WgdExReviseCost> selectAll();//查询所有
     List<WgdExReviseCost> queryAll(WgdExReviseCost wgdExReviseCost);//多条件查询
     WgdExReviseCost selectOne(String id);//查询详情
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 a8b7f934..71610aa1 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
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.dao;
 
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,7 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdMeetCostDao extends BaseMapper<WgdMeetCost> {
+    Integer getQueryTotal(WgdMeetCost WgdMeetCost);//总数
     List<WgdMeetCost> selectAll();//查询所有
     List<WgdMeetCost> queryAll(WgdMeetCost wgdMeetCost);//多条件查询
     WgdMeetCost selectOne(String id);//查询详情
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java
index 923aa253..741601e9 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.entity;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,7 +17,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdAssocCost对象", description="协会费用信息统计")
-public class WgdAssocCost {
+public class WgdAssocCost extends BasePage {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java
index 7cf4c87c..76ccfa35 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusZ.entity;
 
 import java.util.Date;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计")
-public class WgdAssocInfo  {
+public class WgdAssocInfo extends BasePage {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java
index f8d4bd6c..40c6d61b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusZ.entity;
 
 import java.util.Date;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计")
-public class WgdCommiInfo {
+public class WgdCommiInfo extends BasePage {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java
index 56af460e..7181ba67 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java
@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.entity;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,7 +17,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计")
-public class WgdExReviseCost  {
+public class WgdExReviseCost extends BasePage {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java
index 9c6fbff3..7c3d3ca2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java
@@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusZ.entity;
 
 import java.util.Date;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdMeetCost对象", description="参会费用信息统计")
-public class WgdMeetCost {
+public class WgdMeetCost extends BasePage {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java
index 323fe734..361f468f 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java
@@ -2,6 +2,8 @@ package com.adc.da.slrs.wgdCensusZ.service;
 
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -15,7 +17,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdAssocCostService extends IService<WgdAssocCost> {
-    List<WgdAssocCost> getAllWgdAssocCosts();//查询所有
+    List<WgdAssocCost> getAllWgdAssocCosts(WgdAssocCost page);//查询所有
     List<WgdAssocCost> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost);//多条件查询
     WgdAssocCost getWgdAssocCostById(String id);//查询详情
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java
index 54fe553c..0fe20013 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java
@@ -4,6 +4,8 @@ import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService;
 import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,13 +28,19 @@ public class WgdAssocCostServiceImpl extends ServiceImpl<WgdAssocCostDao, WgdAss
     WgdAssocCostDao wgdAssocCostDao;
 
     @Override
-    public List<WgdAssocCost> getAllWgdAssocCosts() {
-        return wgdAssocCostDao.selectAll();
+    public List<WgdAssocCost> getAllWgdAssocCosts(WgdAssocCost page) {
+        Integer count = wgdAssocCostDao.getTotal();
+        page.getPager().setRowCount(count);
+        List<WgdAssocCost> wgdAssocCosts = wgdAssocCostDao.selectAll(page);
+        return wgdAssocCosts;
     }
 
     @Override
     public List<WgdAssocCost> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost) {
-        return wgdAssocCostDao.queryAll(wgdAssocCost);
+        Integer count = wgdAssocCostDao.getQueryTotal(wgdAssocCost);
+        wgdAssocCost.getPager().setRowCount(count);
+        List<WgdAssocCost> wgdAssocCosts = wgdAssocCostDao.queryAll(wgdAssocCost);
+        return wgdAssocCosts;
     }
 
     @Override
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 b4c2e382..a6bade22 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
@@ -31,6 +31,8 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl<WgdAssocInfoDao, WgdAss
 
     @Override
     public List<WgdAssocInfo> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo) {
+        Integer count = wgdAssocInfoDao.getQueryTotal(wgdAssocInfo);
+        wgdAssocInfo.getPager().setRowCount(count);
         return wgdAssocInfoDao.queryAll(wgdAssocInfo);
     }
 
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 3c1a8059..fbea8d2a 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
@@ -33,6 +33,8 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
 
     @Override
     public List<WgdCommiInfo> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo) {
+        Integer count = wgdCommiInfoDao.getQueryTotal(wgdCommiInfo);
+        wgdCommiInfo.getPager().setRowCount(count);
         return wgdCommiInfoDao.queryAll(wgdCommiInfo);
     }
 
@@ -43,6 +45,7 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
 
     @Override
     public int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo) {
+        wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword()));
         return wgdCommiInfoDao.updateOne(wgdCommiInfo);
     }
 
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 adc1198f..0e793911 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
@@ -33,6 +33,8 @@ public class WgdExReviseCostServiceImpl extends ServiceImpl<WgdExReviseCostDao,
 
     @Override
     public List<WgdExReviseCost> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost) {
+        Integer count = wgdExReviseCostDao.getQueryTotal(wgdExReviseCost);
+        wgdExReviseCost.getPager().setRowCount(count);
         return wgdExReviseCostDao.queryAll(wgdExReviseCost);
     }
 
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 ee98a8d0..f0124fa6 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
@@ -32,6 +32,8 @@ public class WgdMeetCostServiceImpl extends ServiceImpl<WgdMeetCostDao, WgdMeetC
 
     @Override
     public List<WgdMeetCost> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost) {
+        Integer count = wgdMeetCostDao.getQueryTotal(wgdMeetCost);
+        wgdMeetCost.getPager().setRowCount(count);
         return wgdMeetCostDao.queryAll(wgdMeetCost);
     }
 
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
index 6cea67c4..fbf42949 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.esRevisePlan.dao.EsRevisePlanDao">
+    <sql id="pages">
+        <if test=" null != pageSize  ">
+            LIMIT ${(page-1) * pageSize},${pageSize}
+        </if>
+    </sql>
     <!--    基础信息-->
     <sql id="BaseInfo">
         id,
@@ -29,9 +34,6 @@
     <!--    查询条件-->
     <sql id="Conditions">
         <where>
-            <if test="id != null and id != ''">
-                and id = #{id}
-            </if>
             <if test="esName != null and esName != ''">
                 and es_name like concat('%',#{esName},'%')
             </if>
@@ -61,14 +63,26 @@
             </if>
         </where>
     </sql>
+    <select id="getTotal" resultType="java.lang.Integer" >
+        select count(*) from es_revise_plan
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan" resultType="java.lang.Integer" >
+        select count(*) from es_revise_plan
+        <include refid="Conditions"></include>
+    </select>
     <!--    查询所有-->
     <select id="selectAll" resultMap="BaseInfoMap" >
         select <include refid="BaseInfo"></include> from es_revise_plan
+        <include refid="pages">
+        </include>
     </select>
     <!--    多条件查询-->
     <select id="queryAll" parameterType="com.adc.da.slrs.esRevisePlan.entity.EsRevisePlan" resultMap="BaseInfoMap">
         select <include refid="BaseInfo"></include> from es_revise_plan
-        <include refid="Conditions"></include>
+        <include refid="Conditions">
+        </include>
+        <include refid="pages">
+        </include>
     </select>
     <!--    查询详情-->
     <select id="selectOne" parameterType="java.lang.String" resultMap="BaseInfoMap">
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 aa3a16da..95207969 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
@@ -2,6 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao">
 
+    <sql id="pages">
+        <if test=" null != pageSize  ">
+            LIMIT ${(page-1) * pageSize},${pageSize}
+        </if>
+    </sql>
 <!--    基础信息-->
     <sql id="BaseInfo">
         id,sc_name,ssc_name,wg_name,pay_standard,pay_reality,cost_outlay,annual_payment
@@ -35,14 +40,24 @@
             </if>
         </where>
     </sql>
+
+    <select id="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_assoc_cost
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost" resultType="java.lang.Integer">
+        select count(*) from wgd_assoc_cost
+        <include refid="Conditions"></include>
+    </select>
 <!--    查询所有-->
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost">
         select <include refid="BaseInfo"></include> from wgd_assoc_cost
+        <include refid="pages"></include>
     </select>
 <!--    多条件查询-->
     <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost">
         select <include refid="BaseInfo"></include> from wgd_assoc_cost
         <include refid="Conditions"></include>
+        <include refid="pages"></include>
     </select>
 <!--    查询详情-->
     <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost">
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 4cd1b820..e8ff3351 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
@@ -2,6 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdAssocInfoDao">
 
+    <sql id="pages">
+        <if test=" null != pageSize  ">
+            LIMIT ${(page-1) * pageSize},${pageSize}
+        </if>
+    </sql>
     <sql id="BaseInfo">
         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,
@@ -9,7 +14,7 @@
         p17,p18,p19,p20,p21,p22,p23,p34,p25,p26,p27,p28,p29,p30,p31,p32
     </sql>
     <sql id="Conditions">
-        <where>
+        WHERE 1=1
             <if test="id != null and id != ''">
                 and id = #{id}
             </if>
@@ -76,14 +81,19 @@
             <if test="mail != null and mail != ''">
                 and mail = #{mail}
             </if>
-        </where>
+
     </sql>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo" resultType="java.lang.Integer">
+        select count(*) from wgd_assoc_info
+        <include refid="Conditions"></include>
+    </select>
     <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>
+        <include refid="pages"></include>
     </select>
     <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo">
         select <include refid="BaseInfo"></include> from wgd_assoc_info
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 9b574587..e9bf66fc 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
@@ -1,20 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdCommiInfoDao">
-
+    <sql id="pages">
+        <if test=" null != pageSize  ">
+            LIMIT ${(page-1) * pageSize},${pageSize}
+        </if>
+    </sql>
     <sql id="BaseInfo">
         id,unit,sc_name,ssc_name,wg_name,role,attend,cur_time,job,department,
         tel,term,certificate,account,password,remark
     </sql>
     <sql id="Conditions">
+        where 1=1
+        <if test="id != null and id != ''">
+            and id = #{id}
+        </if>
+        <if test="unit != null and unit != ''">
+            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}
+        </if>
+        <if test="role != null and role != ''">
+            and role = #{role}
+        </if>
+        <if test="attend != null and attend != ''">
+            and attend = #{attend}
+        </if>
+        <if test="curTime != null">
+            and cur_time = #{curTime}
+        </if>
+        <if test="job != null and job != ''">
+            and job = #{job}
+        </if>
+        <if test="department != null and department != ''">
+            and department = #{department}
+        </if>
+        <if test="tel != null and tel != ''">
+            and tel = #{tel}
+        </if>
+        <if test="term != null and term != ''">
+            and term = #{term}
+        </if>
+        <if test="certificate != null and certificate != ''">
+            and certificate = #{certificate}
+        </if>
+        <if test="account != null and account != ''">
+            and account = #{account}
+        </if>
+        <if test="remark != null and remark != ''">
+            and remark = #{remark}
+        </if>
 
     </sql>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo" resultType="java.lang.Integer">
+        select count(*) from wgd_commi_info
+        <include refid="Conditions"></include>
+    </select>
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
         select <include refid="BaseInfo"></include> from wgd_commi_info
     </select>
     <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
         select <include refid="BaseInfo"></include> from wgd_commi_info
         <include refid="Conditions"></include>
+        <include refid="pages"></include>
     </select>
     <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
         select <include refid="BaseInfo"></include> from wgd_commi_info
@@ -22,15 +77,167 @@
     </select>
 
     <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
-
+        update wgd_commi_info
+        <set>
+            <if test="unit != null and unit != ''">
+                unit = #{unit},
+            </if>
+            <if test="scName != null and scName != ''">
+                sc_name = #{scName},
+            </if>
+            <if test="sscName != null and sscName != ''">
+                ssc_name = #{sscName},
+            </if>
+            <if test="wgName != null and wgName != ''">
+                wg_name = #{wgName},
+            </if>
+            <if test="role != null and role != ''">
+                role = #{role},
+            </if>
+            <if test="attend != null and attend != ''">
+                attend = #{attend},
+            </if>
+            <if test="curTime != null">
+                cur_time = #{curTime},
+            </if>
+            <if test="job != null and job != ''">
+                job = #{job},
+            </if>
+            <if test="department != null and department != ''">
+                department = #{department},
+            </if>
+            <if test="tel != null and tel != ''">
+                tel = #{tel},
+            </if>
+            <if test="term != null and term != ''">
+                term = #{term},
+            </if>
+            <if test="certificate != null and certificate != ''">
+                certificate = #{certificate},
+            </if>
+            <if test="account != null and account != ''">
+                account = #{account},
+            </if>
+            <if test="password != null and password != ''">
+                password = #{password},
+            </if>
+            <if test="remark != null and remark != ''">
+                remark = #{remark},
+            </if>
+        </set>
+        where id = #{id}
     </update>
     <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo">
-
+        insert into wgd_commi_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="unit != null and unit != ''">
+                unit,
+            </if>
+            <if test="scName != null and scName != ''">
+                sc_name,
+            </if>
+            <if test="sscName != null and sscName != ''">
+                ssc_name,
+            </if>
+            <if test="wgName != null and wgName != ''">
+                wg_name,
+            </if>
+            <if test="role != null and role != ''">
+                role,
+            </if>
+            <if test="attend != null and attend != ''">
+                attend,
+            </if>
+            <if test="curTime != null">
+                cur_time,
+            </if>
+            <if test="job != null and job != ''">
+                job,
+            </if>
+            <if test="department != null and department != ''">
+                department,
+            </if>
+            <if test="tel != null and tel != ''">
+                tel,
+            </if>
+            <if test="term != null and term != ''">
+                term,
+            </if>
+            <if test="certificate != null and certificate != ''">
+                certificate,
+            </if>
+            <if test="account != null and account != ''">
+                account,
+            </if>
+            <if test="password != null and password != ''">
+                password,
+            </if>
+            <if test="remark != null and remark != ''">
+                remark,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffixOverrides="," suffix=")">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="unit != null and unit != ''">
+                #{unit},
+            </if>
+            <if test="scName != null and scName != ''">
+                #{scName},
+            </if>
+            <if test="sscName != null and sscName != ''">
+                #{sscName},
+            </if>
+            <if test="wgName != null and wgName != ''">
+                #{wgName},
+            </if>
+            <if test="role != null and role != ''">
+                #{role},
+            </if>
+            <if test="attend != null and attend != ''">
+                #{attend},
+            </if>
+            <if test="curTime != null">
+                #{curTime},
+            </if>
+            <if test="job != null and job != ''">
+                #{job},
+            </if>
+            <if test="department != null and department != ''">
+                #{department},
+            </if>
+            <if test="tel != null and tel != ''">
+                #{tel},
+            </if>
+            <if test="term != null and term != ''">
+                #{term},
+            </if>
+            <if test="certificate != null and certificate != ''">
+                #{certificate},
+            </if>
+            <if test="account != null and account != ''">
+                #{account},
+            </if>
+            <if test="password != null and password != ''">
+                #{password},
+            </if>
+            <if test="remark != null and remark != ''">
+                #{remark},
+            </if>
+        </trim>
     </insert>
     <delete id="deleteOne" parameterType="java.lang.String">
-
+        delete from wgd_commi_info where id = #{id}
     </delete>
     <delete id="deleteBatch">
-
+        delete from wgd_commi_info where id in
+        <foreach collection="array" item="id" separator="," close=")" open="(">
+            #{id}
+        </foreach>
     </delete>
 </mapper>
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 911262e9..f7060895 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
@@ -1,19 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdExReviseCostDao">
-
+    <sql id="pages">
+        <if test=" null != pageSize  ">
+            LIMIT ${(page-1) * pageSize},${pageSize}
+        </if>
+    </sql>
     <sql id="BaseInfo">
         id,type,pro_id,pro_name,cost_outlay,cost
     </sql>
     <sql id="Conditions">
-
+        where 1=1
+        <if test="id != null and id != ''">
+            and id = #{id}
+        </if>
+        <if test="type != null and type != ''">
+            and type = #{type}
+        </if>
+        <if test="proId != null and proId != ''">
+            and pro_id = #{proId}
+        </if>
+        <if test="proName != null and proName != ''">
+            and pro_name = #{proName}
+        </if>
+        <if test="cost != null and cost != ''">
+            and cost = #{cost}
+        </if>
+        <if test="costOutlay != null and costOutlay != ''">
+            and cost_outlay = #{costOutlay}
+        </if>
     </sql>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost" resultType="java.lang.Integer">
+        select count(*) from wgd_ex_revise_cost
+        <include refid="Conditions"></include>
+    </select>
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
         select <include refid="BaseInfo"></include> from wgd_ex_revise_cost
     </select>
     <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
         select <include refid="BaseInfo"></include> from wgd_ex_revise_cost
         <include refid="Conditions"></include>
+        <include refid="pages"></include>
     </select>
     <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
         select <include refid="BaseInfo"></include> from wgd_ex_revise_cost
@@ -21,15 +48,77 @@
     </select>
 
     <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
-
+        update wgd_ex_revise_cost
+        <set>
+            <if test="type != null and type != ''">
+                type = #{type},
+            </if>
+            <if test="proId != null and proId != ''">
+                pro_id = #{proId},
+            </if>
+            <if test="proName != null and proName != ''">
+                pro_name = #{proName},
+            </if>
+            <if test="cost != null and cost != ''">
+                cost = #{cost},
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                cost_outlay = #{costOutlay},
+            </if>
+        </set>
+        where id = #{id}
     </update>
     <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 != ''">
+                id,
+            </if>
+            <if test="type != null and type != ''">
+                type,
+            </if>
+            <if test="proId != null and proId != ''">
+                pro_id
+            </if>
+            <if test="proName != null and proName != ''">
+                pro_name,
+            </if>
+            <if test="cost != null and cost != ''">
+                cost,
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                cost_outlay,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffixOverrides="," suffix=")">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="type != null and type != ''">
+                #{type},
+            </if>
+            <if test="proId != null and proId != ''">
+                #{proId},
+            </if>
+            <if test="proName != null and proName != ''">
+                #{proName},
+            </if>
+            <if test="cost != null and cost != ''">
+                #{cost},
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                #{costOutlay},
+            </if>
+        </trim>
     </insert>
     <delete id="deleteOne" parameterType="java.lang.String">
-
+        delete from wgd_ex_revise_cost where id = #{id}
     </delete>
     <delete id="deleteBatch">
-
+        delete from wgd_ex_revise_cost where id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </delete>
 </mapper>
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 5a7b9b68..f8499871 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
@@ -1,20 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusZ.dao.WgdMeetCostDao">
-
+    <sql id="pages">
+        <if test=" null != pageSize  ">
+            LIMIT ${(page-1) * pageSize},${pageSize}
+        </if>
+    </sql>
     <sql id="BaseInfo">
         id,unit,meet_name,meet_time,pay_standard,pay_reality,cost_outlay
     </sql>
 
     <sql id="Conditions">
-
+        where 1=1
+        <if test="id != null and id != ''">
+            and id = #{id}
+        </if>
+        <if test="unit != null and unit != ''">
+            and unit = #{unit}
+        </if>
+        <if test="meetName != null and meetName != ''">
+            and meet_name = #{meetName}
+        </if>
+        <if test="meetTime != null">
+            and meet_time = #{meetTime}
+        </if>
+        <if test="payStandard != null and payStandard != ''">
+            and pay_standard = #{payStandard}
+        </if>
+        <if test="payReality != null and payReality != ''">
+            and pay_reality = #{payReality}
+        </if>
+        <if test="costOutlay != null and costOutlay != ''">
+            and cost_outlay = #{costOutlay}
+        </if>
     </sql>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost" resultType="java.lang.Integer">
+        select count(*) from wgd_meet_cost
+        <include refid="Conditions"></include>
+    </select>
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
         select <include refid="BaseInfo"></include> from wgd_meet_cost
     </select>
     <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
         select <include refid="BaseInfo"></include> from wgd_meet_cost
         <include refid="Conditions"></include>
+        <include refid="pages"></include>
     </select>
     <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
         select <include refid="BaseInfo"></include> from wgd_meet_cost
@@ -22,15 +52,86 @@
     </select>
 
     <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
-
+        update wgd_meet_cost
+        <set>
+            <if test="unit != null and unit != ''">
+                unit = #{unit},
+            </if>
+            <if test="meetName != null and meetName != ''">
+                meet_name = #{meetName},
+            </if>
+            <if test="meetTime != null">
+                meet_time = #{meetTime},
+            </if>
+            <if test="payStandard != null and payStandard != ''">
+                pay_standard = #{payStandard},
+            </if>
+            <if test="payReality != null and payReality != ''">
+                pay_reality = #{payReality},
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                cost_outlay = #{costOutlay},
+            </if>
+        </set>
+        where id = #{id}
     </update>
     <insert id="insertOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
-
+        insert into wgd_meet_cost
+        <trim prefix="(" suffixOverrides="," suffix=")">
+            <if test="id != null and id != ''">
+                id,
+            </if>
+            <if test="unit != null and unit != ''">
+                unit,
+            </if>
+            <if test="meetName != null and meetName != ''">
+                meet_name,
+            </if>
+            <if test="meetTime != null">
+                meet_time,
+            </if>
+            <if test="payStandard != null and payStandard != ''">
+                pay_standard,
+            </if>
+            <if test="payReality != null and payReality != ''">
+                pay_reality,
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                cost_outlay,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffixOverrides="," suffix=")">
+            <if test="id != null and id != ''">
+                #{id},
+            </if>
+            <if test="unit != null and unit != ''">
+                #{unit},
+            </if>
+            <if test="meetName != null and meetName != ''">
+                #{meetName},
+            </if>
+            <if test="meetTime != null">
+                #{meetTime},
+            </if>
+            <if test="payStandard != null and payStandard != ''">
+                #{payStandard},
+            </if>
+            <if test="payReality != null and payReality != ''">
+                #{payReality},
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                #{costOutlay},
+            </if>
+        </trim>
     </insert>
     <delete id="deleteOne" parameterType="java.lang.String">
-
+        delete from wgd_meet_cost where id = #{id}
     </delete>
     <delete id="deleteBatch">
-
+        delete from wgd_meet_cost where id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </delete>
 </mapper>

From 11baf7eda5da56c2043a0a752d5dd904a148fa6f Mon Sep 17 00:00:00 2001
From: liao <2948196353@qq.com>
Date: Tue, 16 Nov 2021 14:27:54 +0800
Subject: [PATCH 5/5] ~

---
 .../controller/WgdCgfyController.java         | 27 ++++++++++-------
 .../controller/WgdFyfyController.java         | 27 ++++++++++-------
 .../controller/WgdSrbController.java          | 29 +++++++++++--------
 .../controller/WgdWbtjController.java         | 27 ++++++++++-------
 .../controller/WgdWbxdController.java         | 27 ++++++++++-------
 .../controller/WgdZcbController.java          | 29 +++++++++++--------
 .../da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java  |  3 +-
 .../da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java  | 11 +++++--
 .../da/slrs/wgdCensusLeo/dao/WgdSrbDao.java   |  3 +-
 .../da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java  |  3 +-
 .../da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java  |  3 +-
 .../da/slrs/wgdCensusLeo/dao/WgdZcbDao.java   |  3 +-
 .../da/slrs/wgdCensusLeo/entity/WgdCgfy.java  |  4 ++-
 .../da/slrs/wgdCensusLeo/entity/WgdFyfy.java  |  6 +++-
 .../da/slrs/wgdCensusLeo/entity/WgdSrb.java   |  6 +++-
 .../da/slrs/wgdCensusLeo/entity/WgdWbtj.java  |  5 +++-
 .../da/slrs/wgdCensusLeo/entity/WgdWbxd.java  |  8 ++++-
 .../da/slrs/wgdCensusLeo/entity/WgdZcb.java   |  4 ++-
 .../wgdCensusLeo/service/IWgdCgfyService.java | 26 +++++------------
 .../wgdCensusLeo/service/IWgdFyfyService.java | 26 +++++------------
 .../wgdCensusLeo/service/IWgdSrbService.java  | 24 +++++----------
 .../wgdCensusLeo/service/IWgdWbtjService.java | 24 +++++----------
 .../wgdCensusLeo/service/IWgdWbxdService.java | 24 +++++----------
 .../wgdCensusLeo/service/IWgdZcbService.java  | 24 +++++----------
 .../service/impl/WgdCgfyServiceImpl.java      |  6 ++--
 .../service/impl/WgdFyfyServiceImpl.java      | 11 ++++---
 .../service/impl/WgdSrbServiceImpl.java       | 12 +++++---
 .../service/impl/WgdWbtjServiceImpl.java      |  9 ++++--
 .../service/impl/WgdWbxdServiceImpl.java      |  9 ++++--
 .../service/impl/WgdZcbServiceImpl.java       |  9 ++++--
 .../mapper/wgdCensusLeo/WgdCgfyMapper.xml     | 16 ++++++----
 31 files changed, 235 insertions(+), 210 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 a15c77d7..93648137 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
@@ -2,6 +2,7 @@ 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;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
 * <p>
     * 采购费用信息统计 前端控制器
@@ -29,14 +32,16 @@ public class WgdCgfyController extends BaseController<WgdCgfy> {
     @Autowired
     IWgdCgfyService iWgdCgfyService;
 
-    @GetMapping("getAllCgfy")
-    public ResponseMessage<Object> getAllWgdCgfy(){//查询所有
-        return Result.success(iWgdCgfyService.getAllWgdCgfy());
+    @GetMapping("getAllCgfys")
+    public ResponseMessage<Object> getAllWgdCgfys(){//查询所有
+        return Result.success(iWgdCgfyService.getAllWgdCgfys());
     }
 
-    @PostMapping("queryAllCgfy")
-    public ResponseMessage<Object> queryAllWgdCgfy(WgdCgfy wgdCgfy){//多条件查询
-        return Result.success(iWgdCgfyService.queryAllWgdCgfy(wgdCgfy));
+    @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")
@@ -45,13 +50,13 @@ public class WgdCgfyController extends BaseController<WgdCgfy> {
     }
 
     @PostMapping("modCgfy")
-    ResponseMessage<Object> updateWgdCgfy(WgdCgfy wgdCgfy) {//编辑
-        return Result.success(iWgdCgfyService.updateWgdCgfy(wgdCgfy));
+    ResponseMessage<Object> updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑
+        return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy));
     }
 
     @PostMapping("addCgfy")
-    ResponseMessage<Object> insertWgdCgfy(WgdCgfy wgdCgfy) {//插入
-        return Result.success(iWgdCgfyService.insertWgdCgfy(wgdCgfy));
+    ResponseMessage<Object> insertWgdCgfy(WgdCgfy WgdCgfy) {//插入
+        return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy));
     }
 
     @GetMapping("delCgfy")
@@ -61,6 +66,6 @@ public class WgdCgfyController extends BaseController<WgdCgfy> {
 
     @GetMapping("delCgfys")
     ResponseMessage<Object> deleteWgdCgfys(String ids){//批量删除
-        return Result.success(iWgdCgfyService.deleteWgdCgfy(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 eeefef57..be878baa 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
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+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.WgdFyfy;
@@ -13,6 +14,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 翻译费用信息统计 前端控制器
@@ -28,14 +31,16 @@ public class WgdFyfyController extends BaseController<WgdFyfy> {
     @Autowired
     IWgdFyfyService iWgdFyfyService;
 
-    @GetMapping("getAllFyfy")
-    public ResponseMessage<Object> getAllWgdFyfy(){//查询所有
-        return Result.success(iWgdFyfyService.getAllWgdFyfy());
+    @GetMapping("getAllFyfys")
+    public ResponseMessage<Object> getAllWgdFyfys(){//查询所有
+        return Result.success(iWgdFyfyService.getAllWgdFyfys());
     }
 
-    @PostMapping("queryAllFyfy")
-    public ResponseMessage<Object> queryAllWgdCgfy(WgdFyfy wgdFyfy){//多条件查询
-        return Result.success(iWgdFyfyService.queryAllWgdFyfy(wgdFyfy));
+    @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")
@@ -44,13 +49,13 @@ public class WgdFyfyController extends BaseController<WgdFyfy> {
     }
 
     @PostMapping("modFyfy")
-    ResponseMessage<Object> updateWgdFyfy(WgdFyfy wgdFyfy) {//编辑
-        return Result.success(iWgdFyfyService.updateWgdFyfy(wgdFyfy));
+    ResponseMessage<Object> updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑
+        return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy));
     }
 
     @PostMapping("addFyfy")
-    ResponseMessage<Object> insertWgdFyfy(WgdFyfy wgdFyfy) {//插入
-        return Result.success(iWgdFyfyService.insertWgdFyfy(wgdFyfy));
+    ResponseMessage<Object> insertWgdFyfy(WgdFyfy WgdFyfy) {//插入
+        return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy));
     }
 
     @GetMapping("delFyfy")
@@ -60,6 +65,6 @@ public class WgdFyfyController extends BaseController<WgdFyfy> {
 
     @GetMapping("delFyfys")
     ResponseMessage<Object> deleteWgdFyfys(String ids){//批量删除
-        return Result.success(iWgdFyfyService.deleteWgdFyfy(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 5b432de3..53a5d130 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
@@ -1,18 +1,21 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+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.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService;
 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 com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 标准制修订补助资金收支统计收入表 前端控制器
@@ -28,14 +31,16 @@ public class WgdSrbController extends BaseController<WgdSrb> {
     @Autowired
     IWgdSrbService iWgdSrbService;
 
-    @GetMapping("getAllSrb")
-    public ResponseMessage<Object> getAllWgdSrb(){//查询所有
-        return Result.success(iWgdSrbService.getAllWgdSrb());
+    @GetMapping("getAllSrbs")
+    public ResponseMessage<Object> getAllWgdSrbs(){//查询所有
+        return Result.success(iWgdSrbService.getAllWgdSrbs());
     }
 
-    @PostMapping("queryAllSrb")
-    public ResponseMessage<Object> queryAllWgdSrb(WgdSrb wgdSrb){//多条件查询
-        return Result.success(iWgdSrbService.queryAllWgdSrb(wgdSrb));
+    @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")
@@ -44,13 +49,13 @@ public class WgdSrbController extends BaseController<WgdSrb> {
     }
 
     @PostMapping("modSrb")
-    ResponseMessage<Object> updateWgdSrb(WgdSrb wgdSrb) {//编辑
-        return Result.success(iWgdSrbService.updateWgdSrb(wgdSrb));
+    ResponseMessage<Object> updateWgdSrb(WgdSrb WgdSrb) {//编辑
+        return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb));
     }
 
     @PostMapping("addSrb")
-    ResponseMessage<Object> insertWgdSrb(WgdSrb wgdSrb) {//插入
-        return Result.success(iWgdSrbService.insertWgdSrb(wgdSrb));
+    ResponseMessage<Object> insertWgdSrb(WgdSrb WgdSrb) {//插入
+        return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb));
     }
 
     @GetMapping("delSrb")
@@ -60,6 +65,6 @@ public class WgdSrbController extends BaseController<WgdSrb> {
 
     @GetMapping("delSrbs")
     ResponseMessage<Object> deleteWgdSrbs(String ids){//批量删除
-        return Result.success(iWgdSrbService.deleteWgdSrb(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 d8709374..e581b18d 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
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+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.WgdWbtj;
@@ -13,6 +14,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 参与外部协会会议统计 前端控制器
@@ -28,14 +31,16 @@ public class WgdWbtjController extends BaseController<WgdWbtj> {
     @Autowired
     IWgdWbtjService iWgdWbtjService;
 
-    @GetMapping("getAllWbtj")
-    public ResponseMessage<Object> getAllWgdWbtj(){//查询所有
-        return Result.success(iWgdWbtjService.getAllWgdWbtj());
+    @GetMapping("getAllWbtjs")
+    public ResponseMessage<Object> getAllWgdWbtjs(){//查询所有
+        return Result.success(iWgdWbtjService.getAllWgdWbtjs());
     }
 
-    @PostMapping("queryAllWbtj")
-    public ResponseMessage<Object> queryAllWgdWbtj(WgdWbtj wgdWbtj){//多条件查询
-        return Result.success(iWgdWbtjService.queryAllWgdWbtj(wgdWbtj));
+    @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")
@@ -44,13 +49,13 @@ public class WgdWbtjController extends BaseController<WgdWbtj> {
     }
 
     @PostMapping("modWbtj")
-    ResponseMessage<Object> updateWgdWbtj(WgdWbtj wgdWbtj) {//编辑
-        return Result.success(iWgdWbtjService.updateWgdWbtj(wgdWbtj));
+    ResponseMessage<Object> updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑
+        return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj));
     }
 
     @PostMapping("addWbtj")
-    ResponseMessage<Object> insertWgdWbtj(WgdWbtj wgdWbtj) {//插入
-        return Result.success(iWgdWbtjService.insertWgdWbtj(wgdWbtj));
+    ResponseMessage<Object> insertWgdWbtj(WgdWbtj WgdWbtj) {//插入
+        return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj));
     }
 
     @GetMapping("delWbtj")
@@ -60,6 +65,6 @@ public class WgdWbtjController extends BaseController<WgdWbtj> {
 
     @GetMapping("delWbtjs")
     ResponseMessage<Object> deleteWgdWbtjs(String ids){//批量删除
-        return Result.success(iWgdWbtjService.deleteWgdWbtj(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 799d66b7..36566cd7 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
@@ -1,6 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+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.WgdWbxd;
@@ -13,6 +14,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 参与外部标准制修订信息统计 前端控制器
@@ -28,14 +31,16 @@ public class WgdWbxdController extends BaseController<WgdWbxd> {
     @Autowired
     IWgdWbxdService iWgdWbxdService;
 
-    @GetMapping("getAllWbxd")
-    public ResponseMessage<Object> getAllWgdWbxd(){//查询所有
-        return Result.success(iWgdWbxdService.getAllWgdWbxd());
+    @GetMapping("getAllWbxds")
+    public ResponseMessage<Object> getAllWgdWbxds(){//查询所有
+        return Result.success(iWgdWbxdService.getAllWgdWbxds());
     }
 
-    @PostMapping("queryAllWbxd")
-    public ResponseMessage<Object> queryAllWgdWbxd(WgdWbxd wgdWbxd){//多条件查询
-        return Result.success(iWgdWbxdService.queryAllWgdWbxd(wgdWbxd));
+    @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")
@@ -44,13 +49,13 @@ public class WgdWbxdController extends BaseController<WgdWbxd> {
     }
 
     @PostMapping("modWbxd")
-    ResponseMessage<Object> updateWgdWbxd(WgdWbxd wgdWbxd) {//编辑
-        return Result.success(iWgdWbxdService.updateWgdWbxd(wgdWbxd));
+    ResponseMessage<Object> updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑
+        return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd));
     }
 
     @PostMapping("addWbxd")
-    ResponseMessage<Object> insertWgdWbxd(WgdWbxd wgdWbxd) {//插入
-        return Result.success(iWgdWbxdService.insertWgdWbxd(wgdWbxd));
+    ResponseMessage<Object> insertWgdWbxd(WgdWbxd WgdWbxd) {//插入
+        return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd));
     }
 
     @GetMapping("delWbxd")
@@ -60,6 +65,6 @@ public class WgdWbxdController extends BaseController<WgdWbxd> {
 
     @GetMapping("delWbxds")
     ResponseMessage<Object> deleteWgdWbxds(String ids){//批量删除
-        return Result.success(iWgdWbxdService.deleteWgdWbxd(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 3eb648b7..d42fb3a0 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
@@ -1,18 +1,21 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+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.WgdZcb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService;
 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 com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 标准制修订补助资金收支统计支出表 前端控制器
@@ -28,14 +31,16 @@ public class WgdZcbController extends BaseController<WgdZcb> {
     @Autowired
     IWgdZcbService iWgdZcbService;
 
-    @GetMapping("getAllZcb")
-    public ResponseMessage<Object> getAllWgdZcb(){//查询所有
-        return Result.success(iWgdZcbService.getAllWgdZcb());
+    @GetMapping("getAllZcbs")
+    public ResponseMessage<Object> getAllWgdZcbs(){//查询所有
+        return Result.success(iWgdZcbService.getAllWgdZcbs());
     }
 
-    @PostMapping("queryAllZcb")
-    public ResponseMessage<Object> queryAllWgdZcb(WgdZcb wgdZcb){//多条件查询
-        return Result.success(iWgdZcbService.queryAllWgdZcb(wgdZcb));
+    @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")
@@ -44,13 +49,13 @@ public class WgdZcbController extends BaseController<WgdZcb> {
     }
 
     @PostMapping("modZcb")
-    ResponseMessage<Object> updateWgdZcb(WgdZcb wgdZcb) {//编辑
-        return Result.success(iWgdZcbService.updateWgdZcb(wgdZcb));
+    ResponseMessage<Object> updateWgdZcb(WgdZcb WgdZcb) {//编辑
+        return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb));
     }
 
     @PostMapping("addZcb")
-    ResponseMessage<Object> insertWgdZcb(WgdZcb wgdZcb) {//插入
-        return Result.success(iWgdZcbService.insertWgdZcb(wgdZcb));
+    ResponseMessage<Object> insertWgdZcb(WgdZcb WgdZcb) {//插入
+        return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb));
     }
 
     @GetMapping("delZcb")
@@ -60,6 +65,6 @@ public class WgdZcbController extends BaseController<WgdZcb> {
 
     @GetMapping("delZcbs")
     ResponseMessage<Object> deleteWgdZcbs(String ids){//批量删除
-        return Result.success(iWgdZcbService.deleteWgdZcb(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 f42f56f8..b9cecd23 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
@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdCgfyDao extends BaseMapper<WgdCgfy> {
+    Integer getQueryTotal(WgdCgfy WgdCgfy);//总数
     List<WgdCgfy> selectAll();//查询所有
     List<WgdCgfy> queryAll(WgdCgfy wgdCgfy);//多条件查询
     WgdCgfy selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdCgfyDao extends BaseMapper<WgdCgfy> {
     int updateOne(WgdCgfy wgdCgfy);//编辑
     int insertOne(WgdCgfy wgdCgfy);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }
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 3be601a5..70532885 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
@@ -14,12 +14,19 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdFyfyDao extends BaseMapper<WgdFyfy> {
+    Integer getQueryTotal(WgdFyfy WgdFyfy);//总数
+
     List<WgdFyfy> selectAll();//查询所有
+
     List<WgdFyfy> queryAll(WgdFyfy wgdFyfy);//多条件查询
+
     WgdFyfy selectOne(String id);//查询详情
 
     int updateOne(WgdFyfy wgdFyfy);//编辑
+
     int insertOne(WgdFyfy wgdFyfy);//插入
+
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
-}
+
+    int deleteBatch();//批量删除
+}
\ 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 e219f5cb..b30aa0b0 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
@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdSrbDao extends BaseMapper<WgdSrb> {
+    Integer getQueryTotal(WgdSrb WgdSrb);//总数
     List<WgdSrb> selectAll();//查询所有
     List<WgdSrb> queryAll(WgdSrb wgdSrb);//多条件查询
     WgdSrb selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdSrbDao extends BaseMapper<WgdSrb> {
     int updateOne(WgdSrb wgdSrb);//编辑
     int insertOne(WgdSrb wgdSrb);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }
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 64821346..8b432eb2 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
@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdWbtjDao extends BaseMapper<WgdWbtj> {
+    Integer getQueryTotal(WgdWbtj WgdWbtj);//总数
     List<WgdWbtj> selectAll();//查询所有
     List<WgdWbtj> queryAll(WgdWbtj wgdWbtj);//多条件查询
     WgdWbtj selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdWbtjDao extends BaseMapper<WgdWbtj> {
     int updateOne(WgdWbtj wgdWbtj);//编辑
     int insertOne(WgdWbtj wgdWbtj);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }
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 686defcc..d20d355e 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
@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdWbxdDao extends BaseMapper<WgdWbxd> {
+    Integer getQueryTotal(WgdWbxd WgdWbxd);//总数
     List<WgdWbxd> selectAll();//查询所有
     List<WgdWbxd> queryAll(WgdWbxd wgdWbxd);//多条件查询
     WgdWbxd selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdWbxdDao extends BaseMapper<WgdWbxd> {
     int updateOne(WgdWbxd wgdWbxd);//编辑
     int insertOne(WgdWbxd wgdWbxd);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }
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 00c8df4e..a2c3773d 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
@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdZcbDao extends BaseMapper<WgdZcb> {
+    Integer getQueryTotal(WgdZcb WgdZcb);//总数
     List<WgdZcb> selectAll();//查询所有
     List<WgdZcb> queryAll(WgdZcb wgdZcb);//多条件查询
     WgdZcb selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdZcbDao extends BaseMapper<WgdZcb> {
     int updateOne(WgdZcb wgdZcb);//编辑
     int insertOne(WgdZcb wgdZcb);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java
index a71fc8a7..7303343e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java
@@ -2,6 +2,8 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdCgfy对象", description="采购费用信息统计")
-public class WgdCgfy extends BaseEntity {
+public class WgdCgfy extends BasePage {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java
index 66116ea1..87e4886a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java
@@ -2,11 +2,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -20,7 +23,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdFyfy对象", description="翻译费用信息统计")
-public class WgdFyfy extends BaseEntity {
+public class WgdFyfy extends BasePage {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,6 +49,7 @@ public class WgdFyfy extends BaseEntity {
     private String cost;
 
     @ApiModelProperty(value = "翻译完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String time;
 
 
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 250f0954..b1df6e0e 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
@@ -2,11 +2,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -20,7 +23,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdSrb对象", description="标准制修订补助资金收支统计收入表")
-public class WgdSrb extends BaseEntity {
+public class WgdSrb extends BasePage {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")
@@ -39,6 +42,7 @@ public class WgdSrb extends BaseEntity {
     private String money;
 
     @ApiModelProperty(value = "入账时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String data;
 
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java
index 27f7d004..6056acc2 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java
@@ -1,12 +1,14 @@
 package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.base.page.BasePage;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdWbtj对象", description="参与外部协会会议统计")
-public class WgdWbtj extends BaseEntity {
+public class WgdWbtj extends BasePage {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")
@@ -33,6 +35,7 @@ public class WgdWbtj extends BaseEntity {
     private String meeting;
 
     @ApiModelProperty(value = "会议时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String time;
 
     @ApiModelProperty(value = "会议地点")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java
index 0ec6e035..f95a486c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java
@@ -2,11 +2,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -20,7 +23,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdWbxd对象", description="参与外部标准制修订信息统计")
-public class WgdWbxd extends BaseEntity {
+public class WgdWbxd extends BasePage {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")
@@ -48,9 +51,11 @@ public class WgdWbxd extends BaseEntity {
     private String preside;
 
     @ApiModelProperty(value = "发布日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String dataStart;
 
     @ApiModelProperty(value = "实施日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String dataImplement;
 
     @ApiModelProperty(value = "颁布机构")
@@ -60,6 +65,7 @@ public class WgdWbxd extends BaseEntity {
     private String drafting;
 
     @ApiModelProperty(value = "备案时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String dataRecord;
 
     @ApiModelProperty(value = "提报单位名称")
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 ce6bc7eb..20e2e9cf 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
@@ -2,6 +2,8 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdZcb对象", description="标准制修订补助资金收支统计支出表")
-public class WgdZcb extends BaseEntity {
+public class WgdZcb extends BasePage {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java
index f0e8fa75..df3c5e48 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java
@@ -14,24 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdCgfyService extends IService<WgdCgfy> {
+    List<WgdCgfy> getAllWgdCgfys();//查询所有
+    List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy);//多条件查询
+    WgdCgfy getWgdCgfyById(String id);//查询详情
 
-    Object getAllWgdCgfy();
-
-    Object queryAllWgdCgfy(WgdCgfy wgdCgfy);
-
-    List<WgdCgfy> queryAllWgdAssocCosts(WgdCgfy wgdAssocCost);
-
-    List<WgdCgfy> getAllWgdCgfys();
-
-    List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy);
-
-    Object getWgdCgfyById(String id);
-
-    int updateWgdCgfy(WgdCgfy wgdCgfy);
-
-    int insertWgdCgfy(WgdCgfy wgdCgfy);
-
-    int deleteWgdCgfy(String id);
-
-    int deleteWgdCgfys(String ids);
+    int updateWgdCgfy(WgdCgfy wgdCgfy);//编辑
+    int insertWgdCgfy(WgdCgfy wgdCgfy);//插入
+    int deleteWgdCgfy(String id);//删除
+    int deleteWgdCgfys(String ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java
index 1bef9456..4a16bdf8 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java
@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdFyfyService extends IService<WgdFyfy> {
+    List<WgdFyfy> getAllWgdFyfys();//查询所有
+    List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy);//多条件查询
+    WgdFyfy getWgdFyfyById(String id);//查询详情
 
-    Object getAllWgdFyfy();
-
-    Object queryAllWgdFyfy(WgdFyfy wgdFyfy);
-
-    List<WgdFyfy> getAllWgdFyfys();
-
-    List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy);
-
-    Object getWgdFyfyById(String id);
-
-    int updateWgdFyfy(WgdFyfy wgdFyfy);
-
-    int insertWgdFyfy(WgdFyfy wgdFyfy);
-
-    int deleteWgdFyfy(String id);
-
-    int deleteWgdFyfys(String ids);
-}
+    int updateWgdFyfy(WgdFyfy wgdFyfy);//编辑
+    int insertWgdFyfy(WgdFyfy wgdFyfy);//插入
+    int deleteWgdFyfy(String id);//删除
+    int deleteWgdFyfys(String ids);//批量删除
+}
\ No newline at end of file
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java
index 32cf2f3e..fcb2c28d 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java
@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdSrbService extends IService<WgdSrb> {
+    List<WgdSrb> getAllWgdSrbs();//查询所有
+    List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb);//多条件查询
+    WgdSrb getWgdSrbById(String id);//查询详情
 
-    Object getAllWgdSrb();
-
-    Object queryAllWgdSrb(WgdSrb wgdSrb);
-
-    List<WgdSrb> getAllWgdSrbs();
-
-    List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb);
-
-    Object getWgdSrbById(String id);
-
-    int updateWgdSrb(WgdSrb wgdSrb);
-
-    int insertWgdSrb(WgdSrb wgdSrb);
-
-    int deleteWgdSrb(String id);
-
-    int deleteWgdSrbs(String ids);
+    int updateWgdSrb(WgdSrb wgdSrb);//编辑
+    int insertWgdSrb(WgdSrb wgdSrb);//插入
+    int deleteWgdSrb(String id);//删除
+    int deleteWgdSrbs(String ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java
index a4953148..80b2505a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java
@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdWbtjService extends IService<WgdWbtj> {
+    List<WgdWbtj> getAllWgdWbtjs();//查询所有
+    List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj);//多条件查询
+    WgdWbtj getWgdWbtjById(String id);//查询详情
 
-    Object getAllWgdWbtj();
-
-    Object queryAllWgdWbtj(WgdWbtj wgdWbtj);
-
-    List<WgdWbtj> getAllWgdWbtjs();
-
-    List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj);
-
-    Object getWgdWbtjById(String id);
-
-    int updateWgdWbtj(WgdWbtj wgdWbtj);
-
-    int insertWgdWbtj(WgdWbtj wgdWbtj);
-
-    int deleteWgdWbtj(String id);
-
-    int deleteWgdWbtjs(String ids);
+    int updateWgdWbtj(WgdWbtj wgdWbtj);//编辑
+    int insertWgdWbtj(WgdWbtj wgdWbtj);//插入
+    int deleteWgdWbtj(String id);//删除
+    int deleteWgdWbtjs(String ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java
index cc532b28..cfc0e862 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java
@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdWbxdService extends IService<WgdWbxd> {
+    List<WgdWbxd> getAllWgdWbxds();//查询所有
+    List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd);//多条件查询
+    WgdWbxd getWgdWbxdById(String id);//查询详情
 
-    Object getAllWgdWbxd();
-
-    Object queryAllWgdWbxd(WgdWbxd wgdWbxd);
-
-    List<WgdWbxd> getAllWgdWbxds();
-
-    List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd);
-
-    Object getWgdWbxdById(String id);
-
-    int updateWgdWbxd(WgdWbxd wgdWbxd);
-
-    int insertWgdWbxd(WgdWbxd wgdWbxd);
-
-    int deleteWgdWbxd(String id);
-
-    int deleteWgdWbxds(String ids);
+    int updateWgdWbxd(WgdWbxd wgdWbxd);//编辑
+    int insertWgdWbxd(WgdWbxd wgdWbxd);//插入
+    int deleteWgdWbxd(String id);//删除
+    int deleteWgdWbxds(String ids);//批量删除
 }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java
index b97f7b0a..505af47a 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java
@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdZcbService extends IService<WgdZcb> {
+    List<WgdZcb> getAllWgdZcbs();//查询所有
+    List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb);//多条件查询
+    WgdZcb getWgdZcbById(String id);//查询详情
 
-    Object getAllWgdZcb();
-
-    Object queryAllWgdZcb(WgdZcb wgdZcb);
-
-    List<WgdZcb> getAllWgdZcbs();
-
-    List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb);
-
-    Object getWgdZcbById(String id);
-
-    int updateWgdZcb(WgdZcb wgdZcb);
-
-    int insertWgdZcb(WgdZcb wgdZcb);
-
-    int deleteWgdZcb(String id);
-
-    int deleteWgdZcbs(String ids);
+    int updateWgdZcb(WgdZcb wgdZcb);//编辑
+    int insertWgdZcb(WgdZcb wgdZcb);//插入
+    int deleteWgdZcb(String id);//删除
+    int deleteWgdZcbs(String 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 30bb76a3..4150dc78 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
@@ -19,7 +19,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> implements IWgdCgfyService {
+public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> implements IWgdCgfyService {
 
     @Autowired
     WgdCgfyDao wgdCgfyDao;
@@ -31,6 +31,8 @@ public abstract class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy
 
     @Override
     public List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy) {
+        Integer count = wgdCgfyDao.getQueryTotal(wgdCgfy);
+        wgdCgfy.getPager().setRowCount(count);
         return wgdCgfyDao.queryAll(wgdCgfy);
     }
 
@@ -58,6 +60,6 @@ public abstract class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy
     @Override
     public int deleteWgdCgfys(String ids) {
         String[] str = ids.split(",");
-        return wgdCgfyDao.deleteBatch(str);
+        return wgdCgfyDao.deleteBatch();
     }
 }
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 d08ff56d..08e12353 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
@@ -1,7 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
-import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,7 +19,8 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> implements IWgdFyfyService {
+public class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> implements IWgdFyfyService {
+
     @Autowired
     WgdFyfyDao wgdFyfyDao;
 
@@ -30,6 +31,8 @@ public abstract class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy
 
     @Override
     public List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy) {
+        Integer count = wgdFyfyDao.getQueryTotal(wgdFyfy);
+        wgdFyfy.getPager().setRowCount(count);
         return wgdFyfyDao.queryAll(wgdFyfy);
     }
 
@@ -57,6 +60,6 @@ public abstract class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy
     @Override
     public int deleteWgdFyfys(String ids) {
         String[] str = ids.split(",");
-        return wgdFyfyDao.deleteBatch(str);
+        return wgdFyfyDao.deleteBatch();
     }
-}
+}
\ 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 730b0f1d..138551e6 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
@@ -1,7 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
-import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,9 +19,11 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements IWgdSrbService {
+public class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements IWgdSrbService {
+
     @Autowired
     WgdSrbDao wgdSrbDao;
+
     @Override
     public List<WgdSrb> getAllWgdSrbs() {
         return wgdSrbDao.selectAll();
@@ -29,6 +31,8 @@ public abstract class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> i
 
     @Override
     public List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb) {
+        Integer count = wgdSrbDao.getQueryTotal(wgdSrb);
+        wgdSrb.getPager().setRowCount(count);
         return wgdSrbDao.queryAll(wgdSrb);
     }
 
@@ -56,6 +60,6 @@ public abstract class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> i
     @Override
     public int deleteWgdSrbs(String ids) {
         String[] str = ids.split(",");
-        return wgdSrbDao.deleteBatch(str);
+        return wgdSrbDao.deleteBatch();
     }
-}
+}
\ 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 d08dece4..70c65e7c 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
@@ -19,7 +19,8 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> implements IWgdWbtjService {
+public class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> implements IWgdWbtjService {
+
     @Autowired
     WgdWbtjDao wgdWbtjDao;
 
@@ -30,6 +31,8 @@ public abstract class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj
 
     @Override
     public List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj) {
+        Integer count = wgdWbtjDao.getQueryTotal(wgdWbtj);
+        wgdWbtj.getPager().setRowCount(count);
         return wgdWbtjDao.queryAll(wgdWbtj);
     }
 
@@ -57,6 +60,6 @@ public abstract class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj
     @Override
     public int deleteWgdWbtjs(String ids) {
         String[] str = ids.split(",");
-        return wgdWbtjDao.deleteBatch(str);
+        return wgdWbtjDao.deleteBatch();
     }
-}
+}
\ 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 dda4435e..fa887a85 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
@@ -19,7 +19,8 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> implements IWgdWbxdService {
+public class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> implements IWgdWbxdService {
+
     @Autowired
     WgdWbxdDao wgdWbxdDao;
 
@@ -30,6 +31,8 @@ public abstract class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd
 
     @Override
     public List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd) {
+        Integer count = wgdWbxdDao.getQueryTotal(wgdWbxd);
+        wgdWbxd.getPager().setRowCount(count);
         return wgdWbxdDao.queryAll(wgdWbxd);
     }
 
@@ -57,6 +60,6 @@ public abstract class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd
     @Override
     public int deleteWgdWbxds(String ids) {
         String[] str = ids.split(",");
-        return wgdWbxdDao.deleteBatch(str);
+        return wgdWbxdDao.deleteBatch();
     }
-}
+}
\ 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 7f29d37f..ca0338c4 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
@@ -19,7 +19,8 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements IWgdZcbService {
+public class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements IWgdZcbService {
+
     @Autowired
     WgdZcbDao wgdZcbDao;
 
@@ -30,6 +31,8 @@ public abstract class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> i
 
     @Override
     public List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb) {
+        Integer count = wgdZcbDao.getQueryTotal(wgdZcb);
+        wgdZcb.getPager().setRowCount(count);
         return wgdZcbDao.queryAll(wgdZcb);
     }
 
@@ -57,6 +60,6 @@ public abstract class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> i
     @Override
     public int deleteWgdZcbs(String ids) {
         String[] str = ids.split(",");
-        return wgdZcbDao.deleteBatch(str);
+        return wgdZcbDao.deleteBatch();
     }
-}
+}
\ No newline at end of file
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 0355c78d..c56391f0 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
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao">
+    <sql id="pages">
+        <if test=" null != pageSize  ">
+            LIMIT ${(page-1) * pageSize},${pageSize}
+        </if>
+    </sql>
     <!--    基础信息-->
     <sql id="BaseInfo">
         id,type,number,name,pages,cost
     </sql>
     <!--    查询条件-->
     <sql id="Conditions">
-        <where>
+        where 1=1
             <if test="id != null and id != ''">
                 and id = #{id}
             </if>
@@ -26,18 +31,19 @@
             <if test="cost != null and cost != ''">
                 and cost = #{cost}
             </if>
-        </where>
     </sql>
-    <!--    查询所有-->
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy" resultType="java.lang.Integer">
+        select count(*) from wgd_cgfy
+        <include refid="Conditions"></include>
+    </select>
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
         select <include refid="BaseInfo"></include> from wgd_cgfy
     </select>
-    <!--    多条件查询-->
     <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
         select <include refid="BaseInfo"></include> from wgd_cgfy
         <include refid="Conditions"></include>
+        <include refid="pages"></include>
     </select>
-    <!--    查询详情-->
     <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
         select <include refid="BaseInfo"></include> from wgd_cgfy
         where id = #{id}