优化交车准备状态显示

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java

@@ -131,13 +131,13 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
         list.removeAll(Collections.singleton(null));
         for(AppBusHandoverPrepareVehicleInfoVo vo : list){
             //先判断是否准备好合格证
-            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode());
+            ResultBean<BusTransferRecords> busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid("",vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.HGZ.getCode());
             if (busTransferRecordsResultBean.getData() != null && !vo.isCertificateState()) {
                 vo.setCertificateStateStr("原件接收确认");
             }
             //判断发票是否准备好
             //根据车辆sid以及销售专员的用户sid查询是否有待接收的记录
-            busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode());
+            busTransferRecordsResultBean = busTransferRecordsService.selectByVinSid(busHandoverPrepare.getContractNo(),vo.getVinSid(), receiveUserSid, BusTransferRecordEnum.FP.getCode());
             if (busTransferRecordsResultBean.getData() != null && !vo.isInvoicingState()) {
                 vo.setInvoicingStateStr("原件接收确认");
             }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.java

@@ -24,7 +24,7 @@ import java.util.List;
 public interface BusTransferRecordsMapper extends BaseMapper<BusTransferRecords> {
     IPage<BusTransferRecordsVo> pagerList(IPage<BusTransferRecords> page, @Param(Constants.WRAPPER)QueryWrapper<BusTransferRecords> qw, @Param("list") List<String> roleSidList);
 
-    BusTransferRecords selectByVinSid(@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid,@Param("typeKey") String typeKey);
+    BusTransferRecords selectByVinSid(@Param("contractNo") String contractNo,@Param("vinSid") String vinSid, @Param("userSid") String receiveUserSid,@Param("typeKey") String typeKey);
 
     @Delete("DELETE FROM bus_transfer_records WHERE goodsSid = #{sourceSid}")
     void delBySourceSid(String sourceSid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsMapper.xml

@@ -34,6 +34,9 @@
         where vinSid = #{vinSid}
           and receiveSid = #{userSid}
           and goodsTypeKey = #{typeKey}
+        <if test="contractNo != null and contractNo != ''">
+            and contractNo = #{contractNo}
+        </if>
     </select>
 
     <select id="hgzPagerList" resultType="com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsHgzVo">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bustransferrecords/BusTransferRecordsService.java

@@ -189,9 +189,9 @@ public class BusTransferRecordsService extends MybatisBaseService<BusTransferRec
         return rb.success().setData(busRecordsInvoiceVo);
     }
 
-    public ResultBean<BusTransferRecords> selectByVinSid(String vinSid, String receiveUserSid, String type) {
+    public ResultBean<BusTransferRecords> selectByVinSid(String contractNo,String vinSid, String receiveUserSid, String type) {
         ResultBean<BusTransferRecords> rb = ResultBean.fireFail();
-        BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(vinSid, receiveUserSid, type);
+        BusTransferRecords BusTransferRecords = baseMapper.selectByVinSid(contractNo,vinSid, receiveUserSid, type);
         return rb.success().setData(BusTransferRecords);
     }