~

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

@@ -2,6 +2,7 @@ package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
 import com.adc.da.base.web.BaseController;
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
 * <p>
     * 采购费用信息统计 前端控制器
@@ -29,14 +32,16 @@ public class WgdCgfyController extends BaseController<WgdCgfy> {
     @Autowired
     IWgdCgfyService iWgdCgfyService;
 
-    @GetMapping("getAllCgfy")
+    @GetMapping("getAllCgfys")
-    public ResponseMessage<Object> getAllWgdCgfy(){//查询所有
+    public ResponseMessage<Object> getAllWgdCgfys(){//查询所有
-        return Result.success(iWgdCgfyService.getAllWgdCgfy());
+        return Result.success(iWgdCgfyService.getAllWgdCgfys());
     }
 
-    @PostMapping("queryAllCgfy")
+    @PostMapping("queryAllCgfys")
-    public ResponseMessage<Object> queryAllWgdCgfy(WgdCgfy wgdCgfy){//多条件查询
+    public ResponseMessage<Object> queryAllWgdCgfys(WgdCgfy wgdCgfy){//多条件查询
-        return Result.success(iWgdCgfyService.queryAllWgdCgfy(wgdCgfy));
+        List<WgdCgfy> wgdCgfys = iWgdCgfyService.queryAllWgdCgfys(wgdCgfy);
+        PageInfo pageInfo = getPageInfo(wgdCgfy.getPager(),wgdCgfys);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getCgfyById")
@@ -45,13 +50,13 @@ public class WgdCgfyController extends BaseController<WgdCgfy> {
     }
 
     @PostMapping("modCgfy")
-    ResponseMessage<Object> updateWgdCgfy(WgdCgfy wgdCgfy) {//编辑
+    ResponseMessage<Object> updateWgdCgfy(WgdCgfy WgdCgfy) {//编辑
-        return Result.success(iWgdCgfyService.updateWgdCgfy(wgdCgfy));
+        return Result.success(iWgdCgfyService.updateWgdCgfy(WgdCgfy));
     }
 
     @PostMapping("addCgfy")
-    ResponseMessage<Object> insertWgdCgfy(WgdCgfy wgdCgfy) {//插入
+    ResponseMessage<Object> insertWgdCgfy(WgdCgfy WgdCgfy) {//插入
-        return Result.success(iWgdCgfyService.insertWgdCgfy(wgdCgfy));
+        return Result.success(iWgdCgfyService.insertWgdCgfy(WgdCgfy));
     }
 
     @GetMapping("delCgfy")
@@ -61,6 +66,6 @@ public class WgdCgfyController extends BaseController<WgdCgfy> {
 
     @GetMapping("delCgfys")
     ResponseMessage<Object> deleteWgdCgfys(String ids){//批量删除
-        return Result.success(iWgdCgfyService.deleteWgdCgfy(ids));
+        return Result.success(iWgdCgfyService.deleteWgdCgfys(ids));
     }
 }

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

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
@@ -13,6 +14,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 翻译费用信息统计 前端控制器
@@ -28,14 +31,16 @@ public class WgdFyfyController extends BaseController<WgdFyfy> {
     @Autowired
     IWgdFyfyService iWgdFyfyService;
 
-    @GetMapping("getAllFyfy")
+    @GetMapping("getAllFyfys")
-    public ResponseMessage<Object> getAllWgdFyfy(){//查询所有
+    public ResponseMessage<Object> getAllWgdFyfys(){//查询所有
-        return Result.success(iWgdFyfyService.getAllWgdFyfy());
+        return Result.success(iWgdFyfyService.getAllWgdFyfys());
     }
 
-    @PostMapping("queryAllFyfy")
+    @PostMapping("queryAllFyfys")
-    public ResponseMessage<Object> queryAllWgdCgfy(WgdFyfy wgdFyfy){//多条件查询
+    public ResponseMessage<Object> queryAllWgdFyfys(WgdFyfy wgdFyfy){//多条件查询
-        return Result.success(iWgdFyfyService.queryAllWgdFyfy(wgdFyfy));
+        List<WgdFyfy> wgdFyfys = iWgdFyfyService.queryAllWgdFyfys(wgdFyfy);
+        PageInfo pageInfo = getPageInfo(wgdFyfy.getPager(),wgdFyfys);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getFyfyById")
@@ -44,13 +49,13 @@ public class WgdFyfyController extends BaseController<WgdFyfy> {
     }
 
     @PostMapping("modFyfy")
-    ResponseMessage<Object> updateWgdFyfy(WgdFyfy wgdFyfy) {//编辑
+    ResponseMessage<Object> updateWgdFyfy(WgdFyfy WgdFyfy) {//编辑
-        return Result.success(iWgdFyfyService.updateWgdFyfy(wgdFyfy));
+        return Result.success(iWgdFyfyService.updateWgdFyfy(WgdFyfy));
     }
 
     @PostMapping("addFyfy")
-    ResponseMessage<Object> insertWgdFyfy(WgdFyfy wgdFyfy) {//插入
+    ResponseMessage<Object> insertWgdFyfy(WgdFyfy WgdFyfy) {//插入
-        return Result.success(iWgdFyfyService.insertWgdFyfy(wgdFyfy));
+        return Result.success(iWgdFyfyService.insertWgdFyfy(WgdFyfy));
     }
 
     @GetMapping("delFyfy")
@@ -60,6 +65,6 @@ public class WgdFyfyController extends BaseController<WgdFyfy> {
 
     @GetMapping("delFyfys")
     ResponseMessage<Object> deleteWgdFyfys(String ids){//批量删除
-        return Result.success(iWgdFyfyService.deleteWgdFyfy(ids));
+        return Result.success(iWgdFyfyService.deleteWgdFyfys(ids));
     }
 }

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

@@ -1,18 +1,21 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 标准制修订补助资金收支统计收入表 前端控制器
@@ -28,14 +31,16 @@ public class WgdSrbController extends BaseController<WgdSrb> {
     @Autowired
     IWgdSrbService iWgdSrbService;
 
-    @GetMapping("getAllSrb")
+    @GetMapping("getAllSrbs")
-    public ResponseMessage<Object> getAllWgdSrb(){//查询所有
+    public ResponseMessage<Object> getAllWgdSrbs(){//查询所有
-        return Result.success(iWgdSrbService.getAllWgdSrb());
+        return Result.success(iWgdSrbService.getAllWgdSrbs());
     }
 
-    @PostMapping("queryAllSrb")
+    @PostMapping("queryAllSrbs")
-    public ResponseMessage<Object> queryAllWgdSrb(WgdSrb wgdSrb){//多条件查询
+    public ResponseMessage<Object> queryAllWgdSrbs(WgdSrb wgdSrb){//多条件查询
-        return Result.success(iWgdSrbService.queryAllWgdSrb(wgdSrb));
+        List<WgdSrb> wgdSrbs = iWgdSrbService.queryAllWgdSrbs(wgdSrb);
+        PageInfo pageInfo = getPageInfo(wgdSrb.getPager(),wgdSrbs);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getSrbById")
@@ -44,13 +49,13 @@ public class WgdSrbController extends BaseController<WgdSrb> {
     }
 
     @PostMapping("modSrb")
-    ResponseMessage<Object> updateWgdSrb(WgdSrb wgdSrb) {//编辑
+    ResponseMessage<Object> updateWgdSrb(WgdSrb WgdSrb) {//编辑
-        return Result.success(iWgdSrbService.updateWgdSrb(wgdSrb));
+        return Result.success(iWgdSrbService.updateWgdSrb(WgdSrb));
     }
 
     @PostMapping("addSrb")
-    ResponseMessage<Object> insertWgdSrb(WgdSrb wgdSrb) {//插入
+    ResponseMessage<Object> insertWgdSrb(WgdSrb WgdSrb) {//插入
-        return Result.success(iWgdSrbService.insertWgdSrb(wgdSrb));
+        return Result.success(iWgdSrbService.insertWgdSrb(WgdSrb));
     }
 
     @GetMapping("delSrb")
@@ -60,6 +65,6 @@ public class WgdSrbController extends BaseController<WgdSrb> {
 
     @GetMapping("delSrbs")
     ResponseMessage<Object> deleteWgdSrbs(String ids){//批量删除
-        return Result.success(iWgdSrbService.deleteWgdSrb(ids));
+        return Result.success(iWgdSrbService.deleteWgdSrbs(ids));
     }
 }

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

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbtj;
@@ -13,6 +14,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 参与外部协会会议统计 前端控制器
@@ -28,14 +31,16 @@ public class WgdWbtjController extends BaseController<WgdWbtj> {
     @Autowired
     IWgdWbtjService iWgdWbtjService;
 
-    @GetMapping("getAllWbtj")
+    @GetMapping("getAllWbtjs")
-    public ResponseMessage<Object> getAllWgdWbtj(){//查询所有
+    public ResponseMessage<Object> getAllWgdWbtjs(){//查询所有
-        return Result.success(iWgdWbtjService.getAllWgdWbtj());
+        return Result.success(iWgdWbtjService.getAllWgdWbtjs());
     }
 
-    @PostMapping("queryAllWbtj")
+    @PostMapping("queryAllWbtjs")
-    public ResponseMessage<Object> queryAllWgdWbtj(WgdWbtj wgdWbtj){//多条件查询
+    public ResponseMessage<Object> queryAllWgdWbtjs(WgdWbtj wgdWbtj){//多条件查询
-        return Result.success(iWgdWbtjService.queryAllWgdWbtj(wgdWbtj));
+        List<WgdWbtj> wgdWbtjs = iWgdWbtjService.queryAllWgdWbtjs(wgdWbtj);
+        PageInfo pageInfo = getPageInfo(wgdWbtj.getPager(),wgdWbtjs);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getWbtjById")
@@ -44,13 +49,13 @@ public class WgdWbtjController extends BaseController<WgdWbtj> {
     }
 
     @PostMapping("modWbtj")
-    ResponseMessage<Object> updateWgdWbtj(WgdWbtj wgdWbtj) {//编辑
+    ResponseMessage<Object> updateWgdWbtj(WgdWbtj WgdWbtj) {//编辑
-        return Result.success(iWgdWbtjService.updateWgdWbtj(wgdWbtj));
+        return Result.success(iWgdWbtjService.updateWgdWbtj(WgdWbtj));
     }
 
     @PostMapping("addWbtj")
-    ResponseMessage<Object> insertWgdWbtj(WgdWbtj wgdWbtj) {//插入
+    ResponseMessage<Object> insertWgdWbtj(WgdWbtj WgdWbtj) {//插入
-        return Result.success(iWgdWbtjService.insertWgdWbtj(wgdWbtj));
+        return Result.success(iWgdWbtjService.insertWgdWbtj(WgdWbtj));
     }
 
     @GetMapping("delWbtj")
@@ -60,6 +65,6 @@ public class WgdWbtjController extends BaseController<WgdWbtj> {
 
     @GetMapping("delWbtjs")
     ResponseMessage<Object> deleteWgdWbtjs(String ids){//批量删除
-        return Result.success(iWgdWbtjService.deleteWgdWbtj(ids));
+        return Result.success(iWgdWbtjService.deleteWgdWbtjs(ids));
     }
 }

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

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.wgdCensusLeo.entity.WgdWbxd;
@@ -13,6 +14,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 参与外部标准制修订信息统计 前端控制器
@@ -28,14 +31,16 @@ public class WgdWbxdController extends BaseController<WgdWbxd> {
     @Autowired
     IWgdWbxdService iWgdWbxdService;
 
-    @GetMapping("getAllWbxd")
+    @GetMapping("getAllWbxds")
-    public ResponseMessage<Object> getAllWgdWbxd(){//查询所有
+    public ResponseMessage<Object> getAllWgdWbxds(){//查询所有
-        return Result.success(iWgdWbxdService.getAllWgdWbxd());
+        return Result.success(iWgdWbxdService.getAllWgdWbxds());
     }
 
-    @PostMapping("queryAllWbxd")
+    @PostMapping("queryAllWbxds")
-    public ResponseMessage<Object> queryAllWgdWbxd(WgdWbxd wgdWbxd){//多条件查询
+    public ResponseMessage<Object> queryAllWgdWbxds(WgdWbxd wgdWbxd){//多条件查询
-        return Result.success(iWgdWbxdService.queryAllWgdWbxd(wgdWbxd));
+        List<WgdWbxd> wgdWbxds = iWgdWbxdService.queryAllWgdWbxds(wgdWbxd);
+        PageInfo pageInfo = getPageInfo(wgdWbxd.getPager(),wgdWbxds);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getWbxdById")
@@ -44,13 +49,13 @@ public class WgdWbxdController extends BaseController<WgdWbxd> {
     }
 
     @PostMapping("modWbxd")
-    ResponseMessage<Object> updateWgdWbxd(WgdWbxd wgdWbxd) {//编辑
+    ResponseMessage<Object> updateWgdWbxd(WgdWbxd WgdWbxd) {//编辑
-        return Result.success(iWgdWbxdService.updateWgdWbxd(wgdWbxd));
+        return Result.success(iWgdWbxdService.updateWgdWbxd(WgdWbxd));
     }
 
     @PostMapping("addWbxd")
-    ResponseMessage<Object> insertWgdWbxd(WgdWbxd wgdWbxd) {//插入
+    ResponseMessage<Object> insertWgdWbxd(WgdWbxd WgdWbxd) {//插入
-        return Result.success(iWgdWbxdService.insertWgdWbxd(wgdWbxd));
+        return Result.success(iWgdWbxdService.insertWgdWbxd(WgdWbxd));
     }
 
     @GetMapping("delWbxd")
@@ -60,6 +65,6 @@ public class WgdWbxdController extends BaseController<WgdWbxd> {
 
     @GetMapping("delWbxds")
     ResponseMessage<Object> deleteWgdWbxds(String ids){//批量删除
-        return Result.success(iWgdWbxdService.deleteWgdWbxd(ids));
+        return Result.success(iWgdWbxdService.deleteWgdWbxds(ids));
     }
 }

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

@@ -1,18 +1,21 @@
 package com.adc.da.slrs.wgdCensusLeo.controller;
 
 
+import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdZcbService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import com.adc.da.slrs.wgdCensusLeo.entity.WgdZcb;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     * 标准制修订补助资金收支统计支出表 前端控制器
@@ -28,14 +31,16 @@ public class WgdZcbController extends BaseController<WgdZcb> {
     @Autowired
     IWgdZcbService iWgdZcbService;
 
-    @GetMapping("getAllZcb")
+    @GetMapping("getAllZcbs")
-    public ResponseMessage<Object> getAllWgdZcb(){//查询所有
+    public ResponseMessage<Object> getAllWgdZcbs(){//查询所有
-        return Result.success(iWgdZcbService.getAllWgdZcb());
+        return Result.success(iWgdZcbService.getAllWgdZcbs());
     }
 
-    @PostMapping("queryAllZcb")
+    @PostMapping("queryAllZcbs")
-    public ResponseMessage<Object> queryAllWgdZcb(WgdZcb wgdZcb){//多条件查询
+    public ResponseMessage<Object> queryAllWgdZcbs(WgdZcb wgdZcb){//多条件查询
-        return Result.success(iWgdZcbService.queryAllWgdZcb(wgdZcb));
+        List<WgdZcb> wgdZcbs = iWgdZcbService.queryAllWgdZcbs(wgdZcb);
+        PageInfo pageInfo = getPageInfo(wgdZcb.getPager(),wgdZcbs);
+        return Result.success(pageInfo);
     }
 
     @GetMapping("getZcbById")
@@ -44,13 +49,13 @@ public class WgdZcbController extends BaseController<WgdZcb> {
     }
 
     @PostMapping("modZcb")
-    ResponseMessage<Object> updateWgdZcb(WgdZcb wgdZcb) {//编辑
+    ResponseMessage<Object> updateWgdZcb(WgdZcb WgdZcb) {//编辑
-        return Result.success(iWgdZcbService.updateWgdZcb(wgdZcb));
+        return Result.success(iWgdZcbService.updateWgdZcb(WgdZcb));
     }
 
     @PostMapping("addZcb")
-    ResponseMessage<Object> insertWgdZcb(WgdZcb wgdZcb) {//插入
+    ResponseMessage<Object> insertWgdZcb(WgdZcb WgdZcb) {//插入
-        return Result.success(iWgdZcbService.insertWgdZcb(wgdZcb));
+        return Result.success(iWgdZcbService.insertWgdZcb(WgdZcb));
     }
 
     @GetMapping("delZcb")
@@ -60,6 +65,6 @@ public class WgdZcbController extends BaseController<WgdZcb> {
 
     @GetMapping("delZcbs")
     ResponseMessage<Object> deleteWgdZcbs(String ids){//批量删除
-        return Result.success(iWgdZcbService.deleteWgdZcb(ids));
+        return Result.success(iWgdZcbService.deleteWgdZcbs(ids));
     }
 }

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

@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdCgfyDao extends BaseMapper<WgdCgfy> {
+    Integer getQueryTotal(WgdCgfy WgdCgfy);//总数
     List<WgdCgfy> selectAll();//查询所有
     List<WgdCgfy> queryAll(WgdCgfy wgdCgfy);//多条件查询
     WgdCgfy selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdCgfyDao extends BaseMapper<WgdCgfy> {
     int updateOne(WgdCgfy wgdCgfy);//编辑
     int insertOne(WgdCgfy wgdCgfy);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }

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

@@ -14,12 +14,19 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdFyfyDao extends BaseMapper<WgdFyfy> {
+    Integer getQueryTotal(WgdFyfy WgdFyfy);//总数
+
     List<WgdFyfy> selectAll();//查询所有
+
     List<WgdFyfy> queryAll(WgdFyfy wgdFyfy);//多条件查询
+
     WgdFyfy selectOne(String id);//查询详情
 
     int updateOne(WgdFyfy wgdFyfy);//编辑
+
     int insertOne(WgdFyfy wgdFyfy);//插入
+
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+
-}
+    int deleteBatch();//批量删除
+}

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

@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdSrbDao extends BaseMapper<WgdSrb> {
+    Integer getQueryTotal(WgdSrb WgdSrb);//总数
     List<WgdSrb> selectAll();//查询所有
     List<WgdSrb> queryAll(WgdSrb wgdSrb);//多条件查询
     WgdSrb selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdSrbDao extends BaseMapper<WgdSrb> {
     int updateOne(WgdSrb wgdSrb);//编辑
     int insertOne(WgdSrb wgdSrb);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }

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

@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdWbtjDao extends BaseMapper<WgdWbtj> {
+    Integer getQueryTotal(WgdWbtj WgdWbtj);//总数
     List<WgdWbtj> selectAll();//查询所有
     List<WgdWbtj> queryAll(WgdWbtj wgdWbtj);//多条件查询
     WgdWbtj selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdWbtjDao extends BaseMapper<WgdWbtj> {
     int updateOne(WgdWbtj wgdWbtj);//编辑
     int insertOne(WgdWbtj wgdWbtj);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }

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

@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdWbxdDao extends BaseMapper<WgdWbxd> {
+    Integer getQueryTotal(WgdWbxd WgdWbxd);//总数
     List<WgdWbxd> selectAll();//查询所有
     List<WgdWbxd> queryAll(WgdWbxd wgdWbxd);//多条件查询
     WgdWbxd selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdWbxdDao extends BaseMapper<WgdWbxd> {
     int updateOne(WgdWbxd wgdWbxd);//编辑
     int insertOne(WgdWbxd wgdWbxd);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }

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

@@ -14,6 +14,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface WgdZcbDao extends BaseMapper<WgdZcb> {
+    Integer getQueryTotal(WgdZcb WgdZcb);//总数
     List<WgdZcb> selectAll();//查询所有
     List<WgdZcb> queryAll(WgdZcb wgdZcb);//多条件查询
     WgdZcb selectOne(String id);//查询详情
@@ -21,5 +22,5 @@ public interface WgdZcbDao extends BaseMapper<WgdZcb> {
     int updateOne(WgdZcb wgdZcb);//编辑
     int insertOne(WgdZcb wgdZcb);//插入
     int deleteOne(String id);//删除
-    int deleteBatch(String[] ids);//批量删除
+    int deleteBatch();//批量删除
 }

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

@@ -2,6 +2,8 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdCgfy对象", description="采购费用信息统计")
-public class WgdCgfy extends BaseEntity {
+public class WgdCgfy extends BasePage {
 
     private static final long serialVersionUID = 1L;
 

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

@@ -2,11 +2,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -20,7 +23,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdFyfy对象", description="翻译费用信息统计")
-public class WgdFyfy extends BaseEntity {
+public class WgdFyfy extends BasePage {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,6 +49,7 @@ public class WgdFyfy extends BaseEntity {
     private String cost;
 
     @ApiModelProperty(value = "翻译完成时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String time;
 
 

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

@@ -2,11 +2,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -20,7 +23,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdSrb对象", description="标准制修订补助资金收支统计收入表")
-public class WgdSrb extends BaseEntity {
+public class WgdSrb extends BasePage {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")
@@ -39,6 +42,7 @@ public class WgdSrb extends BaseEntity {
     private String money;
 
     @ApiModelProperty(value = "入账时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String data;
 
 

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

@@ -1,12 +1,14 @@
 package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.base.page.BasePage;
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdWbtj对象", description="参与外部协会会议统计")
-public class WgdWbtj extends BaseEntity {
+public class WgdWbtj extends BasePage {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")
@@ -33,6 +35,7 @@ public class WgdWbtj extends BaseEntity {
     private String meeting;
 
     @ApiModelProperty(value = "会议时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String time;
 
     @ApiModelProperty(value = "会议地点")

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

@@ -2,11 +2,14 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -20,7 +23,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdWbxd对象", description="参与外部标准制修订信息统计")
-public class WgdWbxd extends BaseEntity {
+public class WgdWbxd extends BasePage {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")
@@ -48,9 +51,11 @@ public class WgdWbxd extends BaseEntity {
     private String preside;
 
     @ApiModelProperty(value = "发布日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String dataStart;
 
     @ApiModelProperty(value = "实施日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String dataImplement;
 
     @ApiModelProperty(value = "颁布机构")
@@ -60,6 +65,7 @@ public class WgdWbxd extends BaseEntity {
     private String drafting;
 
     @ApiModelProperty(value = "备案时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String dataRecord;
 
     @ApiModelProperty(value = "提报单位名称")

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

@@ -2,6 +2,8 @@ package com.adc.da.slrs.wgdCensusLeo.entity;
 
 import com.adc.da.base.entity.BaseEntity;
 import java.math.BigDecimal;
+
+import com.adc.da.base.page.BasePage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -20,7 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ApiModel(value="WgdZcb对象", description="标准制修订补助资金收支统计支出表")
-public class WgdZcb extends BaseEntity {
+public class WgdZcb extends BasePage {
 
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键")

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

@@ -14,24 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdCgfyService extends IService<WgdCgfy> {
+    List<WgdCgfy> getAllWgdCgfys();//查询所有
+    List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy);//多条件查询
+    WgdCgfy getWgdCgfyById(String id);//查询详情
 
-    Object getAllWgdCgfy();
+    int updateWgdCgfy(WgdCgfy wgdCgfy);//编辑
-
+    int insertWgdCgfy(WgdCgfy wgdCgfy);//插入
-    Object queryAllWgdCgfy(WgdCgfy wgdCgfy);
+    int deleteWgdCgfy(String id);//删除
-
+    int deleteWgdCgfys(String ids);//批量删除
-    List<WgdCgfy> queryAllWgdAssocCosts(WgdCgfy wgdAssocCost);
-
-    List<WgdCgfy> getAllWgdCgfys();
-
-    List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy);
-
-    Object getWgdCgfyById(String id);
-
-    int updateWgdCgfy(WgdCgfy wgdCgfy);
-
-    int insertWgdCgfy(WgdCgfy wgdCgfy);
-
-    int deleteWgdCgfy(String id);
-
-    int deleteWgdCgfys(String ids);
 }

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

@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdFyfyService extends IService<WgdFyfy> {
+    List<WgdFyfy> getAllWgdFyfys();//查询所有
+    List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy);//多条件查询
+    WgdFyfy getWgdFyfyById(String id);//查询详情
 
-    Object getAllWgdFyfy();
+    int updateWgdFyfy(WgdFyfy wgdFyfy);//编辑
-
+    int insertWgdFyfy(WgdFyfy wgdFyfy);//插入
-    Object queryAllWgdFyfy(WgdFyfy wgdFyfy);
+    int deleteWgdFyfy(String id);//删除
-
+    int deleteWgdFyfys(String ids);//批量删除
-    List<WgdFyfy> getAllWgdFyfys();
+}
-
-    List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy);
-
-    Object getWgdFyfyById(String id);
-
-    int updateWgdFyfy(WgdFyfy wgdFyfy);
-
-    int insertWgdFyfy(WgdFyfy wgdFyfy);
-
-    int deleteWgdFyfy(String id);
-
-    int deleteWgdFyfys(String ids);
-}

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

@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdSrbService extends IService<WgdSrb> {
+    List<WgdSrb> getAllWgdSrbs();//查询所有
+    List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb);//多条件查询
+    WgdSrb getWgdSrbById(String id);//查询详情
 
-    Object getAllWgdSrb();
+    int updateWgdSrb(WgdSrb wgdSrb);//编辑
-
+    int insertWgdSrb(WgdSrb wgdSrb);//插入
-    Object queryAllWgdSrb(WgdSrb wgdSrb);
+    int deleteWgdSrb(String id);//删除
-
+    int deleteWgdSrbs(String ids);//批量删除
-    List<WgdSrb> getAllWgdSrbs();
-
-    List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb);
-
-    Object getWgdSrbById(String id);
-
-    int updateWgdSrb(WgdSrb wgdSrb);
-
-    int insertWgdSrb(WgdSrb wgdSrb);
-
-    int deleteWgdSrb(String id);
-
-    int deleteWgdSrbs(String ids);
 }

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

@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdWbtjService extends IService<WgdWbtj> {
+    List<WgdWbtj> getAllWgdWbtjs();//查询所有
+    List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj);//多条件查询
+    WgdWbtj getWgdWbtjById(String id);//查询详情
 
-    Object getAllWgdWbtj();
+    int updateWgdWbtj(WgdWbtj wgdWbtj);//编辑
-
+    int insertWgdWbtj(WgdWbtj wgdWbtj);//插入
-    Object queryAllWgdWbtj(WgdWbtj wgdWbtj);
+    int deleteWgdWbtj(String id);//删除
-
+    int deleteWgdWbtjs(String ids);//批量删除
-    List<WgdWbtj> getAllWgdWbtjs();
-
-    List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj);
-
-    Object getWgdWbtjById(String id);
-
-    int updateWgdWbtj(WgdWbtj wgdWbtj);
-
-    int insertWgdWbtj(WgdWbtj wgdWbtj);
-
-    int deleteWgdWbtj(String id);
-
-    int deleteWgdWbtjs(String ids);
 }

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

@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdWbxdService extends IService<WgdWbxd> {
+    List<WgdWbxd> getAllWgdWbxds();//查询所有
+    List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd);//多条件查询
+    WgdWbxd getWgdWbxdById(String id);//查询详情
 
-    Object getAllWgdWbxd();
+    int updateWgdWbxd(WgdWbxd wgdWbxd);//编辑
-
+    int insertWgdWbxd(WgdWbxd wgdWbxd);//插入
-    Object queryAllWgdWbxd(WgdWbxd wgdWbxd);
+    int deleteWgdWbxd(String id);//删除
-
+    int deleteWgdWbxds(String ids);//批量删除
-    List<WgdWbxd> getAllWgdWbxds();
-
-    List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd);
-
-    Object getWgdWbxdById(String id);
-
-    int updateWgdWbxd(WgdWbxd wgdWbxd);
-
-    int insertWgdWbxd(WgdWbxd wgdWbxd);
-
-    int deleteWgdWbxd(String id);
-
-    int deleteWgdWbxds(String ids);
 }

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

@@ -14,22 +14,12 @@ import java.util.List;
  * @since 2021-11-12
  */
 public interface IWgdZcbService extends IService<WgdZcb> {
+    List<WgdZcb> getAllWgdZcbs();//查询所有
+    List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb);//多条件查询
+    WgdZcb getWgdZcbById(String id);//查询详情
 
-    Object getAllWgdZcb();
+    int updateWgdZcb(WgdZcb wgdZcb);//编辑
-
+    int insertWgdZcb(WgdZcb wgdZcb);//插入
-    Object queryAllWgdZcb(WgdZcb wgdZcb);
+    int deleteWgdZcb(String id);//删除
-
+    int deleteWgdZcbs(String ids);//批量删除
-    List<WgdZcb> getAllWgdZcbs();
-
-    List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb);
-
-    Object getWgdZcbById(String id);
-
-    int updateWgdZcb(WgdZcb wgdZcb);
-
-    int insertWgdZcb(WgdZcb wgdZcb);
-
-    int deleteWgdZcb(String id);
-
-    int deleteWgdZcbs(String ids);
 }

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

@@ -19,7 +19,7 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> implements IWgdCgfyService {
+public class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy> implements IWgdCgfyService {
 
     @Autowired
     WgdCgfyDao wgdCgfyDao;
@@ -31,6 +31,8 @@ public abstract class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy
 
     @Override
     public List<WgdCgfy> queryAllWgdCgfys(WgdCgfy wgdCgfy) {
+        Integer count = wgdCgfyDao.getQueryTotal(wgdCgfy);
+        wgdCgfy.getPager().setRowCount(count);
         return wgdCgfyDao.queryAll(wgdCgfy);
     }
 
@@ -58,6 +60,6 @@ public abstract class WgdCgfyServiceImpl extends ServiceImpl<WgdCgfyDao, WgdCgfy
     @Override
     public int deleteWgdCgfys(String ids) {
         String[] str = ids.split(",");
-        return wgdCgfyDao.deleteBatch(str);
+        return wgdCgfyDao.deleteBatch();
     }
 }

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

@@ -1,7 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
-import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdFyfyDao;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdFyfy;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdFyfyService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,7 +19,8 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> implements IWgdFyfyService {
+public class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy> implements IWgdFyfyService {
+
     @Autowired
     WgdFyfyDao wgdFyfyDao;
 
@@ -30,6 +31,8 @@ public abstract class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy
 
     @Override
     public List<WgdFyfy> queryAllWgdFyfys(WgdFyfy wgdFyfy) {
+        Integer count = wgdFyfyDao.getQueryTotal(wgdFyfy);
+        wgdFyfy.getPager().setRowCount(count);
         return wgdFyfyDao.queryAll(wgdFyfy);
     }
 
@@ -57,6 +60,6 @@ public abstract class WgdFyfyServiceImpl extends ServiceImpl<WgdFyfyDao, WgdFyfy
     @Override
     public int deleteWgdFyfys(String ids) {
         String[] str = ids.split(",");
-        return wgdFyfyDao.deleteBatch(str);
+        return wgdFyfyDao.deleteBatch();
     }
-}
+}

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

@@ -1,7 +1,7 @@
 package com.adc.da.slrs.wgdCensusLeo.service.impl;
 
-import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.dao.WgdSrbDao;
+import com.adc.da.slrs.wgdCensusLeo.entity.WgdSrb;
 import com.adc.da.slrs.wgdCensusLeo.service.IWgdSrbService;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,9 +19,11 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements IWgdSrbService {
+public class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> implements IWgdSrbService {
+
     @Autowired
     WgdSrbDao wgdSrbDao;
+
     @Override
     public List<WgdSrb> getAllWgdSrbs() {
         return wgdSrbDao.selectAll();
@@ -29,6 +31,8 @@ public abstract class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> i
 
     @Override
     public List<WgdSrb> queryAllWgdSrbs(WgdSrb wgdSrb) {
+        Integer count = wgdSrbDao.getQueryTotal(wgdSrb);
+        wgdSrb.getPager().setRowCount(count);
         return wgdSrbDao.queryAll(wgdSrb);
     }
 
@@ -56,6 +60,6 @@ public abstract class WgdSrbServiceImpl extends ServiceImpl<WgdSrbDao, WgdSrb> i
     @Override
     public int deleteWgdSrbs(String ids) {
         String[] str = ids.split(",");
-        return wgdSrbDao.deleteBatch(str);
+        return wgdSrbDao.deleteBatch();
     }
-}
+}

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

@@ -19,7 +19,8 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> implements IWgdWbtjService {
+public class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj> implements IWgdWbtjService {
+
     @Autowired
     WgdWbtjDao wgdWbtjDao;
 
@@ -30,6 +31,8 @@ public abstract class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj
 
     @Override
     public List<WgdWbtj> queryAllWgdWbtjs(WgdWbtj wgdWbtj) {
+        Integer count = wgdWbtjDao.getQueryTotal(wgdWbtj);
+        wgdWbtj.getPager().setRowCount(count);
         return wgdWbtjDao.queryAll(wgdWbtj);
     }
 
@@ -57,6 +60,6 @@ public abstract class WgdWbtjServiceImpl extends ServiceImpl<WgdWbtjDao, WgdWbtj
     @Override
     public int deleteWgdWbtjs(String ids) {
         String[] str = ids.split(",");
-        return wgdWbtjDao.deleteBatch(str);
+        return wgdWbtjDao.deleteBatch();
     }
-}
+}

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

@@ -19,7 +19,8 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> implements IWgdWbxdService {
+public class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd> implements IWgdWbxdService {
+
     @Autowired
     WgdWbxdDao wgdWbxdDao;
 
@@ -30,6 +31,8 @@ public abstract class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd
 
     @Override
     public List<WgdWbxd> queryAllWgdWbxds(WgdWbxd wgdWbxd) {
+        Integer count = wgdWbxdDao.getQueryTotal(wgdWbxd);
+        wgdWbxd.getPager().setRowCount(count);
         return wgdWbxdDao.queryAll(wgdWbxd);
     }
 
@@ -57,6 +60,6 @@ public abstract class WgdWbxdServiceImpl extends ServiceImpl<WgdWbxdDao, WgdWbxd
     @Override
     public int deleteWgdWbxds(String ids) {
         String[] str = ids.split(",");
-        return wgdWbxdDao.deleteBatch(str);
+        return wgdWbxdDao.deleteBatch();
     }
-}
+}

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

@@ -19,7 +19,8 @@ import java.util.List;
  * @since 2021-11-12
  */
 @Service
-public abstract class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements IWgdZcbService {
+public class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> implements IWgdZcbService {
+
     @Autowired
     WgdZcbDao wgdZcbDao;
 
@@ -30,6 +31,8 @@ public abstract class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> i
 
     @Override
     public List<WgdZcb> queryAllWgdZcbs(WgdZcb wgdZcb) {
+        Integer count = wgdZcbDao.getQueryTotal(wgdZcb);
+        wgdZcb.getPager().setRowCount(count);
         return wgdZcbDao.queryAll(wgdZcb);
     }
 
@@ -57,6 +60,6 @@ public abstract class WgdZcbServiceImpl extends ServiceImpl<WgdZcbDao, WgdZcb> i
     @Override
     public int deleteWgdZcbs(String ids) {
         String[] str = ids.split(",");
-        return wgdZcbDao.deleteBatch(str);
+        return wgdZcbDao.deleteBatch();
     }
-}
+}

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

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.wgdCensusLeo.dao.WgdCgfyDao">
+    <sql id="pages">
+        <if test=" null != pageSize  ">
+            LIMIT ${(page-1) * pageSize},${pageSize}
+        </if>
+    </sql>
     <!--    基础信息-->
     <sql id="BaseInfo">
         id,type,number,name,pages,cost
     </sql>
     <!--    查询条件-->
     <sql id="Conditions">
-        <where>
+        where 1=1
             <if test="id != null and id != ''">
                 and id = #{id}
             </if>
@@ -26,18 +31,19 @@
             <if test="cost != null and cost != ''">
                 and cost = #{cost}
             </if>
-        </where>
     </sql>
-    <!--    查询所有-->
+    <select id="getQueryTotal" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy" resultType="java.lang.Integer">
+        select count(*) from wgd_cgfy
+        <include refid="Conditions"></include>
+    </select>
     <select id="selectAll" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
         select <include refid="BaseInfo"></include> from wgd_cgfy
     </select>
-    <!--    多条件查询-->
     <select id="queryAll" parameterType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
         select <include refid="BaseInfo"></include> from wgd_cgfy
         <include refid="Conditions"></include>
+        <include refid="pages"></include>
     </select>
-    <!--    查询详情-->
     <select id="selectOne" parameterType="java.lang.String" resultType="com.adc.da.slrs.wgdCensusLeo.entity.WgdCgfy">
         select <include refid="BaseInfo"></include> from wgd_cgfy
         where id = #{id}