Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java

@@ -145,5 +145,5 @@ public interface BaseTrailerFeign {
 
     @ApiOperation("付款申请选择挂车")
     @PostMapping("/payApply")
-    public ResultBean<List<PayApplyTrailerVo>> payApply(@RequestBody PayApplyTrailerQuery query);
+    public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(@RequestBody PagerQuery<PayApplyTrailerQuery> query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java

@@ -108,4 +108,9 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign {
 	public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(PagerQuery<PayApplyTrailerQuery> query) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java

@@ -98,5 +98,5 @@ public interface BaseVehinstallFeign {
 
     @ApiOperation("付款申请选择上装")
     @PostMapping("/payApply")
-    public ResultBean<List<PayApplyTopVo>> payApply(@RequestBody PayApplyTopQuery query);
+    public ResultBean<PagerVo<PayApplyTopVo>> payApply(@RequestBody PagerQuery<PayApplyTopQuery> query);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java

@@ -89,4 +89,9 @@ public class BaseVehinstallFeignFallback implements BaseVehinstallFeign {
 	public ResultBean vehinstallOutNew(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<PagerVo<PayApplyTopVo>> payApply(PagerQuery<PayApplyTopQuery> query) {
+		return null;
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java

@@ -110,5 +110,5 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
 
     List<BaseTrailerModelDetailsVo> fetchTypeAndMan(String materialSid);
 
-    List<PayApplyTrailerVo> payApply(@Param(Constants.WRAPPER) Wrapper<BaseTrailer> qw);
+    IPage<PayApplyTrailerVo> payApply(IPage<BaseTrailer> page, @Param(Constants.WRAPPER) Wrapper<BaseTrailer> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java

@@ -138,7 +138,7 @@ public class BaseTrailerRest implements BaseTrailerFeign {
     }
 
     @Override
-    public ResultBean<List<PayApplyTrailerVo>> payApply(PayApplyTrailerQuery query) {
+    public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(PagerQuery<PayApplyTrailerQuery> query) {
         return baseTrailerService.payApply(query);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -984,8 +984,9 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         return baseMapper.fetchTypeAndMan(vehSid);
     }
 
-    public ResultBean<List<PayApplyTrailerVo>> payApply(PayApplyTrailerQuery query) {
+    public ResultBean<PagerVo<PayApplyTrailerVo>> payApply(PagerQuery<PayApplyTrailerQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
+        PayApplyTrailerQuery query = pq.getParams();
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("bt.useOrgSid", query.getUseOrgSid());
         if (StringUtils.isNotBlank(query.getVinNo())) {
@@ -1000,7 +1001,9 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         if (StringUtils.isNotBlank(query.getTrailerTypeValue())) {
             qw.like("btm.trailerTypeValue", query.getTrailerTypeValue());
         }
-        List<PayApplyTrailerVo> payApplyTrailerVoList = baseMapper.payApply(qw);
+        IPage<BaseTrailer> page = PagerUtil.queryToPage(pq);
-        return rb.success().setData(payApplyTrailerVoList);
+        IPage<PayApplyTrailerVo> pagging = baseMapper.payApply(page, qw);
+        PagerVo<PayApplyTrailerVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java

@@ -77,5 +77,5 @@ public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
 
     String selectNum(String billNo);
 
-    List<PayApplyTopVo> payApply(@Param(Constants.WRAPPER) QueryWrapper qw);
+    IPage<PayApplyTopVo> payApply(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) QueryWrapper qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java

@@ -299,7 +299,7 @@ public class BaseVehinstallRest implements BaseVehinstallFeign {
     }
 
     @Override
-    public ResultBean<List<PayApplyTopVo>> payApply(PayApplyTopQuery query) {
+    public ResultBean<PagerVo<PayApplyTopVo>> payApply(PagerQuery<PayApplyTopQuery> query) {
         return baseVehinstallService.payApply(query);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -521,8 +521,9 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         return rb.success();
     }
 
-    public ResultBean<List<PayApplyTopVo>> payApply(PayApplyTopQuery query) {
+    public ResultBean<PagerVo<PayApplyTopVo>> payApply(PagerQuery<PayApplyTopQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
+        PayApplyTopQuery query = pq.getParams();
         QueryWrapper qw = new QueryWrapper<>();
         qw.eq("bv.useOrgSid", query.getUseOrgSid());
         if (StringUtils.isNotBlank(query.getVinNo())) {
@@ -534,7 +535,9 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         if (StringUtils.isNotBlank(query.getInstallNameValue())) {
             qw.like("bvm.installNameValue", query.getInstallNameValue());
         }
-        List<PayApplyTopVo> payApplyTopVoList = baseMapper.payApply(qw);
+        IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
-        return rb.success().setData(payApplyTopVoList);
+        IPage<PayApplyTopVo> pagging = baseMapper.payApply(page, qw);
+        PagerVo<PayApplyTopVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
     }
 }