app款项确认分页接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeign.java

@@ -72,9 +72,9 @@ public interface BusCollectionConfirmationFeign {
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid);
 
-    /*                            App接口                                               */
+    /*---------------------App接口 ---------------------*/
 
     @ApiOperation("手机端—获取款项确认列表")
     @PostMapping("/getCollectionConfirmList")
-    public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq);
+    public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(@RequestBody PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buscollectionconfirmation/BusCollectionConfirmationFeignFallback.java

@@ -69,4 +69,9 @@ public class BusCollectionConfirmationFeignFallback implements BusCollectionConf
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-buscenter/buscollectionconfirmation/fetchBySid无法访问");
 	}
+
+	@Override
+	public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
+		return null;
+	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.java

@@ -26,9 +26,12 @@
 package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo;
+import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -62,4 +65,6 @@ public interface BusCollectionConfirmationMapper extends BaseMapper<BusCollectio
 
     @Select("select * from bus_collection_confirmation")
     List<BusCollectionConfirmationVo> selectListVo();
+
+    IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(IPage<AppBusCollectionConfirmationQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusCollectionConfirmationPageVo> qw);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationMapper.xml

@@ -10,4 +10,9 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.BusCollectionConfirmationVo">
 		SELECT * FROM bus_collection_confirmation <where> ${ew.sqlSegment} </where>
 	</select>
+
+    <select id="getCollectionConfirmList"
+            resultType="com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusCollectionConfirmationPageVo">
+
+	</select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationRest.java

@@ -25,6 +25,8 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.buscenter.api.buscollectionconfirmation.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -60,7 +62,7 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
     @Override
     @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
