Merge remote-tracking branch 'origin/develop_master' into develop_1

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -46,6 +46,11 @@ public class ActDefineStartMap {
         map.put("18","policyResearchGroupAttendMeeting");
         map.put("19","policyResearchGroupAfterMeeting");
 
+        //企标复审流程
+        map.put("23","enterpriseBidReviewProcess");
+        map.put("24","Aboliish");
+        map.put("25","enterpriseStandardSystemRevisionPlan");
+
         return map.get(type);
     }
 }

adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/PolicyWorkFlowController.java

@@ -56,7 +56,7 @@ public class PolicyWorkFlowController {
     private PolicyWorkFlowService policyWorkFlowService;
 
     /**
-     * 政策征求意见导出
+     * 纳入重点问题管控
      */
     @PostMapping("/enterIssue")
     @ApiOperation("纳入重点问题管控")

adc-da-activiti/src/main/java/com/adc/da/workFlow/service/PolicyWorkFlowService.java

@@ -21,9 +21,11 @@ public class PolicyWorkFlowService  {
     public boolean enterIssue(String json){
         boolean count=false; //是否成功
         JSONObject dataJsonObj = JSONObject.parseObject(json);
+        JSONObject jsonData = dataJsonObj.getJSONObject("json");
 
-        if ("1".equals(dataJsonObj.getString("department"))) {
-            JSONArray dataList = dataJsonObj.getJSONArray("dataList");
+
+        if ("1".equals(  jsonData.getString("feedbackDept"))) {
+            JSONArray dataList = jsonData.getJSONArray("infoTableDatas");
 
             /**
              * 把json对象转换未实体对象
@@ -31,11 +33,15 @@ public class PolicyWorkFlowService  {
             List<BusinessDeptIssue> data = dataList
                     .stream()
                     .map(jsonObj -> {
-
                         BusinessDeptIssue businessDeptIssue = JSONObject.parseObject(jsonObj.toString(), BusinessDeptIssue.class);
+                        businessDeptIssue.setLawId(businessDeptIssue.getId());
                         businessDeptIssue.setId(UUIDUtils.randomUUID20());
+                        businessDeptIssue.setIsClose("0");
                         return businessDeptIssue;
-                    }).collect(Collectors.toList());
+                    }).collect(Collectors.toList())
+                    .stream()
+                    .filter(item->"1".equals(item.getIsRisk()))
+                    .collect(Collectors.toList());
             count=businessDeptIssueService.saveBatch(data);
 
         }

adc-da-base/src/main/java/com/adc/da/util/WaterMarkUtil.java

@@ -49,15 +49,15 @@ public class WaterMarkUtil {
                 // set Transparency
                 PdfGState gs = new PdfGState();
                 // 设置透明度为0.2
-                gs.setFillOpacity(0.4f);
+                gs.setFillOpacity(0.25f);
                 under.setGState(gs);
                 under.restoreState();
                 under.beginText();
-                under.setFontAndSize(base, 56);
+                under.setFontAndSize(base, 50);
                 under.setTextMatrix(30, 30);
                 under.setColorFill(BaseColor.LIGHT_GRAY);
-                for (int y = 0; y < 10; y++) {
-                    for (int x = 0; x < 8; x++) {
+                for (int y = 0; y < 5; y++) {
+                    for (int x = 0; x < 10; x++) {
                         // 水印文字成45度角倾斜
                         under.showTextAligned(Element.ALIGN_LEFT
                                 , waterMarkName, 100 + 300 * x, 300 * y, 40);

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -78,6 +78,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
     // 拆分查看页，导出程序异常
     addInterceptor.excludePathPatterns("/api/lawss/sarFileSplitItems/exportSplitInfoZip");
 
+    //调研流程下载接口
+    addInterceptor.excludePathPatterns("/api/att/attFile/downloadFile");
+
 
 //    //测试接口使用
 //    addInterceptor.excludePathPatterns("/api/**");

adc-da-main/src/main/resources/application-dev.properties

@@ -61,6 +61,7 @@ spring.rabbitmq.listener.simple.retry.max-attempts= 5
 # 文档存储路径指向
 # ==============================================
 file.path=/usr/laws/file/
+file.split.path=/usr/laws/file/
 
 # 云端OCR识别集成配置参数
 #OCR请求识别URL地址

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java

@@ -0,0 +1,78 @@
+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;
+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(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){
+        List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.queryAllPlans(esRevisePlan);
+        PageInfo<EsRevisePlan> pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans);
+        return Result.success(pageInfo);
+    }
+
+    @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));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/dao/EsRevisePlanDao.java

@@ -0,0 +1,28 @@
+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> {
+    Integer getTotal();
+    Integer getQueryTotal(EsRevisePlan esRevisePlan);
+    List<EsRevisePlan> selectAll(EsRevisePlan esRevisePlan);//查询所有
+    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);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/entity/EsRevisePlan.java

@@ -0,0 +1,60 @@
+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;
+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 extends BasePage {
+
+    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;
+
+}

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(EsRevisePlan esRevisePlan);//查询所有
+    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);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -0,0 +1,69 @@
+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(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) {
+        Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
+        esRevisePlan.getPager().setRowCount(count);
+        List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan);
+        return esRevisePlans;
+    }
+
+    @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);
+    }
+}

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);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java

@@ -86,6 +86,12 @@ public class TsInstitutionController extends BaseController<TsInstitution> {
         return tsInstitutionService.getNext(institutionId,userName);
     }
 
+    @ApiOperation("获得下一级的部门和人员")
+    @GetMapping("/getNextById")
+    public List<TsInstitution> getNextById(String ids){
+        return tsInstitutionService.getNextById(ids);
+    }
+
     @ApiOperation("获得第一级部门目录")
     @GetMapping("/getFirstInstitution")
     public List<TsInstitution> getFirstInstitution(){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/dao/TsInstitutionDao.java

@@ -29,6 +29,8 @@ public interface TsInstitutionDao extends BaseMapper<TsInstitution> {
      */
     List<TsInstitution> selectNextUser(@Param("institutionId") String institutionId,@Param("userName") String userName);
 
+    List<TsInstitution> selectNextUserByIds(@Param("ids") List<String> ids);
+
 
     List<TsInstitution> selectTreeByIds(@Param("rootIds") List<String> rootIds);
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/ITsInstitutionService.java

@@ -37,6 +37,8 @@ public interface ITsInstitutionService extends IService<TsInstitution> {
      */
     public List<TsInstitution> getNext(String institutionId,String userName);
 
+    public List<TsInstitution> getNextById(String ids);
+
     /**
      * 获得第一级的部门
      * @return

adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java

@@ -216,6 +216,13 @@ public class TsInstitutionServiceImpl extends ServiceImpl<TsInstitutionDao, TsIn
         return tsInstitutions;
     }
 
+    public List<TsInstitution> getNextById(String ids){
+        List<String> strings=new ArrayList<>(Arrays.asList(ids.split(",")));
+        List<TsInstitution> tsUsers=tsInstitutionDao.selectNextUserByIds(strings);
+
+        return tsUsers;
+    }
+
 
    public List<TsInstitution> getFirst(){
         //查询第一层机构

adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/controller/IssueTrackController.java

@@ -28,7 +28,12 @@ public class IssueTrackController {
     @ApiOperation("新增重点标准跟踪清单项目")
     public ResponseMessage addIssueTrack(@RequestBody IssueTrack issueTrack){
         boolean b = issueTrackService.addIssueTrack(issueTrack);
-        return Result.success(b);
+
+        if (b){
+        return Result.success("200","成功", true);
+        }else{
+            return Result.error("100","数据不能相同", false);
+        }
     }
 
 
@@ -52,6 +57,12 @@ public class IssueTrackController {
     @ApiOperation("更新重点标准跟踪清单项目")
     public ResponseMessage updateIssueTrack(@RequestBody IssueTrack issueTrack){
         boolean b = issueTrackService.updateIssueTrack(issueTrack);
-        return Result.success(b);
+//        return Result.success("200","数据不能相同",false);
+
+        if (b){
+            return Result.success("200","成功", true);
+        }else{
+            return Result.error("100","数据不能相同", false);
+        }
     }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/dao/IssueTrackDao.java

@@ -1,7 +1,17 @@
 package com.adc.da.slrs.sarIssueTrack.dao;
 
 import com.adc.da.slrs.sarIssueTrack.entity.IssueTrack;
+import com.adc.da.slrs.sarStandUnqualified.entity.ProductDeptIssue;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
 
 public interface IssueTrackDao extends BaseMapper<IssueTrack> {
+
+
+    public IPage<IssueTrack> findPage(IPage<IssueTrack> page, @Param(value = "pageVo") IssueTrack pageVo);
+
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/entity/IssueTrack.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -20,7 +21,17 @@ public class IssueTrack {
   @TableField("law_id")
   private String lawId;
 
-  @TableField("law_name")
+  @ApiModelProperty("国内标准库 INLAND" +
+                    "海外标准库 FOREIGN" +
+                    "国内外政策库 FOREIGN_LAWS" +
+                    "企业标准库 BUSINESS_STAND")
+  @TableField("data_source")
+  private String dataSource;
+
+  @TableField(exist = false)
+  private String lawCode;
+
+  @TableField(exist = false)
   private String lawName;
 
   @TableField("product_type")

adc-da-slrs/src/main/java/com/adc/da/slrs/sarIssueTrack/service/impl/IssueTrackServiceImpl.java

@@ -25,9 +25,20 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
 
     @Override
     public boolean addIssueTrack(IssueTrack obj) {
-        obj.setId(UUIDUtils.randomUUID20());
-        obj.setDelFlag("0");
-        return this.save(obj);
+        QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
+        wrapper.eq("law_id",obj.getLawId())
+                .eq("del_flag","0");
+
+        IssueTrack one = this.getOne(wrapper);
+        if (one==null){
+            return false;
+        }else {
+            obj.setId(UUIDUtils.randomUUID20());
+            obj.setDelFlag("0");
+            return this.save(obj);
+        }
+
+
     }
 
     @Override
@@ -40,26 +51,7 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
 
         IPage<IssueTrack> trackPage = new Page<>(objVo.getPage(), objVo.getPageSize());
 
-        QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
-
-        if (objVo.getPage()!=null && objVo.getPageSize()!=null){
-            trackPage=new Page<>(objVo.getPage(),objVo.getPageSize());
-        }else {
-            Integer count = issueTrackDao.selectCount(wrapper);
-            trackPage=new Page<>(0,count,false);
-        }
-
-        if (objVo.getLawId()!=null){
-            wrapper.like("law_id",objVo.getLawId());
-        }
-        if (objVo.getLawName()!=null){
-            wrapper.like("law_name",objVo.getLawName());
-        }
-        if (objVo.getProductType()!=null){
-            wrapper.like("product_type",objVo.getProductType());
-        }
-
-        trackPage = issueTrackDao.selectPage(trackPage, wrapper);
+        trackPage = issueTrackDao.findPage(trackPage,objVo);
 
 
         return trackPage;
@@ -67,7 +59,16 @@ public class IssueTrackServiceImpl extends ServiceImpl<IssueTrackDao, IssueTrack
 
     @Override
     public boolean updateIssueTrack(IssueTrack obj) {
-
-        return this.updateById(obj);
+        QueryWrapper<IssueTrack> wrapper = new QueryWrapper<>();
+        wrapper.eq("law_id",obj.getLawId());
+        IssueTrack one = this.getOne(wrapper);
+        if (one==null){
+            return false;
+        }else {
+            obj.setId(UUIDUtils.randomUUID20());
+            obj.setDelFlag("0");
+            return this.updateById(obj);
+        }
     }
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.sarStandProjectLibrary.controller;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto;
@@ -100,8 +101,8 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
      **/
     @GetMapping("/queryProjectManager")
     @ApiOperation("查询产品线项目经理")
-    public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize){
-        IPage<SarStandProjectLibrary> list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize);
+    public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize, standDTO standDTO){
+        IPage<SarStandProjectLibrary> list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize, standDTO);
         // 创建一个新的list集合，用于存储去重后的元素
         List<productLineDto> listTemp = new ArrayList();
         for (SarStandProjectLibrary sarStandProjectLibrary:list1.getRecords()){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java

@@ -30,4 +30,5 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
         List<String> getAllStand();
         List<SarStandProjectLibrary> updateByProjectId(@Param("id")String id, @Param("version")String version);
         void deleteByProjectId(@Param("projectId")String projectId);
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/standDTO.java

@@ -0,0 +1,11 @@
+package com.adc.da.slrs.sarStandProjectLibrary.dao;
+
+import lombok.Data;
+
+@Data
+public class standDTO {
+
+    private String uname;
+
+    private String productLine;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.sarStandProjectLibrary.service;
 
+import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,7 +18,7 @@ public interface SarStandProjectLibraryService {
     List<String> queryNotMaintenanceProjectsolostar(String type);
     Map<String, Object> solostar();
     List<SarStandProjectLibrary> queryById(String id);
-    IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize);
+    IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize, standDTO standDTO);
     List<SarStandProjectLibrary> queryByProductLine(String productLine);
     List<SarStandProjectLibrary> queryStandId(String standId);
     IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId, String cars);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl;
 import com.adc.da.ocr.util.UUIDUtils;
 import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
 import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
+import com.adc.da.slrs.sarStandProjectLibrary.dao.standDTO;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.*;
 import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao;
 import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head;
@@ -260,11 +261,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         return list;
     }
     @Override
-    public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize) {
+    public IPage<SarStandProjectLibrary> queryProjectManager(int current, int pageSize, standDTO standDTO) {
+        StringBuilder stringBuilder=new StringBuilder();
+        stringBuilder.append("where 1=1 ");
+        if (null!=standDTO.getUname() && !"".equals(standDTO.getUname())){
+            stringBuilder.append("and s.NAME like '%"+standDTO.getUname()+"%' ");
+        }
+        if (null!=standDTO.getProductLine() && !"".equals(standDTO.getProductLine())){
+            stringBuilder.append("and sar_stand_project_library.product_line like '%"+standDTO.getProductLine()+"%' ");
+        }
+
         QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
         wrapper.select("product_line","s.user_id as projectManager","s.NAME AS uName");
         wrapper.last("inner join sar_stand_project_team s on s.project_code = sar_stand_project_library.project_number" +
-                " and sar_stand_project_library.product_line IS not NULL");
+                " and sar_stand_project_library.product_line IS not NULL "+stringBuilder.toString());
         Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
         IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
         System.out.println("总条数"+userIPage.getTotal());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/BusinessDeptIssue.java

@@ -85,6 +85,10 @@ public class BusinessDeptIssue {
   @TableField("is_close")
   private String isClose;
 
+  @ExcelIgnore
+  @TableField("is_risk")
+  private String isRisk;
+
   @ExcelIgnore
   @TableField(exist = false)
   private Integer page;

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java

@@ -42,6 +42,9 @@ public class EarlyWarningEO extends BaseEntity {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date putTime;
 
+    @TableField(exist = false)
+    private Date lastTime;
+
     @TableField("APPLY_TYPE")
     private String applyType;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java

@@ -53,7 +53,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         if (earlyWarningEO.getPutTime() != null ){
             SimpleDateFormat formater = new SimpleDateFormat();
             formater.applyPattern("yyyy-MM-dd");
-            wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
+            if (earlyWarningEO.getLastTime() != null){
+                wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime()));
+            }else {
+                wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime()));
+            }
+        }
+        if (earlyWarningEO.getLastTime()!=null){
+            SimpleDateFormat formater = new SimpleDateFormat();
+            formater.applyPattern("yyyy-MM-dd");
+            wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime()));
         }
         //根据适用车型查询
         if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
