Merge remote-tracking branch 'origin/master'

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

@@ -2,12 +2,10 @@ package com.jzg.commons.entity.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -34,12 +32,10 @@ public class PtlAgreementCostBatchUpdateValidDateParam implements Serializable {
     private String costType;
 
     @Schema(description = "生效时间（起）", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生效时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date effectiveTime;
 
     @Schema(description = "失效时间（止）", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "失效时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date failureTime;
 

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrders.java

@@ -34,6 +34,9 @@ public class InsOrders extends BaseModel {
     @Schema(description = "协议ID")
     private String agreementId;
 
+    @Schema(description = "方案ID")
+    private String schemeId;
+
     @Schema(description = "请求类型")
     private String apiType;
 

commons/src/main/java/com/jzg/commons/entity/quote/vo/QuoteVo.java

@@ -32,6 +32,12 @@ public class QuoteVo implements Serializable {
      */
     private OrderBase order;
 
+    /**
+     * 方案ID
+     */
+    @Schema(description = "方案ID")
+    private String schemeId;
+
     /**
      * 其他信息
      */

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -66,6 +66,11 @@ public class QuoteEchoVo extends QuoteVo {
         private String dockingPerson;
         private String dockingPersonPhone;
 
+        /**
+         * 方案ID
+         */
+        private String schemeId;
+
         /**
          * 协议id
          */

commons/src/main/java/com/jzg/commons/entity/quote/vo/base/OrderBase.java

@@ -62,6 +62,11 @@ public class OrderBase implements Serializable {
      */
     private String productId;
 
+    /**
+     * 方案ID
+     */
+    private String schemeId;
+
 //    private String productsCode;
 
     /**

commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersAdd.java

@@ -37,6 +37,8 @@ public class InsOrdersAdd extends QuoteVo {
     @Schema(description = "订单费用")
     private InsFeeOrdersVo feeOrdersVo;
 
+    @Schema(description = "方案ID")
+    private String schemeId;
 
     @Schema(description = "保单信息")
     private InsOrdersExternalPolicy insOrdersExternalPolicy;

commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersVo.java

@@ -133,6 +133,9 @@ public class InsOrdersVo extends QuoteVo {
     @Schema(description = "订单费用")
     private InsFeeOrdersVo feeOrdersVo;
 
+    @Schema(description = "方案ID")
+    private String schemeId;
+
     /**
      * 费用比例信息
      */

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -168,6 +168,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             InsOrders insOrders = ordersAdd.getInsOrders();
             String realQuoteUserId = StrUtil.isNotBlank(insOrders.getRealQuoteUserId()) ? insOrders.getRealQuoteUserId() : baseController.getUserName();
             insOrders.setRealQuoteUserId(realQuoteUserId);
+            if (StrUtil.isNotBlank(ordersAdd.getSchemeId())) {
+                insOrders.setSchemeId(ordersAdd.getSchemeId());
+                log.info("设置方案ID：orderNo={}, schemeId={}", insOrders.getId(), ordersAdd.getSchemeId());
+            }
             InsOrdersAdd insOrdersAdd = BeanCopyUtil.deepCopy(ordersAdd, InsOrdersAdd.class);
             InsOrders parentOrders = insOrdersMapper.selectMainOrderNumber(ordersAdd.getCarInfoVo().getLicenseNo(), realQuoteUserId);
             boolean nullOrders = ObjectUtil.isNull(parentOrders);
@@ -1203,6 +1207,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         } else {
             insOrders.setRealQuoteUserId(quoteVo.getOrder().getRealQuoteUserId());
         }
+        if (StrUtil.isNotBlank(quoteVo.getSchemeId())) {
+            insOrders.setSchemeId(quoteVo.getSchemeId());
+        }
         insOrdersMapper.insert(insOrders);
 
         // 保存订单车辆信息
@@ -1478,6 +1485,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         AssertionUtils.isFail(Objects.isNull(insOrdersVo), "订单不存在");
         QuoteEchoVo resultVo = new QuoteEchoVo(insOrdersVo);
         resultVo.setEntryStatus(insOrdersVo.getEntryStatus());
+
+        if (StrUtil.isNotBlank(insOrdersVo.getSchemeId())) {
+            resultVo.setSchemeId(insOrdersVo.getSchemeId());
+        }
         //获取保司信息
         String companyId = insOrdersVo.getInsOrders().getCompanyId();
         HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findLogoById(companyId);

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

@@ -201,6 +201,7 @@
         <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
         <result property="productId" column="product_id" jdbcType="VARCHAR"/>
         <result property="productName" column="product_name" jdbcType="VARCHAR"/>
+        <result property="schemeId" column="scheme_id" jdbcType="VARCHAR"/>
         <result property="auditStatus" column="audit_status" jdbcType="VARCHAR"/>
         <result property="auditComments" column="audit_comments" jdbcType="VARCHAR"/>
         <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
@@ -776,6 +777,7 @@
         quote_no,
         agreement_id,
         company_id,
+        scheme_id,
         company_name,
         product_id,
         product_name,

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

@@ -449,12 +449,14 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
     @Override
     public HttpResult<String> batchUpdateValidDate(PtlAgreementCostBatchUpdateValidDateParam param) {
         // 1. 校验时间
-        if (param.getEffectiveTime() == null || param.getFailureTime() == null) {
-            return HttpResult.error("生效时间和失效时间不能为空");
+        if (param.getEffectiveTime() == null && param.getFailureTime() == null) {
+            return HttpResult.error("生效时间和失效时间至少要传一个");
         }
-        if (param.getFailureTime().before(param.getEffectiveTime())
-                || param.getFailureTime().equals(param.getEffectiveTime())) {
-            return HttpResult.error("失效时间必须晚于生效时间");
+        if (param.getEffectiveTime() != null && param.getFailureTime() != null) {
+            if (param.getFailureTime().before(param.getEffectiveTime())
+                    || param.getFailureTime().equals(param.getEffectiveTime())) {
+                return HttpResult.error("失效时间必须晚于生效时间");
+            }
         }
 
         List<String> finalCostIds;
@@ -492,8 +494,12 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
         // 4. 批量更新有效期
         LambdaUpdateWrapper<PtlAgreementCost> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.in(PtlAgreementCost::getId, finalCostIds);
-        updateWrapper.set(PtlAgreementCost::getEffectiveTime, param.getEffectiveTime());
-        updateWrapper.set(PtlAgreementCost::getFailureTime, param.getFailureTime());
+        if (param.getEffectiveTime() != null) {
+            updateWrapper.set(PtlAgreementCost::getEffectiveTime, param.getEffectiveTime());
+        }
+        if (param.getFailureTime() != null) {
+            updateWrapper.set(PtlAgreementCost::getFailureTime, param.getFailureTime());
+        }
         updateWrapper.set(PtlAgreementCost::getApproved, 0); // 0: 未审批
         boolean success = this.update(updateWrapper);