zcr:数据信息统计表

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

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.esRevisePlan.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService;
@@ -31,14 +32,18 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
 
     @ApiOperation(value = "获取所有企标计划")
     @GetMapping("getAllPlans")
-    public ResponseMessage<Object> getAllPlans(){
-        return Result.success(iEsRevisePlanService.getAllPlans());
+    public ResponseMessage<Object> getAllPlans(EsRevisePlan esRevisePlan){
+        List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.getAllPlans(esRevisePlan);
+        PageInfo<EsRevisePlan> pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans);
+        return Result.success(pageInfo);
     }
 
     @ApiOperation(value = "多条件查询企标计划")
     @PostMapping("queryAllPlans")
     public ResponseMessage<Object> queryAllPlans(EsRevisePlan esRevisePlan){
-        return Result.success(iEsRevisePlanService.queryAllPlans(esRevisePlan));
+        List<EsRevisePlan> esRevisePlans = iEsRevisePlanService.queryAllPlans(esRevisePlan);
+        PageInfo<EsRevisePlan> pageInfo = getPageInfo(esRevisePlan.getPager(),esRevisePlans);
+        return Result.success(pageInfo);
     }
 
     @ApiOperation(value = "获取单个企标计划详情")

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

@@ -15,7 +15,9 @@ import java.util.List;
  * @since 2021-11-14
  */
 public interface EsRevisePlanDao extends BaseMapper<EsRevisePlan> {
-    List<EsRevisePlan> selectAll();//查询所有
+    Integer getTotal();
+    Integer getQueryTotal(EsRevisePlan esRevisePlan);
+    List<EsRevisePlan> selectAll(EsRevisePlan esRevisePlan);//查询所有
     List<EsRevisePlan> queryAll(EsRevisePlan esRevisePlan);//多条件查询
     EsRevisePlan selectOne(String id);//查询详情
 

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

@@ -2,6 +2,7 @@ package com.adc.da.slrs.esRevisePlan.entity;
 
 import java.util.Date;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +21,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="EsRevisePlan对象", description="企标制修订计划")
