问题优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -2662,10 +2662,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(record.getContractNo()).getData();
             record.setSaleTypeKey(busSalesOrder.getPayTypeKey());
             record.setSaleTypeValue(busSalesOrder.getPayType());
-            List<String> strings = finBillVehicleFeign.fetchByUseOrgSid(useOrgSid, record.getContractNo()).getData();
             BusVehicleQKKPQuery busVehicleQKKPQuery = new BusVehicleQKKPQuery();
             busVehicleQKKPQuery.setContractNo(record.getContractNo());
-            busVehicleQKKPQuery.setVinSids(strings);
             List<BusVehicleQKKPVo> busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData();
             if (busVehicleQKKPVos != null){
                 if (busVehicleQKKPVos.size() != 0){
@@ -2674,6 +2672,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             }
         }
         pagging.setRecords(recordsNew);
+        pagging.setTotal(recordsNew.size());
         PagerVo<CommonContractVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }
@@ -2724,10 +2723,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             List<ContractPageVo> recordsNew = new ArrayList<>();
             if (records != null){
                 for (ContractPageVo record : records) {
-                    List<String> strings = finBillVehicleFeign.fetchByUseOrgSid(useOrgSid, record.getContractId()).getData();
                     BusVehicleQKKPQuery busVehicleQKKPQuery = new BusVehicleQKKPQuery();
                     busVehicleQKKPQuery.setContractNo(record.getContractId());
-                    busVehicleQKKPQuery.setVinSids(strings);
                     List<BusVehicleQKKPVo> busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData();
                     if (busVehicleQKKPVos != null){
                         if (busVehicleQKKPVos.size() != 0){

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPVo.java

@@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -26,6 +27,8 @@ public class BusVehicleQKKPVo implements Vo {
     private String certificateState; // 合格证状态key
     @ApiModelProperty("合格证状态value")
     private String certificateStateValue; // 合格证状态value
+    @ApiModelProperty("主车合格证照片")
+    private List<String> zcHgzImages = new ArrayList<>();
     @ApiModelProperty(value = "挂车信息")
     private List<BusVehicleQKKPTrailerVo> trailers;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java

@@ -4,6 +4,9 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class AppVinListDto implements Dto {
     private static final long serialVersionUID = 1941205415631089700L;
@@ -37,4 +40,7 @@ public class AppVinListDto implements Dto {
     private String certificateState; // 合格证
     @ApiModelProperty("开票信息")
     private String invoiceInfo; // 开票信息
+
+    @ApiModelProperty("主车合格证照片")
+    private List<String> zcHgzImages = new ArrayList<>();
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.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 AppVinListVo implements Vo {
 
@@ -30,4 +33,7 @@ public class AppVinListVo implements Vo {
 
     @ApiModelProperty("合格证")
     private Boolean certificateState;
+
+    @ApiModelProperty("主车合格证照片")
+    private List<String> zcHgzImages = new ArrayList<>();
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java

@@ -33,6 +33,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: anrui-fin(开票申请管理) <br/>
  * File: FinBillVehicleDto.java <br/>
@@ -83,4 +86,7 @@ public class FinBillVehicleDto implements Dto {
     private String certificateStateValue; // 合格证状态value
     @ApiModelProperty("开票信息")
     private String openTickRemarks; // 开票信息
+
+    @ApiModelProperty("主车合格证照片")
+    private List<String> zcHgzImages = new ArrayList<>();
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppCarListDto.java

@@ -4,6 +4,9 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 public class AppCarListDto implements Dto {
     private static final long serialVersionUID = -7003788760351399800L;
@@ -26,4 +29,6 @@ public class AppCarListDto implements Dto {
     private String certificateStateKey;
     @ApiModelProperty("合格证状态value")
     private String certificateState;
+    @ApiModelProperty("主车合格证照片")
+    private List<String> zcHgzImages = new ArrayList<>();
 }