Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java

@@ -69,6 +69,6 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
     @Update("update fin_vehicle_invoice set isTakeTicket = '是' where sid = #{sid}")
     void updateIsLPBySid(String sid);
 
-    List<FinSelectInvoiceVo> getFinSelectInvoiceVoListByVinNo(String vinNo);
+    List<FinSelectInvoiceVo> getFinSelectInvoiceVoListByBusVinSid(@Param("busVinSid") String busVinSid, @Param("contractNo") String contractNo);
 
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@@ -260,7 +260,7 @@
         where vehicleSid = #{vinSid}
           and contractNo = #{contractNo}
     </select>
-    <select id="getFinSelectInvoiceVoListByVinNo"
+    <select id="getFinSelectInvoiceVoListByBusVinSid"
             resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinSelectInvoiceVo">
         select fu.busVinSid,
                fu.receivablesName,
@@ -275,7 +275,8 @@
         FROM fin_selected_receivables_detailed as fs
                  LEFT JOIN fin_uncollected_receivables_detailed as fu ON fu.sid = fs.receivablesSid
                  LEFT JOIN fin_collection_confirmation as co ON fs.collSid = co.sid
-        WHERE fs.VIN = #{vinNo}
+        WHERE fu.busVinSid = #{busVinSid}
+          and fS.contractNo = #{contractNo}
           and fs.auditState = '3'
         ORDER BY co.createTime DESC
     </select>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@@ -626,7 +626,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
                     } else {
                         vinNo = linkNo;
                     }
-                    List<FinSelectInvoiceVo> finSelectVoList = baseMapper.getFinSelectInvoiceVoListByVinNo(vinNo);
+                    List<FinSelectInvoiceVo> finSelectVoList = baseMapper.getFinSelectInvoiceVoListByBusVinSid(busSalesOrderVehicle.getSid(), contractNo);
                     finSelectVoList.removeAll(Collections.singleton(null));
                     if (!finSelectVoList.isEmpty()) {
                         for (FinSelectInvoiceVo finSelectInvoiceVo : finSelectVoList) {