-public class EsRevisePlan{
+public class EsRevisePlan extends BasePage {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -14,7 +14,7 @@ import java.util.List;
  * @since 2021-11-14
  */
 public interface IEsRevisePlanService extends IService<EsRevisePlan> {
-    List<EsRevisePlan> getAllPlans();//查询所有
+    List<EsRevisePlan> getAllPlans(EsRevisePlan esRevisePlan);//查询所有
     List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan);//多条件查询
     EsRevisePlan getOnePlan(String id);//查询详情
 

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

@@ -25,13 +25,19 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
     EsRevisePlanDao esRevisePlanDao;
 
     @Override
-    public List<EsRevisePlan> getAllPlans() {
-        return esRevisePlanDao.selectAll();
+    public List<EsRevisePlan> getAllPlans(EsRevisePlan esRevisePlan) {
+        Integer count = esRevisePlanDao.getTotal();
+        esRevisePlan.getPager().setRowCount(count);
+        List<EsRevisePlan> esRevisePlans = esRevisePlanDao.selectAll(esRevisePlan);
+        return esRevisePlans;
     }
 
     @Override
     public List<EsRevisePlan> queryAllPlans(EsRevisePlan esRevisePlan) {
-        return esRevisePlanDao.queryAll(esRevisePlan);
+        Integer count = esRevisePlanDao.getQueryTotal(esRevisePlan);
+        esRevisePlan.getPager().setRowCount(count);
+        List<EsRevisePlan> esRevisePlans = esRevisePlanDao.queryAll(esRevisePlan);
+        return esRevisePlans;
     }
 
     @Override

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

@@ -1,10 +1,14 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sun.corba.se.impl.protocol.giopmsgheaders.RequestMessage;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
@@ -29,36 +33,47 @@ public class WgdAssocCostController extends BaseController<WgdAssocCost> {
     @Autowired
     IWgdAssocCostService iWgdAssocCostService;
 
+    @ApiOperation("查询所有信息")
     @GetMapping("getAllAssocCosts")
-    public ResponseMessage<Object> getAllWgdAssocCosts(){//查询所有
-        return Result.success(iWgdAssocCostService.getAllWgdAssocCosts());
+    public ResponseMessage<Object> getAllWgdAssocCosts(WgdAssocCost page){//查询所有
+        List<WgdAssocCost> wgdAssocCosts = iWgdAssocCostService.getAllWgdAssocCosts(page);
+        PageInfo<WgdAssocCost> pageInfo = getPageInfo(page.getPager(), wgdAssocCosts);
+        return Result.success(pageInfo);
     }
 
+    @ApiOperation("多条件查询")
     @PostMapping("queryAllAssocCosts")
     public ResponseMessage<Object> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost){//多条件查询
-        return Result.success(iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost));
+        List<WgdAssocCost> wgdAssocCosts = iWgdAssocCostService.queryAllWgdAssocCosts(wgdAssocCost);
+        PageInfo<WgdAssocCost> pageInfo = getPageInfo(wgdAssocCost.getPager(), wgdAssocCosts);
+        return Result.success(pageInfo);
     }
 
+    @ApiOperation("查询详情")
     @GetMapping("getAssocCostById")
     public ResponseMessage<Object> getWgdAssocCostById(String id) {//查询详情
         return Result.success(iWgdAssocCostService.getWgdAssocCostById(id));
     }
 
+    @ApiOperation("编辑")
     @PostMapping("modAssocCost")
     ResponseMessage<Object> updateWgdAssocCost(WgdAssocCost wgdAssocCost) {//编辑
         return Result.success(iWgdAssocCostService.updateWgdAssocCost(wgdAssocCost));
     }
 
+    @ApiOperation("插入")
     @PostMapping("addAssocCost")
     ResponseMessage<Object> insertWgdAssocCost(WgdAssocCost wgdAssocCost) {//插入
         return Result.success(iWgdAssocCostService.insertWgdAssocCost(wgdAssocCost));
     }
 
+    @ApiOperation("删除")
     @GetMapping("delAssocCost")
     ResponseMessage<Object> deleteWgdAssocCost(String id){//删除
         return Result.success(iWgdAssocCostService.deleteWgdAssocCost(id));
     }
 
+    @ApiOperation("批量删除")
     @GetMapping("delAssocCosts")
     ResponseMessage<Object> deleteWgdAssocCosts(String ids){//批量删除
         return Result.success(iWgdAssocCostService.deleteWgdAssocCosts(ids));

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

@@ -1,6 +1,9 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+import com.adc.da.http.PageInfo;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,37 +32,39 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
     IWgdAssocInfoService iWgdAssocInfoService;
 
     @GetMapping("getAllAssocInfos")
-    public List<WgdAssocInfo> getAllWgdAssocInfos(){//查询所有
-        return iWgdAssocInfoService.getAllWgdAssocInfos();
+    public ResponseMessage<Object> getAllWgdAssocInfos(){//查询所有
+        return Result.success(iWgdAssocInfoService.getAllWgdAssocInfos());
     }
 
     @PostMapping("queryAllAssocInfos")
-    public List<WgdAssocInfo> queryAllWgdAssocInfos(WgdAssocInfo WgdAssocInfo){//多条件查询
-        return iWgdAssocInfoService.queryAllWgdAssocInfos(WgdAssocInfo);
+    public ResponseMessage<Object> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo){//多条件查询
+        List<WgdAssocInfo> wgdAssocInfos = iWgdAssocInfoService.queryAllWgdAssocInfos(wgdAssocInfo);
+        PageInfo pageInfo = getPageInfo(wgdAssocInfo.getPager(), wgdAssocInfos);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getAssocInfoById")
-    public WgdAssocInfo getWgdAssocInfoById(String id) {//查询详情
-        return iWgdAssocInfoService.getWgdAssocInfoById(id);
+    public ResponseMessage<Object> getWgdAssocInfoById(String id) {//查询详情
+        return Result.success(iWgdAssocInfoService.getWgdAssocInfoById(id));
     }
 
     @PostMapping("modAssocInfo")
-    int updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑
-        return iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo);
+    ResponseMessage<Object> updateWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//编辑
+        return Result.success(iWgdAssocInfoService.updateWgdAssocInfo(WgdAssocInfo));
     }
 
     @PostMapping("addAssocInfo")
-    int insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入
-        return iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo);
+    ResponseMessage<Object> insertWgdAssocInfo(WgdAssocInfo WgdAssocInfo) {//插入
+        return Result.success(iWgdAssocInfoService.insertWgdAssocInfo(WgdAssocInfo));
     }
 
     @GetMapping("delAssocInfo")
-    int deleteWgdAssocInfo(String id){//删除
-        return iWgdAssocInfoService.deleteWgdAssocInfo(id);
+    ResponseMessage<Object> deleteWgdAssocInfo(String id){//删除
+        return Result.success(iWgdAssocInfoService.deleteWgdAssocInfo(id));
     }
 
     @GetMapping("delAssocInfos")
-    int deleteWgdAssocInfos(String ids){//批量删除
-        return iWgdAssocInfoService.deleteWgdAssocInfos(ids);
+    ResponseMessage<Object> deleteWgdAssocInfos(String ids){//批量删除
+        return Result.success(iWgdAssocInfoService.deleteWgdAssocInfos(ids));
     }
 }

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

@@ -1,6 +1,9 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+import com.adc.da.http.PageInfo;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,37 +32,39 @@ public class WgdCommiInfoController extends BaseController<WgdCommiInfo> {
     IWgdCommiInfoService iWgdCommiInfoService;
 
     @GetMapping("getAllCommiInfos")
-    public List<WgdCommiInfo> getAllWgdCommiInfos(){//查询所有
-        return iWgdCommiInfoService.getAllWgdCommiInfos();
+    public ResponseMessage<Object> getAllWgdCommiInfos(){//查询所有
+        return Result.success(iWgdCommiInfoService.getAllWgdCommiInfos());
     }
 
     @PostMapping("queryAllCommiInfos")
-    public List<WgdCommiInfo> queryAllWgdCommiInfos(WgdCommiInfo WgdCommiInfo){//多条件查询
-        return iWgdCommiInfoService.queryAllWgdCommiInfos(WgdCommiInfo);
+    public ResponseMessage<Object> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo){//多条件查询
+        List<WgdCommiInfo> wgdCommiInfos = iWgdCommiInfoService.queryAllWgdCommiInfos(wgdCommiInfo);
+        PageInfo pageInfo = getPageInfo(wgdCommiInfo.getPager(),wgdCommiInfos);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getCommiInfoById")
-    public WgdCommiInfo getWgdCommiInfoById(String id) {//查询详情
-        return iWgdCommiInfoService.getWgdCommiInfoById(id);
+    public ResponseMessage<Object> getWgdCommiInfoById(String id) {//查询详情
+        return Result.success(iWgdCommiInfoService.getWgdCommiInfoById(id));
     }
 
     @PostMapping("modCommiInfo")
-    int updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
-        return iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo);
+    ResponseMessage<Object> updateWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//编辑
+        return Result.success(iWgdCommiInfoService.updateWgdCommiInfo(WgdCommiInfo));
     }
 
     @PostMapping("addCommiInfo")
-    int insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
-        return iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo);
+    ResponseMessage<Object> insertWgdCommiInfo(WgdCommiInfo WgdCommiInfo) {//插入
+        return Result.success(iWgdCommiInfoService.insertWgdCommiInfo(WgdCommiInfo));
     }
 
     @GetMapping("delCommiInfo")
-    int deleteWgdCommiInfo(String id){//删除
-        return iWgdCommiInfoService.deleteWgdCommiInfo(id);
+    ResponseMessage<Object> deleteWgdCommiInfo(String id){//删除
+        return Result.success(iWgdCommiInfoService.deleteWgdCommiInfo(id));
     }
 
     @GetMapping("delCommiInfos")
-    int deleteWgdCommiInfos(String ids){//批量删除
-        return iWgdCommiInfoService.deleteWgdCommiInfos(ids);
+    ResponseMessage<Object> deleteWgdCommiInfos(String ids){//批量删除
+        return Result.success(iWgdCommiInfoService.deleteWgdCommiInfos(ids));
     }
 }

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

@@ -1,6 +1,9 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+import com.adc.da.http.PageInfo;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdExReviseCostService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,37 +32,39 @@ public class WgdExReviseCostController extends BaseController<WgdExReviseCost> {
     IWgdExReviseCostService iWgdExReviseCostService;
 
     @GetMapping("getAllExReviseCosts")
-    public List<WgdExReviseCost> getAllWgdExReviseCosts(){//查询所有
-        return iWgdExReviseCostService.getAllWgdExReviseCosts();
+    public ResponseMessage<Object> getAllWgdExReviseCosts(){//查询所有
+        return Result.success(iWgdExReviseCostService.getAllWgdExReviseCosts());
     }
 
     @PostMapping("queryAllExReviseCosts")
-    public List<WgdExReviseCost> queryAllWgdExReviseCosts(WgdExReviseCost WgdExReviseCost){//多条件查询
-        return iWgdExReviseCostService.queryAllWgdExReviseCosts(WgdExReviseCost);
+    public ResponseMessage<Object> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost){//多条件查询
+        List<WgdExReviseCost> wgdExReviseCosts = iWgdExReviseCostService.queryAllWgdExReviseCosts(wgdExReviseCost);
+        PageInfo pageInfo = getPageInfo(wgdExReviseCost.getPager(),wgdExReviseCosts);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getExReviseCostById")
-    public WgdExReviseCost getWgdExReviseCostById(String id) {//查询详情
-        return iWgdExReviseCostService.getWgdExReviseCostById(id);
+    public ResponseMessage<Object> getWgdExReviseCostById(String id) {//查询详情
+        return Result.success(iWgdExReviseCostService.getWgdExReviseCostById(id));
     }
 
     @PostMapping("modExReviseCost")
-    int updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
-        return iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost);
+    ResponseMessage<Object> updateWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//编辑
+        return Result.success(iWgdExReviseCostService.updateWgdExReviseCost(WgdExReviseCost));
     }
 
     @PostMapping("addExReviseCost")
-    int insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入
-        return iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost);
+    ResponseMessage<Object> insertWgdExReviseCost(WgdExReviseCost WgdExReviseCost) {//插入
+        return Result.success(iWgdExReviseCostService.insertWgdExReviseCost(WgdExReviseCost));
     }
 
     @GetMapping("delExReviseCost")
-    int deleteWgdExReviseCost(String id){//删除
-        return iWgdExReviseCostService.deleteWgdExReviseCost(id);
+    ResponseMessage<Object> deleteWgdExReviseCost(String id){//删除
+        return Result.success(iWgdExReviseCostService.deleteWgdExReviseCost(id));
     }
 
     @GetMapping("delExReviseCosts")
-    int deleteWgdExReviseCosts(String ids){//批量删除
-        return iWgdExReviseCostService.deleteWgdExReviseCosts(ids);
+    ResponseMessage<Object> deleteWgdExReviseCosts(String ids){//批量删除
+        return Result.success(iWgdExReviseCostService.deleteWgdExReviseCosts(ids));
     }
 }

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

@@ -1,6 +1,9 @@
 package com.adc.da.slrs.wgdCensusZ.controller;
 
 
+import com.adc.da.http.PageInfo;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdMeetCostService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,7 +14,6 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
-import java.util.List;
 
 /**
 * <p>
@@ -29,37 +31,38 @@ public class WgdMeetCostController extends BaseController<WgdMeetCost> {
     IWgdMeetCostService iWgdMeetCostService;
 
     @GetMapping("getAllMeetCosts")
-    public List<WgdMeetCost> getAllWgdMeetCosts(){//查询所有
-        return iWgdMeetCostService.getAllWgdMeetCosts();
+    public ResponseMessage<Object> getAllWgdMeetCosts(){//查询所有
+        return Result.success(iWgdMeetCostService.getAllWgdMeetCosts());
     }
 
     @PostMapping("queryAllMeetCosts")
-    public List<WgdMeetCost> queryAllWgdMeetCosts(WgdMeetCost WgdMeetCost){//多条件查询
-        return iWgdMeetCostService.queryAllWgdMeetCosts(WgdMeetCost);
+    public ResponseMessage<Object> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost){//多条件查询
+        PageInfo pageInfo = getPageInfo(wgdMeetCost.getPager(),iWgdMeetCostService.queryAllWgdMeetCosts(wgdMeetCost));
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getMeetCostById")
-    public WgdMeetCost getWgdMeetCostById(String id) {//查询详情
-        return iWgdMeetCostService.getWgdMeetCostById(id);
+    public ResponseMessage<Object> getWgdMeetCostById(String id) {//查询详情
+        return Result.success(iWgdMeetCostService.getWgdMeetCostById(id));
     }
 
     @PostMapping("modMeetCost")
-    int updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
-        return iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost);
+    ResponseMessage<Object> updateWgdMeetCost(WgdMeetCost WgdMeetCost) {//编辑
+        return Result.success(iWgdMeetCostService.updateWgdMeetCost(WgdMeetCost));
     }
 
     @PostMapping("addMeetCost")
-    int insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入
-        return iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost);
+    ResponseMessage<Object> insertWgdMeetCost(WgdMeetCost WgdMeetCost) {//插入
+        return Result.success(iWgdMeetCostService.insertWgdMeetCost(WgdMeetCost));
     }
 
     @GetMapping("delMeetCost")
-    int deleteWgdMeetCost(String id){//删除
-        return iWgdMeetCostService.deleteWgdMeetCost(id);
+    ResponseMessage<Object> deleteWgdMeetCost(String id){//删除
+        return Result.success(iWgdMeetCostService.deleteWgdMeetCost(id));
     }
 
     @GetMapping("delMeetCosts")
-    int deleteWgdMeetCosts(String ids){//批量删除
-        return iWgdMeetCostService.deleteWgdMeetCosts(ids);
+    ResponseMessage<Object> deleteWgdMeetCosts(String ids){//批量删除
+        return Result.success(iWgdMeetCostService.deleteWgdMeetCosts(ids));
     }
 }

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

@@ -3,6 +3,7 @@ package com.adc.da.slrs.wgdCensusZ.dao;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 import java.util.Map;
@@ -16,7 +17,9 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdAssocCostDao extends BaseMapper<WgdAssocCost> {
-    List<WgdAssocCost> selectAll();//查询所有
+    Integer getTotal();//总数
+    Integer getQueryTotal(WgdAssocCost wgdAssocCost);//总数
+    List<WgdAssocCost> selectAll(WgdAssocCost page);//查询所有
     List<WgdAssocCost> queryAll(WgdAssocCost wgdAssocCost);//多条件查询
     WgdAssocCost selectOne(String id);//查询详情
 
@@ -24,4 +27,6 @@ public interface WgdAssocCostDao extends BaseMapper<WgdAssocCost> {
     int insertOne(WgdAssocCost wgdAssocCost);//插入
     int deleteOne(String id);//删除
     int deleteBatch(String[] ids);//批量删除
+
 }
+

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

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.dao;
 
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,7 +16,7 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdAssocInfoDao extends BaseMapper<WgdAssocInfo> {
-
+    Integer getQueryTotal(WgdAssocInfo WgdAssocInfo);//总数
     List<WgdAssocInfo> selectAll();//查询所有
     List<WgdAssocInfo> queryAll(WgdAssocInfo wgdAssocInfo);//多条件查询
     WgdAssocInfo selectOne(String id);//查询详情

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

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.dao;
 
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,7 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdCommiInfoDao extends BaseMapper<WgdCommiInfo> {
+    Integer getQueryTotal(WgdCommiInfo WgdCommiInfo);//总数
     List<WgdCommiInfo> selectAll();//查询所有
     List<WgdCommiInfo> queryAll(WgdCommiInfo wgdCommiInfo);//多条件查询
     WgdCommiInfo selectOne(String id);//查询详情

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

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.dao;
 
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdExReviseCost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,7 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdExReviseCostDao extends BaseMapper<WgdExReviseCost> {
+    Integer getQueryTotal(WgdExReviseCost WgdExReviseCost);//总数
     List<WgdExReviseCost> selectAll();//查询所有
     List<WgdExReviseCost> queryAll(WgdExReviseCost wgdExReviseCost);//多条件查询
     WgdExReviseCost selectOne(String id);//查询详情

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

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.dao;
 
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdMeetCost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,6 +17,7 @@ import java.util.Map;
  * @since 2021-11-12
  */
 public interface WgdMeetCostDao extends BaseMapper<WgdMeetCost> {
+    Integer getQueryTotal(WgdMeetCost WgdMeetCost);//总数
     List<WgdMeetCost> selectAll();//查询所有
     List<WgdMeetCost> queryAll(WgdMeetCost wgdMeetCost);//多条件查询
     WgdMeetCost selectOne(String id);//查询详情

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

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.entity;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,7 +17,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdAssocCost对象", description="协会费用信息统计")
-public class WgdAssocCost {
+public class WgdAssocCost extends BasePage {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusZ.entity;
 
 import java.util.Date;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdAssocInfo对象", description="协会信息数据统计")
-public class WgdAssocInfo  {
+public class WgdAssocInfo extends BasePage {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusZ.entity;
 
 import java.util.Date;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdCommiInfo对象", description="委员信息数据统计")
-public class WgdCommiInfo {
+public class WgdCommiInfo extends BasePage {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -1,5 +1,6 @@
 package com.adc.da.slrs.wgdCensusZ.entity;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,7 +17,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdExReviseCost对象", description="参与外部标准制修订费用统计")
-public class WgdExReviseCost  {
+public class WgdExReviseCost extends BasePage {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusZ.entity;
 
 import java.util.Date;
 
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @Accessors(chain = true)
 @ApiModel(value="WgdMeetCost对象", description="参会费用信息统计")
-public class WgdMeetCost {
+public class WgdMeetCost extends BasePage {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -2,6 +2,8 @@ package com.adc.da.slrs.wgdCensusZ.service;
 
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -15,7 +17,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdAssocCostService extends IService<WgdAssocCost> {
-    List<WgdAssocCost> getAllWgdAssocCosts();//查询所有
+    List<WgdAssocCost> getAllWgdAssocCosts(WgdAssocCost page);//查询所有
     List<WgdAssocCost> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost);//多条件查询
     WgdAssocCost getWgdAssocCostById(String id);//查询详情
 

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

@@ -4,6 +4,8 @@ import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocCost;
 import com.adc.da.slrs.wgdCensusZ.dao.WgdAssocCostDao;
 import com.adc.da.slrs.wgdCensusZ.service.IWgdAssocCostService;
 import com.adc.da.util.UUIDUtils;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,13 +28,19 @@ public class WgdAssocCostServiceImpl extends ServiceImpl<WgdAssocCostDao, WgdAss
     WgdAssocCostDao wgdAssocCostDao;
 
     @Override
-    public List<WgdAssocCost> getAllWgdAssocCosts() {
-        return wgdAssocCostDao.selectAll();
+    public List<WgdAssocCost> getAllWgdAssocCosts(WgdAssocCost page) {
+        Integer count = wgdAssocCostDao.getTotal();
+        page.getPager().setRowCount(count);
+        List<WgdAssocCost> wgdAssocCosts = wgdAssocCostDao.selectAll(page);
+        return wgdAssocCosts;
     }
 
     @Override
     public List<WgdAssocCost> queryAllWgdAssocCosts(WgdAssocCost wgdAssocCost) {
-        return wgdAssocCostDao.queryAll(wgdAssocCost);
+        Integer count = wgdAssocCostDao.getQueryTotal(wgdAssocCost);
+        wgdAssocCost.getPager().setRowCount(count);
+        List<WgdAssocCost> wgdAssocCosts = wgdAssocCostDao.queryAll(wgdAssocCost);
+        return wgdAssocCosts;
     }
 
     @Override

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

@@ -31,6 +31,8 @@ public class WgdAssocInfoServiceImpl extends ServiceImpl<WgdAssocInfoDao, WgdAss
 
     @Override
     public List<WgdAssocInfo> queryAllWgdAssocInfos(WgdAssocInfo wgdAssocInfo) {
+        Integer count = wgdAssocInfoDao.getQueryTotal(wgdAssocInfo);
+        wgdAssocInfo.getPager().setRowCount(count);
         return wgdAssocInfoDao.queryAll(wgdAssocInfo);
     }
 

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

@@ -33,6 +33,8 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
 
     @Override
     public List<WgdCommiInfo> queryAllWgdCommiInfos(WgdCommiInfo wgdCommiInfo) {
+        Integer count = wgdCommiInfoDao.getQueryTotal(wgdCommiInfo);
+        wgdCommiInfo.getPager().setRowCount(count);
         return wgdCommiInfoDao.queryAll(wgdCommiInfo);
     }
 
@@ -43,6 +45,7 @@ public class WgdCommiInfoServiceImpl extends ServiceImpl<WgdCommiInfoDao, WgdCom
 
     @Override
     public int updateWgdCommiInfo(WgdCommiInfo wgdCommiInfo) {
+        wgdCommiInfo.setPassword(MD5Util.convertMD5(wgdCommiInfo.getPassword()));
         return wgdCommiInfoDao.updateOne(wgdCommiInfo);
     }
 

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

@@ -33,6 +33,8 @@ public class WgdExReviseCostServiceImpl extends ServiceImpl<WgdExReviseCostDao,
 
     @Override
     public List<WgdExReviseCost> queryAllWgdExReviseCosts(WgdExReviseCost wgdExReviseCost) {
+        Integer count = wgdExReviseCostDao.getQueryTotal(wgdExReviseCost);
+        wgdExReviseCost.getPager().setRowCount(count);
         return wgdExReviseCostDao.queryAll(wgdExReviseCost);
     }
 

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

@@ -32,6 +32,8 @@ public class WgdMeetCostServiceImpl extends ServiceImpl<WgdMeetCostDao, WgdMeetC
 
     @Override
     public List<WgdMeetCost> queryAllWgdMeetCosts(WgdMeetCost wgdMeetCost) {
+        Integer count = wgdMeetCostDao.getQueryTotal(wgdMeetCost);
+        wgdMeetCost.getPager().setRowCount(count);
         return wgdMeetCostDao.queryAll(wgdMeetCost);
     }