Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -288,6 +288,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         List<BusVehicleQKKPVo> busVehicleQKKPVosNew = new ArrayList<>();
         if (busVehicleQKKPVos != null){
             for (BusVehicleQKKPVo record : busVehicleQKKPVos) {
+                //判断相同车辆是否存在已提交的申请
                 FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData();
                 if (finBillVehicleDetailsVo == null){
                     busVehicleQKKPVosNew.add(record);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java

@@ -71,7 +71,6 @@ public interface FinBillVehicleMapper extends BaseMapper<FinBillVehicle> {
 
     AppInvoicingInfoVinNoVo selDetailsByVinNo(@Param("vinNo") String vinNo);
 
-	@Select("select * from fin_bill_vehicle where vehSid = #{vehSid}")
 	FinBillVehicleDetailsVo fetchByVehSid(String vehSid);
 
 	@Update("UPDATE fin_bill_vehicle SET state = 0 WHERE billAppSid = #{sid}")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml

@@ -35,4 +35,14 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="fetchByVehSid" resultType="com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo">
+        SELECT fbv.*
+        FROM fin_bill_vehicle fbv
+                     LEFT JOIN fin_bill_application fba
+                ON fbv.`billAppSid` = fba.`sid`
+        WHERE fbv.vehSid = #{vehSid}
+          AND fba.`nodeState` != "待提交"
+  AND fba.`nodeState` != "终止"
+    </select>
 </mapper>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java

@@ -5,6 +5,9 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class VinListVo implements Vo {
 
@@ -28,4 +31,6 @@ public class VinListVo implements Vo {
     private String certificateStateKey; // 合格证状态key
     @ApiModelProperty("合格证状态value")
     private String certificateState; // 合格证状态value
+    @ApiModelProperty("主车合格证照片")
+    private List<String> zcHgzImages = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java

@@ -114,6 +114,7 @@ public class AppRovalService {
                     FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
                     finBillTrailerVo.setVinNo(trailer.getVinNo());
                     finBillTrailerVo.setGcVinNo(trailer.getGcVinNo());
+                    finBillTrailerVo.setOneBillMoney(trailer.getOneBillMoney());
                     finBillTrailerVos.add(finBillTrailerVo);
                 }
             }