优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -230,6 +230,8 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
                 BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(modelSid);
                 vos.setCarDetailPage(appVehicleVersionVo);
                 vos.setVehicleAlias(baseVehicleModel.getModelName());
+                vos.setGuidedPrice(vos.getGuidedPrice()+"调到"+vos.getTzhGuidedPrice());
+                vos.setManufactorSettlementPrice(vos.getManufactorSettlementPrice()+"调到"+vos.getTzhManufactorSettlementPrice());
             });
         }
         baseModelModpriceDetailVo.setBaseModelModpriceModels(baseModelModpriceModelVos);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -538,6 +538,11 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
             List<String> vinSidList  = busHandoverPrepareVehicleList.stream().map(v->v.getVinSid()).collect(Collectors.toList());
             //查询车辆的随车资料是否都已移交
             List<String> countList = busVehicleInformationHandoverService.selectByVinSid(vinSidList);
+            List<String> countList1 = busVehicleInformationHandoverService.selectByVinSid1(vinSidList);
+            countList1.removeAll(Collections.singleton(null));
+            if(countList1.size() != vinSidList.size()){
+                return rb.setMsg("车辆中包含随车资料记录为空的车辆，请检查");
+            }
             if(!countList.isEmpty()){
                 return rb.setMsg("车辆："+String.join(",",countList)+"随车资料未完成交接");
             }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java

@@ -26,6 +26,7 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper<BusVehic
     BusVehicleInformationHandover detailsByVinSid(@Param("sid")String sid);
 
     List<String> selectByVinSid(@Param("list") List<String> vinSidList);
+    List<String> selectByVinSid1(@Param("list") List<String> vinSidList);
 
     IPage<AppInformationListVo> selectAppPageVo(IPage<BusVehicleInformationHandover> page, @Param(Constants.WRAPPER)QueryWrapper<AppInformationListVo> qw);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml

@@ -57,6 +57,14 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="selectByVinSid1" resultType="java.lang.String">
+        select bh.vinNo
+        from bus_vehicle_information_handover bh where bh.vehicleSid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
     <select id="selectAppPageVo"
             resultType="com.yxt.anrui.buscenter.api.busvehicleinformationhandover.AppInformationListVo">
         SELECT

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java

@@ -574,6 +574,10 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService<Bus
         return baseMapper.selectByVinSid(vinSidList);
     }
 
+    public List<String> selectByVinSid1(List<String> vinSidList) {
+        return baseMapper.selectByVinSid1(vinSidList);
+    }
+
     /*********************************移动端接口************************************************/
     /**
      * 分页列表

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -97,5 +97,5 @@ public interface AppFinCollectionConfirmationFeign {
 
     @ApiOperation("查询已认款列表")
     @PostMapping("/selectPageList")
-    ResultBean<CollectedReceivablesDetailedVo> selectPageList(@RequestBody PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery);
+    ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(@RequestBody PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -98,7 +98,7 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 	}
 
 	@Override
-	public ResultBean<CollectedReceivablesDetailedVo> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+	public ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
 		return null;
 	}
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@@ -148,7 +148,7 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
     }
 
     @Override
-    public ResultBean<CollectedReceivablesDetailedVo> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+    public ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
         return appfinCollectionConfirmationService.selectPageList(pagerQuery);
     }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -29,6 +29,9 @@ package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesPaymentDetailsQuery;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
 import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
@@ -62,6 +65,8 @@ public class AppFinCollectionConfirmationService {
     FinCollectionConfirmationFeign finCollectionConfirmationFeign;
     @Autowired
     FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
+    @Autowired
+    private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
 
 
     /**
@@ -224,7 +229,11 @@ public class AppFinCollectionConfirmationService {
         return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
     }
 
-    public ResultBean<CollectedReceivablesDetailedVo> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
-        return null;
+    public ResultBean<PagerVo<CollectedReceivablesDetailedVo>> selectPageList(PagerQuery<ReceivablesPaymentDetailsQuery> pagerQuery) {
+        ResultBean<PagerVo<CollectedReceivablesDetailedVo>> rb = ResultBean.fireFail();
+        PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
+        ResultBean<PagerVo<FinSelectReceivablesDetailedVo>> paymentDetailsList = finSelectedReceivablesDetailedFeign.selectPageList(pq);
+        PagerVo<CollectedReceivablesDetailedVo> vo = CoverUtils.selectPagerVo(paymentDetailsList.getData());
+        return rb.success().setData(vo);
     }
 }