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

@@ -106,9 +106,9 @@ public interface BaseTrailerMapper extends BaseMapper<BaseTrailer> {
     List<BaseTrailer> getByVehSid(@Param("vehSid") String vehSid);
 
     @Select("select * from base_trailer where vinNo = #{gcVinNo} and vehSid = #{vehSid} order by id desc limit 1")
-    BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo,@Param("vehSid") String vehSid);
+    BaseTrailerDetailsVo fetchByGcVinNoAndVehSid(@Param("gcVinNo") String gcVinNo, @Param("vehSid") String vehSid);
 
     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/BaseTrailerMapper.xml

@@ -110,36 +110,36 @@
 
     <select id="payApply" resultType="com.yxt.anrui.base.api.basetrailer.PayApplyTrailerVo">
         SELECT btm.trailerTypeValue,
-               CONCAT(
-                       btm.appearanceSizeLong,
-                       btm.appearanceSizeWide,
-                       btm.appearanceSizeHigh
-                   ) AS size,
-                bt.vinNo,
-                bt.sid AS trailerSid,
-                btm.boxColor AS color,
-                bt.settlementPrice AS costPrice,
-                btm.brandName,
-                btm.carModelName AS vehModel,
-                bt.zcvinNo AS zcVinNo,
-                bso.contractNo,
-                bso.billNo AS saleOrderNo,
-                bso.customerName,
-                bso.payType
+        CONCAT(
+        btm.appearanceSizeLong,
+        btm.appearanceSizeWide,
+        btm.appearanceSizeHigh
+        ) AS size,
+        bt.vinNo,
+        bt.sid AS trailerSid,
+        btm.boxColor AS color,
+        bt.settlementPrice AS costPrice,
+        btm.brandName,
+        btm.carModelName AS vehModel,
+        bt.zcvinNo AS zcVinNo,
+        bso.contractNo,
+        bso.billNo AS saleOrderNo,
+        bso.customerName,
+        bso.payType
         FROM
-            base_trailer bt
-            LEFT JOIN base_trailer_model btm
+        base_trailer bt
+        LEFT JOIN base_trailer_model btm
         ON bt.trailerModelSid = btm.sid
-            LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bsov
-            ON bt.vehSid = bsov.linkSid
-            LEFT JOIN anrui_buscenter.bus_sales_order bso
-            ON bsov.salesOrderSid = bso.sid
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bsov
+        ON bt.vehSid = bsov.linkSid
+        LEFT JOIN anrui_buscenter.bus_sales_order bso
+        ON bsov.salesOrderSid = bso.sid
         <where>
             ${ew.sqlSegment}
         </where>
-          AND bt.sid NOT IN (
-            SELECT ft.trailerSid
-            FROM anrui_fin.fin_paymentapply_trailer ft
-            )
+        AND bt.sid NOT IN (
+        SELECT ft.trailerSid
+        FROM anrui_fin.fin_paymentapply_trailer ft
+        )
     </select>
 </mapper>

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);
-        return rb.success().setData(payApplyTrailerVoList);
+        IPage<BaseTrailer> page = PagerUtil.queryToPage(pq);
+        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

@@ -56,20 +56,20 @@ import java.util.List;
 @Mapper
 public interface BaseVehinstallMapper extends BaseMapper<BaseVehinstall> {
 
-	//@Update("update base_vehinstall set name=#{msg} where id=#{id}")
-	//IPage<BaseVehinstallVo> voPage(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehinstall> qw);
-	
-	IPage<BaseVehinstallVo> selectPageVo(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
-	
-	List<BaseVehinstallVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
-	
-	@Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}")
-	List<String> selectListVo(String createOrgSid);
+    //@Update("update base_vehinstall set name=#{msg} where id=#{id}")
+    //IPage<BaseVehinstallVo> voPage(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehinstall> qw);
+
+    IPage<BaseVehinstallVo> selectPageVo(IPage<BaseVehinstall> page, @Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
+
+    List<BaseVehinstallVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseVehinstall> qw);
+
+    @Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}")
+    List<String> selectListVo(String createOrgSid);
 
     List<BaseVehinstall> selectByOrgSidAndVin(@Param("useOrgSid") String orgSid, @Param("vinNo") String vin);
 
-	@Select("select * from base_vehinstall where createOrg = #{createOrgSid} and vinNo = #{vinNo}")
-    BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo,@Param("createOrgSid") String createOrgSid);
+    @Select("select * from base_vehinstall where createOrg = #{createOrgSid} and vinNo = #{vinNo}")
+    BaseVehinstallDetailsVo fetchByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("createOrgSid") String createOrgSid);
 
     BaseVehinstall seletByVinAndUseOrg(@Param("vinNo") String vinNo, @Param("useOrgSid") String useOrgSid);
 
@@ -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);
-        return rb.success().setData(payApplyTopVoList);
+        IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
+        IPage<PayApplyTopVo> pagging = baseMapper.payApply(page, qw);
+        PagerVo<PayApplyTopVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
     }
 }