diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java index 9097559147..9885b1b62e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java +++ b/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> payApply(@RequestBody PayApplyTrailerQuery query); + public ResultBean> payApply(@RequestBody PagerQuery query); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java index f2155fa2be..868f33c3a5 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java +++ b/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 fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) { return null; } + + @Override + public ResultBean> payApply(PagerQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java index 8970926a6a..446d1a23ef 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeign.java +++ b/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> payApply(@RequestBody PayApplyTopQuery query); + public ResultBean> payApply(@RequestBody PagerQuery query); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java index 42860e8a52..21e61322db 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/BaseVehinstallFeignFallback.java +++ b/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> payApply(PagerQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java index 3cb08d9be4..561a8ba515 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.java +++ b/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 { List 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 fetchTypeAndMan(String materialSid); - List payApply(@Param(Constants.WRAPPER) Wrapper qw); + IPage payApply(IPage page, @Param(Constants.WRAPPER) Wrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml index 354e1b7bec..26ddc0aa21 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml @@ -110,36 +110,36 @@ \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java index 0a1c3ad7ac..731bd502b4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java +++ b/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> payApply(PayApplyTrailerQuery query) { + public ResultBean> payApply(PagerQuery query) { return baseTrailerService.payApply(query); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java index f2aebe9e4c..3d8ac5678e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java +++ b/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> payApply(PayApplyTrailerQuery query) { + public ResultBean> payApply(PagerQuery 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 payApplyTrailerVoList = baseMapper.payApply(qw); - return rb.success().setData(payApplyTrailerVoList); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.payApply(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java index f35c4025c2..9554b27387 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.java +++ b/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 { - //@Update("update base_vehinstall set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}") - List selectListVo(String createOrgSid); + //@Update("update base_vehinstall set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select vinNo from base_vehinstall where createOrg = #{createOrgSid}") + List selectListVo(String createOrgSid); List 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 { String selectNum(String billNo); - List payApply(@Param(Constants.WRAPPER) QueryWrapper qw); + IPage payApply(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java index 765dca7b23..5aa777e381 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallRest.java +++ b/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> payApply(PayApplyTopQuery query) { + public ResultBean> payApply(PagerQuery query) { return baseVehinstallService.payApply(query); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java index 777ade0156..9de9328352 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java +++ b/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> payApply(PayApplyTopQuery query) { + public ResultBean> payApply(PagerQuery 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 payApplyTopVoList = baseMapper.payApply(qw); - return rb.success().setData(payApplyTopVoList); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.payApply(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); } } \ No newline at end of file