@@ -77,7 +86,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         if (earlyWarningEO.getPutTime() != null ){
             SimpleDateFormat formater = new SimpleDateFormat();
             formater.applyPattern("yyyy-MM-dd");
-            wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
+            if (earlyWarningEO.getLastTime() != null){
+                wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime()));
+            }else {
+                wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime()));
+            }
+        }
+        if (earlyWarningEO.getLastTime()!=null){
+            SimpleDateFormat formater = new SimpleDateFormat();
+            formater.applyPattern("yyyy-MM-dd");
+            wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime()));
         }
         //根据适用车型查询
         if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
@@ -101,7 +119,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         if (earlyWarningEO.getPutTime() != null ){
             SimpleDateFormat formater = new SimpleDateFormat();
             formater.applyPattern("yyyy-MM-dd");
-            wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
+            if (earlyWarningEO.getLastTime() != null){
+                wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime()));
+            }else {
+                wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime()));
+            }
+        }
+        if (earlyWarningEO.getLastTime()!=null){
+            SimpleDateFormat formater = new SimpleDateFormat();
+            formater.applyPattern("yyyy-MM-dd");
+            wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime()));
         }
         //根据适用车型查询
         if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){
@@ -125,7 +152,16 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
         if (earlyWarningEO.getPutTime() != null ){
             SimpleDateFormat formater = new SimpleDateFormat();
             formater.applyPattern("yyyy-MM-dd");
-            wrapper.eq("PUT_TIME",formater.format(earlyWarningEO.getPutTime()));
+            if (earlyWarningEO.getLastTime() != null){
+                wrapper.between("PUT_TIME",formater.format(earlyWarningEO.getPutTime()),formater.format(earlyWarningEO.getLastTime()));
+            }else {
+                wrapper.ge("PUT_TIME", formater.format(earlyWarningEO.getPutTime()));
+            }
+        }
+        if (earlyWarningEO.getLastTime()!=null){
+            SimpleDateFormat formater = new SimpleDateFormat();
+            formater.applyPattern("yyyy-MM-dd");
+            wrapper.le("PUT_TIME", formater.format(earlyWarningEO.getLastTime()));
         }
         //根据适用车型查询
         if (earlyWarningEO.getApplyType() != null && earlyWarningEO.getApplyType().length() != 0){

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitInfoEOController.java

@@ -4,6 +4,8 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
+
 import com.adc.da.base.web.BaseController;
 import com.adc.da.http.PageInfo;
 import com.adc.da.person.entity.PersonMsgEO;
@@ -193,20 +195,40 @@ public class SarFileSplitInfoEOController extends BaseController<SarFileSplitInf
             /**
              * 使选定的拆分条款 插入分解单
              */
-            querySame.forEach(item->{
-                QueryWrapper<SarStandItems> sarStandItemsQueryWrapper = new QueryWrapper<>();
-                sarStandItemsQueryWrapper.eq("edit_flag",item.getEditFlag());
-                SarStandItems sarStandItems = new SarStandItems();
-                sarStandItems.setStandId(sarFileSplitInfoEO.getStandId());
-                sarStandItems.setEditFlag(item.getEditFlag());
-                sarStandItems.setItemsName(item.getItemsName());
-                sarStandItems.setTermsConditions(item.getItermsConditions());
-                sarStandItems.setItemsNum(item.getItemsNum());
-                sarStandItems.setId(UUIDUtils.randomUUID20());
-                sarStandItems.setFileType(sarFileSplitInfoEO.getFileType());
-                ServiceImpl.saveOrUpdate(sarStandItems,sarStandItemsQueryWrapper);
 
-            });
+            List<SarStandItems> sarStandItemList = querySame.stream()
+                    .map(item -> {
+                        SarStandItems sarStandItem = new SarStandItems();
+                        sarStandItem.setStandId(sarFileSplitInfoEO.getStandId());
+                        sarStandItem.setEditFlag(item.getEditFlag());
+                        sarStandItem.setItemsName(item.getItemsName());
+                        sarStandItem.setTermsConditions(item.getItermsConditions());
+                        sarStandItem.setItemsNum(item.getItemsNum());
+                        sarStandItem.setId(UUIDUtils.randomUUID20());
+                        sarStandItem.setFileType(sarFileSplitInfoEO.getFileType());
+
+                        sarStandItem.setEditFlag(item.getEditFlag());
+                        return sarStandItem;
+                    })
+                    .collect(Collectors.toList());
+
+            ServiceImpl.saveBatch(sarStandItemList);
+
+
+//            querySame.forEach(item->{
+//                QueryWrapper<SarStandItems> sarStandItemsQueryWrapper = new QueryWrapper<>();
+//                sarStandItemsQueryWrapper.eq("edit_flag",item.getEditFlag());
+//                SarStandItems sarStandItems = new SarStandItems();
+//                sarStandItems.setStandId(sarFileSplitInfoEO.getStandId());
+//                sarStandItems.setEditFlag(item.getEditFlag());
+//                sarStandItems.setItemsName(item.getItemsName());
+//                sarStandItems.setTermsConditions(item.getItermsConditions());
+//                sarStandItems.setItemsNum(item.getItemsNum());
+//                sarStandItems.setId(UUIDUtils.randomUUID20());
+//                sarStandItems.setFileType(sarFileSplitInfoEO.getFileType());
+//                ServiceImpl.saveOrUpdate(sarStandItems,sarStandItemsQueryWrapper);
+//
+//            });
 
 
             //根据标准号查询标准是否存在

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java

@@ -57,6 +57,8 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
     private IAttFileEOService attFileEOService;
     @Value("${file.path}")
     private String filePath;//文件存储路径
+    @Value("${file.split.path}")
+    private String splitFilePath;//拆分图片存储路径
     /**
      * 文件下载路径
      */
@@ -480,7 +482,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService
             try {
                 FileOutputStream fos = new FileOutputStream(filepathandname);
                 fos.write(bytev);
-                String path = "uploadPath/img/" + imageName;
+                String path = splitFilePath +"/" + imageName;
                 String imgCon = "<img class=\'wordImg\' src=\'" + path + "\'>";
                 message.getItemsCondi().add(imgCon);
                 message.setItermsConditions(message.getItermsConditions() + imgCon);

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdCgfyController.java

@@ -0,0 +1,72 @@
+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.WgdCgfy;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 委员信息数据统计 前端控制器
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@RestController
+@Api(description = "|WgdCgfy|")
+@RequestMapping("api/wgdCensusLeo/wgd-cgfy")
+public class WgdCgfyController extends BaseController<WgdCgfy> {
+    @Autowired
+    IWgdCgfyService iWgdCgfyService;
+
+    @GetMapping("/getAllCgfys")
+    public ResponseMessage<Object> getAllWgdCgfys(){//查询所有
+        return Result.success(iWgdCgfyService.getAllWgdCgfys());
+    }
+
+    @ApiOperation("查询")
+    @GetMapping("/queryAllCgfys")
+    public ResponseMessage<Object> queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询
+        List<WgdCgfy> wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy);
+        PageInfo pageInfo = getPageInfo(wgdCgfy.getPager(),wgdCgfys);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("/getCgfyById")
+    public ResponseMessage<Object> getWgdCgfyById(String id) {//查询详情
+        return Result.success(iWgdCgfyService.getWgdCgfyById(id));
+    }
+
+    @ApiOperation("更新")
+    @PostMapping("/modCgfy")
+    ResponseMessage<Object> updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑
+        return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/addCgfy")
+    ResponseMessage<Object> insertWgdCgfy(WgdCgfy WgdCgfy) {//插入
+        return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy));
+    }
+
+    @PostMapping("/delCgfy")
+    ResponseMessage<Object> deleteWgdCgfy(String id){//删除
+        return Result.success(iWgdCgfyService.deleteWgdCgfy(id));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("/delCgfys")
+    ResponseMessage<Object> deleteWgdCgfys(String ids){//批量删除
+        return Result.success(iWgdCgfyService.deleteWgdCgfys(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdFyfyController.java

@@ -0,0 +1,72 @@
+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;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 翻译费用信息统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdFyfy|")
+@RequestMapping("api/wgdCensusLeo/wgd-fyfy")
+public class WgdFyfyController extends BaseController<WgdFyfy> {
+    @Autowired
+    IWgdFyfyService iWgdFyfyService;
+
+    @GetMapping("/getAllFyfys")
+    public ResponseMessage<Object> getAllWgdFyfys(){//查询所有
+        return Result.success(iWgdFyfyService.getAllWgdFyfys());
+    }
+
+    @ApiOperation("查询")
+    @GetMapping("/queryAllFyfys")
+    public ResponseMessage<Object> queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询
+        List<WgdFyfy> wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy);
+        PageInfo pageInfo = getPageInfo(wgdFyfy.getPager(),wgdFyfys);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("/getFyfyById")
+    public ResponseMessage<Object> getWgdFyfyById(String id) {//查询详情
+        return Result.success(iWgdFyfyService.getWgdFyfyById(id));
+    }
+
+    @ApiOperation("更新")
+    @PostMapping("/modFyfy")
+    ResponseMessage<Object> updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑
+        return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/addFyfy")
+    ResponseMessage<Object> insertWgdFyfy(WgdFyfy WgdFyfy) {//插入
+        return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy));
+    }
+
+    @PostMapping("/delFyfy")
+    ResponseMessage<Object> deleteWgdFyfy(String id){//删除
+        return Result.success(iWgdFyfyService.deleteWgdFyfy(id));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("/delFyfys")
+    ResponseMessage<Object> deleteWgdFyfys(String ids){//批量删除
+        return Result.success(iWgdFyfyService.deleteWgdFyfys(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdSrbController.java

@@ -0,0 +1,72 @@
+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 io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 标准制修订补助资金收支统计收入表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdSrb|")
+@RequestMapping("api/wgdCensusLeo/wgd-srb")
+public class WgdSrbController extends BaseController<WgdSrb> {
+    @Autowired
+    IWgdSrbService iWgdSrbService;
+
+    @GetMapping("/getAllSrbs")
+    public ResponseMessage<Object> getAllWgdSrbs(){//查询所有
+        return Result.success(iWgdSrbService.getAllWgdSrbs());
+    }
+
+    @ApiOperation("查询")
+    @GetMapping("/queryAllSrbs")
+    public ResponseMessage<Object> queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询
+        List<WgdSrb> wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb);
+        PageInfo pageInfo = getPageInfo(wgdSrb.getPager(),wgdSrbs);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("/getSrbById")
+    public ResponseMessage<Object> getWgdSrbById(String id) {//查询详情
+        return Result.success(iWgdSrbService.getWgdSrbById(id));
+    }
+
+    @ApiOperation("更新")
+    @PostMapping("/modSrb")
+    ResponseMessage<Object> updateWgdSrb(WgdSrb WgdSrb) {//编辑
+        return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/addSrb")
+    ResponseMessage<Object> insertWgdSrb(WgdSrb WgdSrb) {//插入
+        return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb));
+    }
+
+    @PostMapping("/delSrb")
+    ResponseMessage<Object> deleteWgdSrb(String id){//删除
+        return Result.success(iWgdSrbService.deleteWgdSrb(id));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("/delSrbs")
+    ResponseMessage<Object> deleteWgdSrbs(String ids){//批量删除
+        return Result.success(iWgdSrbService.deleteWgdSrbs(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java

@@ -0,0 +1,72 @@
+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;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 参与外部协会会议统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdWbtj|")
+@RequestMapping("api/wgdCensusLeo/wgd-wbtj")
+public class WgdWbtjController extends BaseController<WgdWbtj> {
+    @Autowired
+    IWgdWbtjService iWgdWbtjService;
+
+    @GetMapping("/getAllWbtjs")
+    public ResponseMessage<Object> getAllWgdWbtjs(){//查询所有
+        return Result.success(iWgdWbtjService.getAllWgdWbtjs());
+    }
+
+    @ApiOperation("查询")
+    @GetMapping("/queryAllWbtjs")
+    public ResponseMessage<Object> queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询
+        List<WgdWbtj> wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj);
+        PageInfo pageInfo = getPageInfo(wgdWbtj.getPager(),wgdWbtjs);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("/getWbtjById")
+    public ResponseMessage<Object> getWgdWbtjById(String id) {//查询详情
+        return Result.success(iWgdWbtjService.getWgdWbtjById(id));
+    }
+
+    @ApiOperation("更新")
+    @PostMapping("/modWbtj")
+    ResponseMessage<Object> updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑
+        return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/addWbtj")
+    ResponseMessage<Object> insertWgdWbtj(WgdWbtj WgdWbtj) {//插入
+        return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj));
+    }
+
+    @PostMapping("/delWbtj")
+    ResponseMessage<Object> deleteWgdWbtj(String id){//删除
+        return Result.success(iWgdWbtjService.deleteWgdWbtj(id));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("/delWbtjs")
+    ResponseMessage<Object> deleteWgdWbtjs(String ids){//批量删除
+        return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbxdController.java

@@ -0,0 +1,72 @@
+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;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbxdService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 参与外部标准制修订信息统计 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdWbxd|")
+@RequestMapping("api/wgdCensusLeo/wgd-wbxd")
+public class WgdWbxdController extends BaseController<WgdWbxd> {
+    @Autowired
+    IWgdWbxdService iWgdWbxdService;
+
+    @GetMapping("/getAllWbxds")
+    public ResponseMessage<Object> getAllWgdWbxds(){//查询所有
+        return Result.success(iWgdWbxdService.getAllWgdWbxds());
+    }
+
+    @ApiOperation("查询")
+    @GetMapping("/queryAllWbxds")
+    public ResponseMessage<Object> queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询
+        List<WgdWbxd> wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd);
+        PageInfo pageInfo = getPageInfo(wgdWbxd.getPager(),wgdWbxds);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("/getWbxdById")
+    public ResponseMessage<Object> getWgdWbxdById(String id) {//查询详情
+        return Result.success(iWgdWbxdService.getWgdWbxdById(id));
+    }
+
+    @ApiOperation("更新")
+    @PostMapping("/modWbxd")
+    ResponseMessage<Object> updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑
+        return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/addWbxd")
+    ResponseMessage<Object> insertWgdWbxd(WgdWbxd WgdWbxd) {//插入
+        return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd));
+    }
+
+    @PostMapping("/delWbxd")
+    ResponseMessage<Object> deleteWgdWbxd(String id){//删除
+        return Result.success(iWgdWbxdService.deleteWgdWbxd(id));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("/delWbxds")
+    ResponseMessage<Object> deleteWgdWbxds(String ids){//批量删除
+        return Result.success(iWgdWbxdService.deleteWgdWbxds(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdZcbController.java

@@ -0,0 +1,72 @@
+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 io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 标准制修订补助资金收支统计支出表 前端控制器
+    * </p>
+*
+* @author super_liu
+* @since 2021-11-12
+*/
+@RestController
+@Api(description = "|WgdZcb|")
+@RequestMapping("api/wgdCensusLeo/wgd-zcb")
+public class WgdZcbController extends BaseController<WgdZcb> {
+    @Autowired
+    IWgdZcbService iWgdZcbService;
+
+    @GetMapping("/getAllZcbs")
+    public ResponseMessage<Object> getAllWgdZcbs(){//查询所有
+        return Result.success(iWgdZcbService.getAllWgdZcbs());
+    }
+
+    @ApiOperation("查询")
+    @GetMapping("/queryAllZcbs")
+    public ResponseMessage<Object> queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询
+        List<WgdZcb> wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb);
+        PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs);
+        return Result.success(pageInfo);
+    }
+
+    @GetMapping("/getZcbById")
+    public ResponseMessage<Object> getWgdZcbById(String id) {//查询详情
+        return Result.success(iWgdZcbService.getWgdZcbById(id));
+    }
+
+    @ApiOperation("更新")
+    @PostMapping("/modZcb")
+    ResponseMessage<Object> updateWgdZcb(WgdZcb WgdZcb) {//编辑
+        return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("/addZcb")
+    ResponseMessage<Object> insertWgdZcb(WgdZcb WgdZcb) {//插入
+        return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb));
+    }
+
+    @PostMapping("/delZcb")
+    ResponseMessage<Object> deleteWgdZcb(String id){//删除
+        return Result.success(iWgdZcbService.deleteWgdZcb(id));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("/delZcbs")
+    ResponseMessage<Object> deleteWgdZcbs(String ids){//批量删除
+        return Result.success(iWgdZcbService.deleteWgdZcbs(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdCgfyDao.java

@@ -0,0 +1,26 @@
+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> {
+    Integer getQueryTotal(WgdCgfy 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);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdFyfyDao.java

@@ -0,0 +1,32 @@
+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> {
+    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);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdSrbDao.java

@@ -0,0 +1,26 @@
+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> {
+    Integer getQueryTotal(WgdSrb 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);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbtjDao.java

@@ -0,0 +1,26 @@
+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> {
+    Integer getQueryTotal(WgdWbtj 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);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdWbxdDao.java

@@ -0,0 +1,26 @@
+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> {
+    Integer getQueryTotal(WgdWbxd 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);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/dao/WgdZcbDao.java

@@ -0,0 +1,26 @@
+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> {
+    Integer getQueryTotal(WgdZcb 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);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdCgfy.java

@@ -0,0 +1,48 @@
+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;
+
+/**
+ * <p>
+ * 采购费用信息统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdCgfy对象", description="采购费用信息统计")
+public class WgdCgfy extends BasePage {
+
+    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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdFyfy.java

@@ -0,0 +1,56 @@
+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>
+ * 翻译费用信息统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdFyfy对象", description="翻译费用信息统计")
+public class WgdFyfy extends BasePage {
+
+    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 = "翻译完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String time;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdSrb.java

@@ -0,0 +1,49 @@
+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>
+ * 标准制修订补助资金收支统计收入表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdSrb对象", description="标准制修订补助资金收支统计收入表")
+public class WgdSrb extends BasePage {
+
+    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 cost;
+
+    @ApiModelProperty(value = "入账时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String time;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java

@@ -0,0 +1,73 @@
+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>
+ * 参与外部协会会议统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdWbtj对象", description="参与外部协会会议统计")
+public class WgdWbtj extends BasePage {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "主办单位")
+    private String host;
+
+    @ApiModelProperty(value = "会议名称")
+    private String meeting;
+
+    @ApiModelProperty(value = "会议时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbxd.java

@@ -0,0 +1,99 @@
+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>
+ * 参与外部标准制修订信息统计
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdWbxd对象", description="参与外部标准制修订信息统计")
+public class WgdWbxd extends BasePage {
+
+    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 = "发布日期")
+    @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 = "颁布机构")
+    private String body;
+
+    @ApiModelProperty(value = "牵头起草单位")
+    private String drafting;
+
+    @ApiModelProperty(value = "备案时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdZcb.java

@@ -0,0 +1,44 @@
+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;
+
+/**
+ * <p>
+ * 标准制修订补助资金收支统计支出表
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value="WgdZcb对象", description="标准制修订补助资金收支统计支出表")
+public class WgdZcb extends BasePage {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    @ApiModelProperty(value = "项目名称")
+    private String name;
+
+    @ApiModelProperty(value = "支出金额")
+    private String cost;
+
+    @ApiModelProperty(value = "用途")
+    private String use;
+
+    @ApiModelProperty(value = "详细附件")
+    private String annex;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdCgfyService.java

@@ -0,0 +1,25 @@
+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> {
+    List<WgdCgfy> getAllWgdCgfys();//查询所有
+    List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy);//多条件查询
+    WgdCgfy getWgdCgfyById(String id);//查询详情
+
+    int updateWgdCgfy(WgdCgfy wgdCgfy);//编辑
+    int insertWgdCgfy(WgdCgfy wgdCgfy);//插入
+    int deleteWgdCgfy(String id);//删除
+    int deleteWgdCgfys(String ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdFyfyService.java

@@ -0,0 +1,25 @@
+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> {
+    List<WgdFyfy> getAllWgdFyfys();//查询所有
+    List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy);//多条件查询
+    WgdFyfy getWgdFyfyById(String id);//查询详情
+
+    int updateWgdFyfy(WgdFyfy wgdFyfy);//编辑
+    int insertWgdFyfy(WgdFyfy wgdFyfy);//插入
+    int deleteWgdFyfy(String id);//删除
+    int deleteWgdFyfys(String ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdSrbService.java

@@ -0,0 +1,25 @@
+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> {
+    List<WgdSrb> getAllWgdSrbs();//查询所有
+    List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb);//多条件查询
+    WgdSrb getWgdSrbById(String id);//查询详情
+
+    int updateWgdSrb(WgdSrb wgdSrb);//编辑
+    int insertWgdSrb(WgdSrb wgdSrb);//插入
+    int deleteWgdSrb(String id);//删除
+    int deleteWgdSrbs(String ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbtjService.java

@@ -0,0 +1,25 @@
+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> {
+    List<WgdWbtj> getAllWgdWbtjs();//查询所有
+    List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj);//多条件查询
+    WgdWbtj getWgdWbtjById(String id);//查询详情
+
+    int updateWgdWbtj(WgdWbtj wgdWbtj);//编辑
+    int insertWgdWbtj(WgdWbtj wgdWbtj);//插入
+    int deleteWgdWbtj(String id);//删除
+    int deleteWgdWbtjs(String ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdWbxdService.java

@@ -0,0 +1,25 @@
+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> {
+    List<WgdWbxd> getAllWgdWbxds();//查询所有
+    List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd);//多条件查询
+    WgdWbxd getWgdWbxdById(String id);//查询详情
+
+    int updateWgdWbxd(WgdWbxd wgdWbxd);//编辑
+    int insertWgdWbxd(WgdWbxd wgdWbxd);//插入
+    int deleteWgdWbxd(String id);//删除
+    int deleteWgdWbxds(String ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/IWgdZcbService.java

@@ -0,0 +1,25 @@
+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> {
+    List<WgdZcb> getAllWgdZcbs();//查询所有
+    List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb);//多条件查询
+    WgdZcb getWgdZcbById(String id);//查询详情
+
+    int updateWgdZcb(WgdZcb wgdZcb);//编辑
+    int insertWgdZcb(WgdZcb wgdZcb);//插入
+    int deleteWgdZcb(String id);//删除
+    int deleteWgdZcbs(String ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdCgfyServiceImpl.java

@@ -0,0 +1,66 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
+import com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao;
+import com.adc.da.slrs.wgdCensusLeo.service.IWgdCgfyService;
+import com.adc.da.util.MD5Util;
+import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 采购费用信息统计 服务实现类
+ * </p>
+ *
+ * @author super_liu
+ * @since 2021-11-12
+ */
+@Service
+public 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) {
+        Integer count = wgdCgfyDao.getQueryTotal(wgdCgfy);
+        wgdCgfy.getPager().setRowCount(count);
+        return wgdCgfyDao.queryAll(wgdCgfy);
+    }
+
+    @Override
+    public WgdCgfy getWgdCgfyById(String id) {
+        return wgdCgfyDao.selectById(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);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdFyfyServiceImpl.java

@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+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;
+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 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) {
+        Integer count = wgdFyfyDao.getQueryTotal(wgdFyfy);
+        wgdFyfy.getPager().setRowCount(count);
+        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);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdSrbServiceImpl.java

@@ -0,0 +1,65 @@
+package com.adc.da.slrs.wgdCensusLeo.service.impl;
+
+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;
+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 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) {
+        Integer count = wgdSrbDao.getQueryTotal(wgdSrb);
+        wgdSrb.getPager().setRowCount(count);
+        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);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbtjServiceImpl.java

@@ -0,0 +1,65 @@
+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 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) {
+        Integer count = wgdWbtjDao.getQueryTotal(wgdWbtj);
+        wgdWbtj.getPager().setRowCount(count);
+        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);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdWbxdServiceImpl.java

@@ -0,0 +1,65 @@
+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 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) {
+        Integer count = wgdWbxdDao.getQueryTotal(wgdWbxd);
+        wgdWbxd.getPager().setRowCount(count);
+        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);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/service/impl/WgdZcbServiceImpl.java

@@ -0,0 +1,65 @@
+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 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) {
+        Integer count = wgdZcbDao.getQueryTotal(wgdZcb);
+        wgdZcb.getPager().setRowCount(count);
+        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);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocCostController.java

@@ -0,0 +1,81 @@
+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;
+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;
+
+    @ApiOperation("查询所有信息")
+    @GetMapping("getAllAssocCosts")
+    public ResponseMessage<Object> getAllWgdAssocCosts(WgdAssocCost page){//查询所有
+        List<WgdAssocCost> wgdAssocCosts = iWgdAssocCostService.getAllWgdAssocCosts(page);
+        PageInfo<WgdAssocCost> pageInfo = getPageInfo(page.getPager(), wgdAssocCosts);
+        return Result.success(pageInfo);
+    }
+
+    @ApiOperation("多条件查询")
+    @GetMapping("queryAllAssocCosts")
+    public ResponseMessage<Object> queryAllWgdAssocCosts(WgdAssocCost 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("编辑")
+    @PutMapping("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("批量删除")
+    @DeleteMapping("delAssocCosts")
+    ResponseMessage<Object> deleteWgdAssocCosts(String ids){//批量删除
+        return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java

@@ -0,0 +1,72 @@
+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 io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+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 = "|WgdAssocInfo|")
+@RequestMapping("api/wgdCensusZ/wgd-assoc-info")
+public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
+    @Autowired
+    IWgdAssocInfoService iWgdAssocInfoService;
+
+    @GetMapping("getAllAssocInfos")
+    public ResponseMessage<Object> getAllWgdAssocInfos(){//查询所有
+        return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos());
+    }
+
+    @ApiOperation("查询")
+    @GetMapping("queryAllAssocInfos")
+    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 ResponseMessage<Object> getWgdAssocInfoById(String id) {//查询详情
+        return Result.success(iWgdAssocInfoService.getWgdAssocInfoById(id));
+    }
+
+    @ApiOperation("更改")
+    @PostMapping("modAssocInfo")
+    ResponseMessage<Object> updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑
+        return Result.success(iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("addAssocInfo")
+    ResponseMessage<Object> insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入
+        return Result.success(iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo));
+    }
+
+    @GetMapping("delAssocInfo")
+    ResponseMessage<Object> deleteWgdAssocInfo(String id){//删除
+        return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("delAssocInfos")
+    ResponseMessage<Object> deleteWgdAssocInfos(String ids){//批量删除
+        return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java

@@ -0,0 +1,72 @@
+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 io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 委员信息数据统计 前端控制器
+    * </p>
+*
+* @author 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 ResponseMessage<Object> getAllWgdCommiInfos(){//查询所有
+        return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos());
+    }
+
+    @ApiOperation("查询")
+    @GetMapping("queryAllCommiInfos")
+    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 ResponseMessage<Object> getWgdCommiInfoById(String id) {//查询详情
+        return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id));
+    }
+
+    @ApiOperation("更新")
+    @PostMapping("modCommiInfo")
+    ResponseMessage<Object> updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
+        return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("addCommiInfo")
+    ResponseMessage<Object> insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
+        return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo));
+    }
+
+    @GetMapping("delCommiInfo")
+    ResponseMessage<Object> deleteWgdCommiInfo(String id){//删除
+        return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id));
+    }
+
+    @ApiOperation("删除")
+    @PostMapping("delCommiInfos")
+    ResponseMessage<Object> deleteWgdCommiInfos(String ids){//批量删除
+        return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdExReviseCostController.java

@@ -0,0 +1,72 @@
+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 io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+import java.util.List;
+
+/**
+* <p>
+    * 参与外部标准制修订费用统计 前端控制器
+    * </p>
+*
+* @author 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 ResponseMessage<Object> getAllWgdExReviseCosts(){//查询所有
+        return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts());
+    }
+
+    @ApiOperation("查询")
+    @GetMapping("queryAllExReviseCosts")
+    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 ResponseMessage<Object> getWgdExReviseCostById(String id) {//查询详情
+        return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id));
+    }
+
+    @ApiOperation("更改")
+    @PutMapping("modExReviseCost")
+    ResponseMessage<Object> updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
+        return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost));
+    }
+
+    @ApiOperation("插入")
+    @PostMapping("addExReviseCost")
+    ResponseMessage<Object> insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入
+        return Result.success(iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost));
+    }
+
+    @GetMapping("delExReviseCost")
+    ResponseMessage<Object> deleteWgdExReviseCost(String id){//删除
+        return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id));
+    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("delExReviseCosts")
+    ResponseMessage<Object> deleteWgdExReviseCosts(String ids){//批量删除
+        return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids));
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdMeetCostController.java

@@ -0,0 +1,69 @@
+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 io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import com.adc.da.base.web.BaseController;
+
+
+/**
+* <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;
+
+    @ApiOperation("查询")
+    @GetMapping("queryAllMeetCosts")
+    public ResponseMessage<Object> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询
+        PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost));
+        return Result.success(pageInfo);
+    }
+
+    @ApiOperation("更新")
+    @PutMapping("modMeetCost")
+    ResponseMessage<Object> updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
+        return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost));
+    }
+
+    @ApiOperation("添加")
+    @PostMapping("addMeetCost")
+    ResponseMessage<Object> insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入
+        return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost));
+    }
+
+    @ApiOperation("删除")
+    @DeleteMapping("delMeetCosts")
+    ResponseMessage<Object> deleteWgdMeetCosts(String ids){//批量删除
+        return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids));
+    }
+
+    @GetMapping("getAllMeetCosts")
+    public ResponseMessage<Object> getAllWgdMeetCosts(){//查询所有
+        return Result.success(iWgdMeetCostService.getAllWgdMeetCosts());
+    }
+    @GetMapping("getMeetCostById")
+    public ResponseMessage<Object> getWgdMeetCostById(String id) {//查询详情
+        return Result.success(iWgdMeetCostService.getWgdMeetCostById(id));
+    }
+    @GetMapping("delMeetCost")
+    ResponseMessage<Object> deleteWgdMeetCost(String id){//删除
+        return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id));
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocCostDao.java

@@ -0,0 +1,32 @@
+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;
+
+/**
+ * <p>
+ * 协会费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface WgdAssocCostDao extends BaseMapper<WgdAssocCost> {
+    Integer getTotal();//总数
+    Integer getQueryTotal(WgdAssocCost wgdAssocCost);//总数
+    List<WgdAssocCost> selectAll(WgdAssocCost page);//查询所有
+    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);//批量删除
+
+}
+

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdAssocInfoDao.java

@@ -0,0 +1,28 @@
+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 WgdAssocInfoDao extends BaseMapper<WgdAssocInfo> {
+    Integer getQueryTotal(WgdAssocInfo 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(String[] ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdCommiInfoDao.java

@@ -0,0 +1,29 @@
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 委员信息数据统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @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);//查询详情
+
+    int updateOne(WgdCommiInfo wgdCommiInfo);//编辑
+    int insertOne(WgdCommiInfo wgdCommiInfo);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch(String[] ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdExReviseCostDao.java

@@ -0,0 +1,29 @@
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 参与外部标准制修订费用统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @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);//查询详情
+
+    int updateOne(WgdExReviseCost wgdExReviseCost);//编辑
+    int insertOne(WgdExReviseCost wgdExReviseCost);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch(String[] ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/dao/WgdMeetCostDao.java

@@ -0,0 +1,29 @@
+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;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 参会费用信息统计 Mapper 接口
+ * </p>
+ *
+ * @author zcr
+ * @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);//查询详情
+
+    int updateOne(WgdMeetCost wgdMeetCost);//编辑
+    int insertOne(WgdMeetCost wgdMeetCost);//插入
+    int deleteOne(String id);//删除
+    int deleteBatch(String[] ids);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocCost.java

@@ -0,0 +1,49 @@
+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;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 协会费用信息统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdAssocCost对象", description="协会费用信息统计")
+public class WgdAssocCost extends BasePage {
+
+    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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdAssocInfo.java

@@ -0,0 +1,145 @@
+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;
+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 extends BasePage {
+
+    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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdCommiInfo.java

@@ -0,0 +1,77 @@
+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;
+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 extends BasePage {
+
+    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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdExReviseCost.java

@@ -0,0 +1,43 @@
+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;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 参与外部标准制修订费用统计
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计")
+public class WgdExReviseCost extends BasePage {
+
+    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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/entity/WgdMeetCost.java

@@ -0,0 +1,50 @@
+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;
+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 extends BasePage {
+
+    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;
+
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/IWgdAssocCostService.java

@@ -0,0 +1,28 @@
+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;
+
+/**
+ * <p>
+ * 协会费用信息统计 服务类
+ * </p>
+ *
+ * @author zcr
+ * @since 2021-11-12
+ */
+public interface IWgdAssocCostService extends IService<WgdAssocCost> {
+    List<WgdAssocCost> getAllWgdAssocCosts(WgdAssocCost page);//查询所有
+    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);//批量删除
+}

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);//批量删除
+}

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);//批量删除
+}

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);//批量删除
+}

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);//批量删除
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocCostServiceImpl.java