-	public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq){
+    public ResultBean<PagerVo<BusCollectionConfirmationVo>> listPage(@RequestBody PagerQuery<BusCollectionConfirmationQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<BusCollectionConfirmationVo> pv = busCollectionConfirmationService.listPageVo(pq);
         return rb.success().setData(pv);
@@ -69,7 +71,7 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
     @Override
     @ApiOperation("新增或修改保存")
     @PostMapping("/saveOrUpdate")
-	public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto){
+    public ResultBean saveOrUpdate(@RequestBody BusCollectionConfirmationDto dto) {
         return busCollectionConfirmationService.saveOrUpdateAllDto(dto);
     }
 
@@ -83,7 +85,20 @@ public class BusCollectionConfirmationRest implements BusCollectionConfirmationF
     @Override
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
-    public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid){
+    public ResultBean<BusCollectionConfirmationDetailsVo> fetchBySid(@PathVariable("sid") String sid) {
         return busCollectionConfirmationService.fetchByAllSid(sid);
     }
+
+    /**
+     * 手机端—获取款项确认列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    @Override
+    public ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
+        ResultBean<PagerVo<AppBusCollectionConfirmationPageVo>> rb = ResultBean.fireFail();
+        IPage<AppBusCollectionConfirmationPageVo> page = busCollectionConfirmationService.getCollectionConfirmList(pagerQuery);
+        return null;
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleQuery;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
@@ -111,13 +113,13 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
         List<BusCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs = dto.getRemittanceConfirmationAppendixs();
         String sid1 = busCollectionConfirmation.getSid();
         String sid = dto.getSid();
-		if (StringUtils.isBlank(sid)){//新增
+        if (StringUtils.isBlank(sid)) {//新增
-			BeanUtil.copyProperties(dto,busCollectionConfirmation);
+            BeanUtil.copyProperties(dto, busCollectionConfirmation);
             busCollectionConfirmation.setSid(sid1);
             String payFilePath = "";
             String remFilePath = "";
             for (BusCollectionConfirmationAppendixDto paymentVoucherAppendix : paymentVoucherAppendixs) {
-				BeanUtil.copyProperties(paymentVoucherAppendix,commonAppendixDto);
+                BeanUtil.copyProperties(paymentVoucherAppendix, commonAppendixDto);
                 payFilePath = commonAppendixDto.getFilePath();
                 if (payFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                     payFilePath = payFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -131,7 +133,7 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
             }
             busCollectionConfirmation.setPaymentVoucherUrl(payFilePath.substring(0, payFilePath.length() - 1));
             for (BusCollectionConfirmationAppendixDto remittanceConfirmationAppendix : remittanceConfirmationAppendixs) {
-				BeanUtil.copyProperties(remittanceConfirmationAppendix,commonAppendixDto);
+                BeanUtil.copyProperties(remittanceConfirmationAppendix, commonAppendixDto);
                 remFilePath = commonAppendixDto.getFilePath();
                 if (remFilePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                     remFilePath = remFilePath.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -147,17 +149,17 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
             save(busCollectionConfirmation);
             for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
                 BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
-				BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed);
+                BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed);
                 busSelectedReceivablesDetailed.setCollSid(sid1);
                 busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
             }
             return rb.success().setMsg("添加成功");
         }
-		updateBySid(dto,sid);
+        updateBySid(dto, sid);
         busSelectedReceivablesDetailedService.deleteByCollSid(sid);
         for (BusSelectedReceivablesDetailedDto busSelectedReceivablesDetailedDto : busSelectedReceivablesDetailedDtos) {
             BusSelectedReceivablesDetailed busSelectedReceivablesDetailed = new BusSelectedReceivablesDetailed();
-			BeanUtil.copyProperties(busSelectedReceivablesDetailedDto,busSelectedReceivablesDetailed);
+            BeanUtil.copyProperties(busSelectedReceivablesDetailedDto, busSelectedReceivablesDetailed);
             busSelectedReceivablesDetailed.setCollSid(sid);
             busSelectedReceivablesDetailedService.save(busSelectedReceivablesDetailed);
         }
@@ -168,7 +170,7 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
         ResultBean rb = ResultBean.fireFail();
         BusCollectionConfirmationDetailsVo busCollectionConfirmationDetailsVo = new BusCollectionConfirmationDetailsVo();
         BusCollectionConfirmation busCollectionConfirmation = fetchBySid(sid);
-		BeanUtil.copyProperties(busCollectionConfirmation,busCollectionConfirmationDetailsVo);
+        BeanUtil.copyProperties(busCollectionConfirmation, busCollectionConfirmationDetailsVo);
         List<BusSelectedReceivablesDetailedVo> busSelectedReceivablesDetailedVos = busSelectedReceivablesDetailedService.fetchByCillSid(sid);
         busCollectionConfirmationDetailsVo.setBusSelectedReceivablesDetailedVos(busSelectedReceivablesDetailedVos);
         return rb.success().setData(busCollectionConfirmationDetailsVo);
@@ -182,4 +184,32 @@ public class BusCollectionConfirmationService extends MybatisBaseService<BusColl
         }
         return rb.success().setMsg("删除成功");
     }
+
+    /**
+     * 手机端—获取款项确认列表
+     *
+     * @param pagerQuery
+     * @return
+     */
+    public IPage<AppBusCollectionConfirmationPageVo> getCollectionConfirmList(PagerQuery<AppBusCollectionConfirmationQuery> pagerQuery) {
+        IPage<AppBusCollectionConfirmationQuery> page = PagerUtil.queryToPage(pagerQuery);
+        QueryWrapper<AppBusCollectionConfirmationPageVo> qw = appBuildQueryWrapper(pagerQuery.getParams());
+        return baseMapper.getCollectionConfirmList(page,qw);
+    }
+
+    /**
+     * 构造条件
+     *
+     * @param pagerQuery 查询条件
+     * @return
+     */
+    private QueryWrapper<AppBusCollectionConfirmationPageVo> appBuildQueryWrapper(AppBusCollectionConfirmationQuery pagerQuery) {
+		QueryWrapper<AppBusCollectionConfirmationPageVo> qw = new QueryWrapper<>();
+		if (pagerQuery != null) {
+			if (com.yxt.common.base.utils.StringUtils.isNotBlank(pagerQuery.getName())) {//车架号
+				qw.like("bv.vinNo", pagerQuery.getName());
+			}
+		}
+		return qw;
+    }
 }