财务审核明细表Bug修改

src/main/java/com/ydtech/modules/order/entity/vo/AuditExportVo.java

@@ -34,7 +34,7 @@ public class AuditExportVo {
 
     @ApiModelProperty("车牌号")
     @ExcelProperty("车牌号")
-    private String license;
+    private String licenseno;
 
     @ApiModelProperty("被保险人")
     @ExcelProperty("被保险人")

src/main/java/com/ydtech/modules/order/service/impl/ExcelExportServiceImpl.java

@@ -77,7 +77,9 @@ public class ExcelExportServiceImpl implements ExcelExportService {
         List<AuditExportVo> auditExportList = insOrdersMapper.getAuditExportList(auditExportQueryVo);
         auditExportList.forEach(item->{
             //获取驾意险保单号
-            item.setJyapplyno(OrderUtils.getJyPolicyNo(item.getCompanyId(),item.getApiType(),item.getCrossInsurance()));
+            if(item.getCrossInsurance() != null) {
+                item.setJyapplyno(OrderUtils.getJyPolicyNo(item.getCompanyId(), item.getApiType(), item.getCrossInsurance()));
+            }
         });
         return auditExportList;
     }

src/main/java/com/ydtech/utils/OrderUtils.java

@@ -29,49 +29,48 @@ public class OrderUtils {
         if(crossInsurance == null || crossInsurance.equals("")){
             return "";
         }
-        //校验apitype
-        if(apiType == null)
-        {
-            return "";
-        }
 
         JSONArray crossInsuranceJson = JSONArray.parseArray(crossInsurance);
 
-        //爬虫
-        if (ObjectUtils.isEmpty(apiType) || PtlApiType.PTL_API_2.getCode() == Integer.parseInt(apiType)) {
-            List<CrawlerVerifyPaymentResponse.DrivingInsurancesDTO> drivingInsurancesDTOS = crossInsuranceJson.toJavaList(CrawlerVerifyPaymentResponse.DrivingInsurancesDTO.class);
-            return drivingInsurancesDTOS.get(0).getApplication();
-        }
+        if(crossInsuranceJson.size() > 0) {
+            //爬虫
+            if (!ObjectUtils.isEmpty(apiType)) {
+                if (PtlApiType.PTL_API_2.getCode() == Integer.parseInt(apiType)) {
+                    List<CrawlerVerifyPaymentResponse.DrivingInsurancesDTO> drivingInsurancesDTOS = crossInsuranceJson.toJavaList(CrawlerVerifyPaymentResponse.DrivingInsurancesDTO.class);
+                    return drivingInsurancesDTOS.get(0).getApplication();
+                }
+            }
 
 
-        // 永诚
-        if(companyId.contains(InsuranceEnum.AICS.getCode())){
-            List<DrivingInsuranceDto> javaList = crossInsuranceJson.toJavaList(DrivingInsuranceDto.class);
-            return javaList.get(0).getPolicyNumber();
-        }
+            // 永诚
+            if (companyId.contains(InsuranceEnum.AICS.getCode())) {
+                List<DrivingInsuranceDto> javaList = crossInsuranceJson.toJavaList(DrivingInsuranceDto.class);
+                return javaList.get(0).getPolicyNumber();
+            }
 
-        // 大家
-        if(companyId.contains(InsuranceEnum.DJPC.getCode())){
-            List<NVHLODR1001Response.policyInfosDTO> javaList = crossInsuranceJson.toJavaList(NVHLODR1001Response.policyInfosDTO.class);
-            return javaList.get(0).getPlyNo();
-        }
+            // 大家
+            if (companyId.contains(InsuranceEnum.DJPC.getCode())) {
+                List<NVHLODR1001Response.policyInfosDTO> javaList = crossInsuranceJson.toJavaList(NVHLODR1001Response.policyInfosDTO.class);
+                return javaList.get(0).getPlyNo();
+            }
 
-        // 国任
-        if(companyId.contains(InsuranceEnum.XDCX.getCode())){
-            List<DrivingInsuranceDto> javaList = crossInsuranceJson.toJavaList(DrivingInsuranceDto.class);
-            return javaList.get(0).getPolicyNumber();
-        }
+            // 国任
+            if (companyId.contains(InsuranceEnum.XDCX.getCode())) {
+                List<DrivingInsuranceDto> javaList = crossInsuranceJson.toJavaList(DrivingInsuranceDto.class);
+                return javaList.get(0).getPolicyNumber();
+            }
 
-        // 中煤
-        if(companyId.contains(InsuranceEnum.ZMBX.getCode())){
-            List<SubmitResponse.AccidentNo> javaList = crossInsuranceJson.toJavaList(SubmitResponse.AccidentNo.class);
-            return javaList.get(0).getRideProposalNo();
-        }
+            // 中煤
+            if (companyId.contains(InsuranceEnum.ZMBX.getCode())) {
+                List<SubmitResponse.AccidentNo> javaList = crossInsuranceJson.toJavaList(SubmitResponse.AccidentNo.class);
+                return javaList.get(0).getRideProposalNo();
+            }
 
-        // 紫金
-        if(companyId.contains(InsuranceEnum.ZKIC.getCode())){
-            List<DrivingInsuranceDto> javaList = crossInsuranceJson.toJavaList(DrivingInsuranceDto.class);
-            return javaList.get(0).getPolicyNumber();
+            // 紫金
+            if (companyId.contains(InsuranceEnum.ZKIC.getCode())) {
+                List<DrivingInsuranceDto> javaList = crossInsuranceJson.toJavaList(DrivingInsuranceDto.class);
+                return javaList.get(0).getPolicyNumber();
+            }
         }
 
         return "";

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1310,9 +1310,6 @@
 
     <select id="getCarBusinessDetailList" resultType="com.ydtech.modules.order.entity.vo.CarBusinessDetailVo">
         SELECT
-            io.company_id,
-            iac.api_type,
-            iac.cross_insurance,
             io.username,
             iac.signing_time as sign_time,
             io.licenseno,
@@ -1365,6 +1362,9 @@
 
     <select id="getAuditExportList" resultType="com.ydtech.modules.order.entity.vo.AuditExportVo">
         SELECT
+            io.company_id,
+            iac.api_type,
+            iac.cross_insurance,
             io.username,
             iac.signing_time,
             io.licenseno,