Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260622' into dev_jzg_lipf_v20260622

commons/src/main/java/com/jzg/commons/entity/dto/FeeAuditParam.java

@@ -102,11 +102,11 @@ public class FeeAuditParam extends PageRequest {
 
     @Schema(description = "审核时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime auditTimeStart;
+    private LocalDate auditTimeBegin;
 
     @Schema(description = "审核时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime auditTimeEnd;
+    private LocalDate auditTimeEnd;
 
     @Schema(description = "审核人")
     private String auditUser;

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportFeeAuditSummaryServiceImpl.java

@@ -16,9 +16,6 @@ import com.jzg.console.service.ReportFeeAuditSummaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalTime;
-import java.util.Objects;
-
 /**
  * 费用审核汇总统计 Service 实现
  */
@@ -47,10 +44,10 @@ public class ReportFeeAuditSummaryServiceImpl implements ReportFeeAuditSummarySe
 
         // 转换时间：LocalDate -> LocalDateTime（开始日期的00:00:00，结束日期的23:59:59）
         if (param.getAuditTimeStart() != null) {
-            feeAuditParam.setAuditTimeStart(param.getAuditTimeStart().atStartOfDay());
+            feeAuditParam.setAuditTimeBegin(param.getAuditTimeStart());
         }
         if (param.getAuditTimeEnd() != null) {
-            feeAuditParam.setAuditTimeEnd(param.getAuditTimeEnd().atTime(LocalTime.MAX));
+            feeAuditParam.setAuditTimeEnd(param.getAuditTimeEnd());
         }
 
         // 调用远程服务获取审核列表

tenant/insurance/quotation-renbaonew/src/main/java/com/jzg/quotation/renbaonew/crawler/service/impl/RenBaoNewCrawlerRequestImpl.java

@@ -201,9 +201,11 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
                     response.getData().getReInsureItems().forEach(item ->{
                         // 1. 获取 coverageItemList 数组
                         Object coverageObj = item.get("coverageItemList");
-                        // 强转为 List<Map<String,Object>>（里面每一项是 {"coverageCode":"xxx"}）
-                        List<Map<String, Object>> coverageList = (List<Map<String, Object>>) coverageObj;
-                        lastYeseRisks.addAll(coverageList);
+                        if(coverageObj != null){
+                            // 强转为 List<Map<String,Object>>（里面每一项是 {"coverageCode":"xxx"}）
+                            List<Map<String, Object>> coverageList = (List<Map<String, Object>>) coverageObj;
+                            lastYeseRisks.addAll(coverageList);
+                        }
                         if(item.get("billDate") != null){
                             String expireDate =item.get("expireDate")+"";
                             biDateArr[0] = expireDate != null && expireDate.length()>10 ? expireDate.substring(0,10):"";
@@ -215,7 +217,7 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
                 // 上一年险别属于商业险重复投保，需要拦截并重新请求
                 java.time.LocalDate startDate = java.time.LocalDate.parse(biDateArr[0]);
                 java.time.LocalDate startDate1 = startDate.plusDays(1);
-                java.time.LocalDate endDate = startDate.plusDays(364);
+                java.time.LocalDate endDate = startDate.plusDays(365);
                 request.getPrpCmain().put("endDate", endDate.toString());
                 request.getPrpCmain().put("endHour", "24");
                 request.getPrpCmain().put("endMinute", "00");
@@ -373,7 +375,7 @@ public class RenBaoNewCrawlerRequestImpl implements RenBaoNewCrawlerRequest {
             return false;
         }
         List<Map<String, Object>> reInsureItems = response.getData().getReInsureItems();
-        return reInsureItems != null && !reInsureItems.isEmpty();
+        return reInsureItems != null && !reInsureItems.isEmpty() && reInsureItems.get(0).get("coverageItemList") != null;
     }
 
     /**

tenant/insurance/quotation-summary/src/main/resources/mapper/InsFeeAuditMapper.xml

@@ -213,8 +213,8 @@
             <if test="param.niPolicyNumber != null and param.niPolicyNumber != ''">
                 and ioep.no_policy = #{param.niPolicyNumber}
             </if>
-            <if test="param.auditTimeStart != null and param.auditTimeEnd != null">
-                and DATE_FORMAT(ifa.audit_time, '%Y-%m-%d') between #{param.auditTimeStart} AND #{param.auditTimeEnd}
+            <if test="param.auditTimeBegin != null and param.auditTimeEnd != null">
+                and DATE_FORMAT(ifa.audit_time, '%Y-%m-%d') between #{param.auditTimeBegin} AND #{param.auditTimeEnd}
             </if>
             <if test="param.auditUser != null and param.auditUser != ''">
                 and ifa.audit_user = #{param.auditUser}

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -109,6 +109,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     @Autowired
     jyxSettingMapper jyxSettingMapper;
 
+    @Autowired
+    PtlAreaLicenseService ptlAreaLicenseService;
+
     /**
      * 添加方案
      *
@@ -594,6 +597,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         ValidateSchemeRuleVo validateSchemeRuleVo = new ValidateSchemeRuleVo();
         validateSchemeRuleVo.builderQuoteVo(schemeRuleFilterVo, redissonClient);
         validateSchemeRuleVo.setAttrLinks(ptlSchemeRulesAttrLinks);
+        validateSchemeRuleVo.getQuoteVo().getCarInfoVo().setLicenseNo(ptlAreaLicenseService.convertLicense2AreaNumber(validateSchemeRuleVo.getQuoteVo().getCarInfoVo().getLicenseNo().substring(0, 2)));
         HttpResult<List<String>> esmInsCompanyHttpResult = costsRuleClient.validateSchemeRule(validateSchemeRuleVo);
         List<String> insSchemeIds = esmInsCompanyHttpResult.getData();
         if (CollUtil.isEmpty(insSchemeIds)) {
@@ -790,6 +794,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         ValidateSchemeRuleVo validateSchemeRuleVo = new ValidateSchemeRuleVo();
         validateSchemeRuleVo.builderQuoteVo(schemeRuleFilterVo, redissonClient);
         validateSchemeRuleVo.setAttrLinks(ptlSchemeRulesAttrLinks);
+        validateSchemeRuleVo.getQuoteVo().getCarInfoVo().setLicenseNo(ptlAreaLicenseService.convertLicense2AreaNumber(validateSchemeRuleVo.getQuoteVo().getCarInfoVo().getLicenseNo().substring(0, 2)));
         HttpResult<List<String>> esmInsCompanyHttpResult = costsRuleClient.validateSchemeRule(validateSchemeRuleVo);
         List<String> insSchemeIds = esmInsCompanyHttpResult.getData();
         newSchemeList.removeIf(x -> !insSchemeIds.contains(x.getId()));