@@ -0,0 +1,72 @@
+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.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;
+
+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(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) {
+        Integer count = wgdAssocCostDao.getQueryTotal(wgdAssocCost);
+        wgdAssocCost.getPager().setRowCount(count);
+        List<WgdAssocCost> wgdAssocCosts = wgdAssocCostDao.queryAll(wgdAssocCost);
+        return wgdAssocCosts;
+    }
+
+    @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);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdAssocInfoServiceImpl.java

@@ -0,0 +1,65 @@
+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) {
+        Integer count = wgdAssocInfoDao.getQueryTotal(wgdAssocInfo);
+        wgdAssocInfo.getPager().setRowCount(count);
+        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) {
+        String[] str = ids.split(",");
+        return wgdAssocInfoDao.deleteBatch(str);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdCommiInfoServiceImpl.java

@@ -0,0 +1,68 @@
+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) {
+        Integer count = wgdCommiInfoDao.getQueryTotal(wgdCommiInfo);
+        wgdCommiInfo.getPager().setRowCount(count);
+        return wgdCommiInfoDao.queryAll(wgdCommiInfo);
+    }
+
+    @Override
+    public WgdCommiInfo getWgdCommiInfoById(String id) {
+        return wgdCommiInfoDao.selectById(id);
+    }
+
+    @Override
+    public int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo) {
+        wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword()));
+        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) {
+        String[] str = ids.split(",");
+        return wgdCommiInfoDao.deleteBatch(str);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdExReviseCostServiceImpl.java

@@ -0,0 +1,67 @@
+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) {
+        Integer count = wgdExReviseCostDao.getQueryTotal(wgdExReviseCost);
+        wgdExReviseCost.getPager().setRowCount(count);
+        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) {
+        String[] str = ids.split(",");
+        return wgdExReviseCostDao.deleteBatch(str);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/service/impl/WgdMeetCostServiceImpl.java

@@ -0,0 +1,66 @@
+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) {
+        Integer count = wgdMeetCostDao.getQueryTotal(wgdMeetCost);
+        wgdMeetCost.getPager().setRowCount(count);
+        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) {
+        String[] str = ids.split(",");
+        return wgdMeetCostDao.deleteBatch(str);
+    }
+}

adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml

@@ -0,0 +1,120 @@
+<?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.sarIssueTrack.dao.IssueTrackDao">
+
+    <resultMap id="IssueTrackPage" type="com.adc.da.slrs.sarIssueTrack.entity.IssueTrack">
+        <result property="id" column="ID"/>
+        <result property="lawId" column="law_id"/>
+        <result property="dataSource" column="data_source"/>
+        <result property="lawCode" column="law_code"/>
+        <result property="lawName" column="law_name"/>
+        <result property="productType" column="product_type"/>
+        <result property="implTime" column="impl_time"/>
+        <result property="implRequire" column="impl_require"/>
+
+
+    </resultMap>
+
+    <sql id="issueColumn">
+        issue.id,data_source,law_id,product_type,impl_time,impl_require
+    </sql>
+
+    <select id="findPage" resultMap="IssueTrackPage" parameterType="com.adc.da.slrs.sarIssueTrack.entity.IssueTrackVo">
+        (
+        SELECT
+        CONCAT(
+        sarInfo.STAND_SORT,
+        ' ',
+        sarInfo.STAND_NUMBER,
+        '-',
+        sarInfo.STAND_YEAR
+        ) AS law_code,
+        sarInfo.STAND_NAME AS law_name,
+        <include refid="issueColumn"/>
+        FROM
+        issue_track AS issue
+        JOIN sar_standards_info AS sarInfo ON sarInfo.ID = issue.law_id
+
+        <where>
+            del_flag=0
+
+            <if test="pageVo.lawCode != null and pageVo.lawCode != ''">
+                trim(replace(CONCAT(
+                sarInfo.STAND_SORT,
+                ' ',
+                sarInfo.STAND_NUMBER,
+                '-',
+                sarInfo.STAND_YEAR
+                ),' ','')) LIKE trim(replace(CONCAT('%',#{pageVo.lawCode},'%'),' ',''))
+            </if>
+
+
+
+            <if test="pageVo.lawName != null and pageVo.lawName != ''">
+                sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
+            </if>
+
+
+            <if test="pageVo.productType != null and pageVo.productType != ''">
+                issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
+            </if>
+
+        </where>
+
+        ) UNION  ALL (
+        SELECT
+        sarInfo.LAWS_NUMBER AS law_code,
+        sarInfo.LAWS_NAME AS law_name,
+        <include refid="issueColumn"/>
+        FROM
+        issue_track AS issue
+        JOIN sar_laws_stand_info AS sarInfo ON sarInfo.ID = issue.law_id
+        <where>
+            del_flag=0
+
+            <if test="pageVo.lawCode != null and pageVo.lawCode != ''">
+                sarInfo.LAWS_NUMBER LIKE CONCAT('%',#{pageVo.lawCode},'%')
+            </if>
+
+            <if test="pageVo.lawName != null and pageVo.lawName != ''">
+                sarInfo.LAWS_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
+            </if>
+
+            <if test="pageVo.productType != null and pageVo.productType != ''">
+                issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
+            </if>
+        </where>
+
+
+        ) UNION  ALL (
+        SELECT
+        sarInfo.STAND_CODE AS law_code,
+        sarInfo.STAND_NAME AS law_name,
+        <include refid="issueColumn"/>
+        FROM
+        issue_track AS issue
+        JOIN sar_bussioness_stand AS sarInfo ON sarInfo.ID = issue.law_id
+
+
+        <where>
+            del_flag=0
+
+            <if test="pageVo.lawCode != null and pageVo.lawCode != ''">
+                sarInfo.STAND_CODE LIKE CONCAT('%',#{pageVo.lawCode},'%')
+            </if>
+
+            <if test="pageVo.lawName != null and pageVo.lawName != ''">
+                sarInfo.STAND_NAME LIKE CONCAT('%',#{pageVo.lawName},'%')
+            </if>
+
+            <if test="pageVo.productType != null and pageVo.productType != ''">
+                issue.product_type LIKE CONCAT('%',#{pageVo.productType},'%')
+            </if>
+
+        </where>
+
+
+        )
+
+    </select>
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/esRevisePlan/EsRevisePlanMapper.xml

@@ -0,0 +1,209 @@
+<?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,
+        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="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="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="pages">
+        </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>

adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml

@@ -48,6 +48,22 @@
         </if>
     </select>
 
+    <select id="selectNextUserByIds" resultMap="TsUser">
+        select ts_user.EMAIL,ts_user.ACCOUNT,ts_user.CREATION_TIME,ts_user.DISABLE_FLAG,ts_user.EXT_INFO,ts_user.USID,
+        ts_user.INSTITUTION_ID,ts_user.INSTITUTION_NAME,ts_user.MODIFY_TIME,ts_user.OPER_USER,ts_user.PASSWORD,ts_user.PHONE,
+        ts_user.POSITION_ID,ts_user.POSITION_NAME,ts_user.SEX,ts_user.SSO_ID,ts_user.STATE,ts_user.UNLOCK_FLAG,ts_user.USER_SOURCE,
+        ts_user.USER_TYPE,ts_user.VALID_FLAG,ts_user.WORK_NUM,concat(ts_user.UNAME,concat(concat("(",ts_user.ACCOUNT),")")) as uname
+        from ts_user
+		WHERE 1=1
+		<if test="ids != null and ids.size()> 0 ">
+            and ts_user.USID in
+            <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+
+        </if>
+    </select>
+
     <select id="selectTreeByIds" resultMap="TsInstitution">
     <foreach collection="rootIds" item="id">
         SELECT

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml

@@ -603,7 +603,7 @@
             when 'HJ' THEN 7
             ELSE 8
             END,
-            sar_standards_info.stand_sort ASC,sar_standards_info.id
+            sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
         </if>
         <if test='page.standType != null and page.standType == "FOREIGN"'>
             CASE sar_standards_info.stand_sort
@@ -633,7 +633,7 @@
             when 'ADR' THEN 23
             ELSE 24
             END,
-            sar_standards_info.stand_sort ASC,sar_standards_info.id
+            sar_standards_info.stand_sort ASC,sar_standards_info.STAND_NUMBER ASC,sar_standards_info.STAND_YEAR DESC,sar_standards_info.id
         </if>
     </sql>
     <sql id="standSort_out">
@@ -754,9 +754,9 @@
             <!-- 标准编号111 -->
             <if test="page.standNumber != null and page.standNumber != ''">
                 and (
-                (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-                SAR_STANDARDS_INFO.STAND_YEAR) like concat(concat('%',#{page.standNumber}),'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
-                or (concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER) like concat(concat('%',#{page.standNumber}),'%')
+                (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
+                SAR_STANDARDS_INFO.STAND_YEAR),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ','')) and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (trim(replace(concat(SAR_STANDARDS_INFO.STAND_SORT,' ',SAR_STANDARDS_INFO.STAND_NUMBER),' ','')) like trim(replace(concat(concat('%',#{page.standNumber}),'%'),' ',''))
                 and SAR_STANDARDS_INFO.STAND_YEAR = '')
                 or (stand_name like concat(concat('%',#{page.standNumber}),'%'))
                 )
@@ -995,7 +995,10 @@
         <if test="mark == 999 ">
             and  sar_standards_info.ID in (select distinct stand_id from sar_stand_items)
         </if>
-        <include refid="standSort_in"/>
+        <if test='(page.orderByA != null and page.orderByA != "" and page.order1 != null and page.order1 != "")
+         or (page.standType != null and page.standType != "") '>
+            <include refid="standSort_in"/>
+        </if>
         limit ${page.pager.startIndex-1},${page.pageSize}
     </select>
     <!--FIELD(SAR_STANDARDS_INFO.issue_time,'已发布'), FIELD(SAR_STANDARDS_INFO.issue_time,'TBD'), FIELD(SAR_STANDARDS_INFO.issue_time,'N/A') ,-->
@@ -1034,10 +1037,16 @@
             and stand_type = #{standType}
         </if>
         <if test="standNumber != null">
-            and ((concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER,'-',
-            SAR_STANDARDS_INFO.STAND_YEAR) = ( #{standNumber}) and SAR_STANDARDS_INFO.STAND_YEAR != '')
-            or (concat(dicstandSort.DIC_TYPE_NAME,' ',SAR_STANDARDS_INFO.STAND_NUMBER) = ( #{standNumber})
-            and SAR_STANDARDS_INFO.STAND_YEAR = '')
+            and (
+                ( ( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
+                and
+                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
+                and
+                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_YEAR,'%') and SAR_STANDARDS_INFO.STAND_YEAR != '')
+                or (( #{standNumber}) like CONCAT('%',dicstandSort.DIC_TYPE_NAME,'%')
+                and
+                ( #{standNumber}) like CONCAT('%',SAR_STANDARDS_INFO.STAND_NUMBER,'%')
+                and SAR_STANDARDS_INFO.STAND_YEAR = '')
             )
         </if>
         <if test="sychronId != null">
@@ -1137,8 +1146,7 @@
             ${orderByA} ${order1},
         </if>
         <include refid="standSort_out"/>
-        a.issue_time is null
-        ,a.issue_time desc,a.id
+        a.STAND_NUMBER ASC,a.STAND_YEAR DESC,a.id
     </select>
 
     <select id="selectStandardsInfoByKey" resultMap="BaseResultMap" parameterType="java.lang.String">

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdCgfyMapper.xml

@@ -0,0 +1,133 @@
+<?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 1=1
+            <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>
+    </sql>
+    <select id="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_cgfy
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy" resultType="java.lang.Integer">
+        select count(*) from wgd_cgfy
+        <include refid="Conditions"></include>
+    </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}
+    </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>
+

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdFyfyMapper.xml

@@ -0,0 +1,154 @@
+<?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,translation,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="translation != null and translation != ''">
+                and translation like concat('%',#{translation},'%')
+            </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="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_fyfy
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy" resultType="java.lang.Integer">
+        select count(*) from wgd_fyfy
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy">
+        select <include refid="BaseInfo"></include> from wgd_fyfy
+    </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="translation != null and translation != ''">
+                translation = #{translation},
+            </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="translation != null and translation != ''">
+                translation,
+            </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="translation != null and translation != ''">
+                #{translation},
+            </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>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdSrbMapper.xml

@@ -0,0 +1,134 @@
+<?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="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_srb
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb" resultType="java.lang.Integer">
+        select count(*) from wgd_srb
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb">
+        select <include refid="BaseInfo"></include> from wgd_srb
+    </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>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbtjMapper.xml

@@ -0,0 +1,226 @@
+<?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="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_wbtj
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj" resultType="java.lang.Integer">
+        select count(*) from wgd_wbtj
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj">
+        select <include refid="BaseInfo"></include> from wgd_wbtj
+    </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>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdWbxdMapper.xml

@@ -0,0 +1,323 @@
+<?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="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_wbxd
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd" resultType="java.lang.Integer">
+        select count(*) from wgd_wbxd
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd">
+        select <include refid="BaseInfo"></include> from wgd_wbxd
+    </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>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusLeo/WgdZcbMapper.xml

@@ -0,0 +1,122 @@
+<?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="getTotal"  resultType="java.lang.Integer">
+        select count(*) from wgd_zcb
+    </select>
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb" resultType="java.lang.Integer">
+        select count(*) from wgd_zcb
+        <include refid="Conditions"></include>
+    </select>
+    <!--    查询所有-->
+    <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb">
+        select <include refid="BaseInfo"></include> from wgd_zcb
+    </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>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocCostMapper.xml

@@ -0,0 +1,161 @@
+<?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="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
+    </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} ,'%')
+                ssc_name like concat('%',#{scName} ,'%')
+                wg_name like concat('%',#{scName} ,'%')
+                )
+            </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="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">
+        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">
+                pay_standard = #{payStandard},
+            </if>
+            <if test="payReality != null">
+                pay_reality = #{payReality},
+            </if>
+            <if test="costOutlay != null">
+                cost_outlay = #{costOutlay},
+            </if>
+            <if test="annualPayment != null">
+                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>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdAssocInfoMapper.xml

@@ -0,0 +1,467 @@
+<?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="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,
+        department,as_proper,as_status,as_contact,tel,mail,
+        p17,p18,p19,p20,p21,p22,p23,p24,p25,p26,p27,p28,p29,p30,p31,p32
+    </sql>
+    <sql id="Conditions">
+        WHERE 1=1
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <if test="scName != null and scName != ''">
+                and (
+                sc_name like concat('%',#{scName} ,'%')
+                ssc_name like concat('%',#{scName} ,'%')
+                wg_name like concat('%',#{scName} ,'%')
+                )
+            </if>
+            <if test="role != null and role != ''">
+                and role = #{role}
+            </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 DATE_FORMAT(ini_time,'%Y%m%d') = DATE_FORMAT(iniTime,'%Y%m%d')
+            </if>
+            <if test="curTime != null">
+                and DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d')
+            </if>
+            <if test="costStandard != null and costStandard != ''">
+                and cost_standard = #{costStandard}
+            </if>
+            <if test="costOutlay != null and costOutlay != ''">
+                and cost_outlay = #{costOutlay}
+            </if>
+            <if test="lastPayTime != null">
+                and DATE_FORMAT(last_pay_time,'%Y%m%d') = DATE_FORMAT(lastPayTime,'%Y%m%d')
+            </if>
+            <if test="payPeriod != null and payPeriod != ''">
+                and pay_period = #{payPeriod}
+            </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>
+
+    </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
+        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>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdCommiInfoMapper.xml

@@ -0,0 +1,241 @@
+<?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 like concat('%',#{scName} ,'%')
+            ssc_name like concat('%',#{scName} ,'%')
+            wg_name like concat('%',#{scName} ,'%')
+            )
+        </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 DATE_FORMAT(cur_time,'%Y%m%d') = DATE_FORMAT(curTime,'%Y%m%d')
+        </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
+        where id = #{id}
+    </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" parameterType="java.lang.String">
+        delete from wgd_commi_info where id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdExReviseCostMapper.xml

@@ -0,0 +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.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
+        where id = #{id}
+    </select>
+
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost">
+        update wgd_ex_revise_cost
+        <set>
+            <if test="type != null">
+                type = #{type},
+            </if>
+            <if test="proId != null">
+                pro_id = #{proId},
+            </if>
+            <if test="proName != null">
+                pro_name = #{proName},
+            </if>
+            <if test="cost != null">
+                cost = #{cost},
+            </if>
+            <if test="costOutlay != null">
+                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">
+                id,
+            </if>
+            <if test="type != null">
+                type,
+            </if>
+            <if test="proId != null">
+                pro_id,
+            </if>
+            <if test="proName != null">
+                pro_name,
+            </if>
+            <if test="cost != null">
+                cost,
+            </if>
+            <if test="costOutlay != null">
+                cost_outlay,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffixOverrides="," suffix=")">
+            <if test="id != null">
+                #{id},
+            </if>
+            <if test="type != null">
+                #{type},
+            </if>
+            <if test="proId != null">
+                #{proId},
+            </if>
+            <if test="proName != null">
+                #{proName},
+            </if>
+            <if test="cost != null">
+                #{cost},
+            </if>
+            <if test="costOutlay != null">
+                #{costOutlay},
+            </if>
+        </trim>
+    </insert>
+    <delete id="deleteOne" parameterType="java.lang.String">
+        delete from wgd_ex_revise_cost where id = #{id}
+    </delete>
+    <delete id="deleteBatch" parameterType="java.lang.String">
+        delete from wgd_ex_revise_cost where id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/wgdCensusZ/WgdMeetCostMapper.xml

@@ -0,0 +1,137 @@
+<?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 DATE_FORMAT(meet_time,'%Y%m%d') = DATE_FORMAT(#{meetTime},'%Y%m%d')
+        </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
+        where id = #{id}
+    </select>
+
+    <update id="updateOne" parameterType="com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost">
+        update wgd_meet_cost
+        <set>
+            <if test="unit != null">
+                unit = #{unit},
+            </if>
+            <if test="meetName != null">
+                meet_name = #{meetName},
+            </if>
+            <if test="meetTime">
+                meet_time = #{meetTime},
+            </if>
+            <if test="payStandard != null">
+                pay_standard = #{payStandard},
+            </if>
+            <if test="payReality != null">
+                pay_reality = #{payReality},
+            </if>
+            <if test="costOutlay != null">
+                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" parameterType="java.lang.String">
+        delete from wgd_meet_cost where id in
+        <foreach collection="array" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>