Merge branch 'master' into test

src/main/java/com/ydtech/modules/protocol/entity/dto/PtlAgreementSaveDto.java

@@ -59,4 +59,7 @@ public class PtlAgreementSaveDto implements Serializable {
     @ApiModelProperty("附件id")
     private String fileId;
 
+    @ApiModelProperty("序号")
+    private Integer serialNumber;
+
 }

src/main/java/com/ydtech/modules/protocol/entity/dto/PtlAgreementUndwrtRulesSaveDto.java

@@ -15,8 +15,11 @@ import java.util.stream.Collectors;
 public class PtlAgreementUndwrtRulesSaveDto {
 
 
-    @ApiModelProperty("业务类型")
-    private String productType;
+    @ApiModelProperty("产品id")
+    private String productId;
+
+    @ApiModelProperty("产品名称")
+    private String productName;
 
     @ApiModelProperty("规则描述")
     private String ruleDescription;
@@ -165,12 +168,10 @@ public class PtlAgreementUndwrtRulesSaveDto {
     @ApiModelProperty("医保外用乘客")
     private Integer passengerMedicalAmount;
 
-    public PtlAgreementUndwrtRulesSaveDto() {
-    }
 
 
-    public static List<PtlAgreementUndwrtRulesSaveDto> toPltAgreementRuleSaveDto(List<PtlAgreementUndwrtRules> ptlAgreementUndwrtRulesList) {
-        return ptlAgreementUndwrtRulesList.stream().map(PtlAgreementUndwrtRulesSaveDto::new).collect(Collectors.toList());
+    public static List<PtlAgreementUndwrtRulesSaveDto> toPltAgreementRuleSaveDto(List<PtlAgreementUndwrtRules> productCosts) {
+        return productCosts.stream().map(PtlAgreementUndwrtRulesSaveDto::new).collect(Collectors.toList());
     }
 
     public PtlAgreementUndwrtRulesSaveDto(PtlAgreementUndwrtRules ptlAgreementUndwrtRules) {

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreement.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.StringUtils;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -159,6 +160,12 @@ public class PtlAgreement implements Serializable {
     @TableField(value = "audit_status")
     private Integer auditStatus;
 
+    /**
+     * 序号
+     */
+    @ApiModelProperty("serial_number")
+    private Integer serialNumber;
+
     /**
      * 创建者
      */

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreementUndwrtRules.java

@@ -49,11 +49,16 @@ public class PtlAgreementUndwrtRules implements Serializable {
     private Integer rulesType;
 
     /**
-     * 业务类型
+     * 产品id
      */
-    @TableField(value = "product_type")
-    private String productType;
+    @TableField(value = "product_id")
+    private String productId;
 
+    /**
+     * 产品名称
+     */
+    @TableField(value = "product_name")
+    private String productName;
 
     /**
      * 规则描述
@@ -290,6 +295,11 @@ public class PtlAgreementUndwrtRules implements Serializable {
     @TableField(value = "driver_passenger_relation")
     private String driverPassengerRelation;
 
+    /**
+     * 方案优先级别
+     */
+    @TableField(value = "priority_level")
+    private Integer priorityLevel;
 
     /**
      * 被保人年龄(最小)
@@ -342,15 +352,19 @@ public class PtlAgreementUndwrtRules implements Serializable {
 
     /**
      * @param agreementId                         协议id
+     * @param productId                           产品id
+     * @param productName                         产品名称
      * @param ptlAgreementUndwrtRulesSaveDtoList 协议费用 Dto list
      * @return List<PtlAgreementProductCosts>
      */
-    public static List<PtlAgreementUndwrtRules> toPtlAgreementUndwrtRulesSaveDtoList(String agreementId,  List<PtlAgreementUndwrtRulesSaveDto> ptlAgreementUndwrtRulesSaveDtoList) {
-        return ptlAgreementUndwrtRulesSaveDtoList.stream().map(ptlAgreementUndwrtRulesSaveDto -> new PtlAgreementUndwrtRules(agreementId,  ptlAgreementUndwrtRulesSaveDto)).collect(Collectors.toList());
+    public static List<PtlAgreementUndwrtRules> toPtlAgreementUndwrtRulesSaveDtoList(String agreementId, String productId, String productName, List<PtlAgreementUndwrtRulesSaveDto> ptlAgreementUndwrtRulesSaveDtoList) {
+        return ptlAgreementUndwrtRulesSaveDtoList.stream().map(ptlAgreementUndwrtRulesSaveDto -> new PtlAgreementUndwrtRules(agreementId, productId, productName, ptlAgreementUndwrtRulesSaveDto)).collect(Collectors.toList());
     }
 
-    public PtlAgreementUndwrtRules(String agreementId, PtlAgreementUndwrtRulesSaveDto ptlAgreementUndwrtRulesSaveDto) {
+    public PtlAgreementUndwrtRules(String agreementId, String productId, String productName, PtlAgreementUndwrtRulesSaveDto ptlAgreementUndwrtRulesSaveDto) {
         this.agreementId = agreementId;
+        this.productId = productId;
+        this.productName = productName;
         BeanUtils.copyProperties(ptlAgreementUndwrtRulesSaveDto, this);
     }
 
@@ -362,7 +376,8 @@ public class PtlAgreementUndwrtRules implements Serializable {
     public int getHashCode() {
         int result = 0;
         result = getObjectHashCode(this.agreementId, result);
-        result = getObjectHashCode(this.productType, result);
+        result = getObjectHashCode(this.productId, result);
+        result = getObjectHashCode(this.productName, result);
         result = getObjectHashCode(this.transfer, result);
         result = getObjectHashCode(this.oldAndNew, result);
         result = getObjectHashCode(this.newEnergy, result);
@@ -401,6 +416,7 @@ public class PtlAgreementUndwrtRules implements Serializable {
         result = getObjectHashCode(this.minPassengerAmount, result);
         result = getObjectHashCode(this.maxPassengerAmount, result);
         result = getObjectHashCode(this.driverPassengerRelation, result);
+        result = getObjectHashCode(this.priorityLevel,result);
         result = getObjectHashCode(this.minInsureAge,result);
         result = getObjectHashCode(this.maxInsureAge,result);
         result = getObjectHashCode(this.minCarOwnerAge,result);

src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementQueryVo.java

@@ -1,11 +1,7 @@
 package com.ydtech.modules.protocol.entity.vo;
 
 import com.ydtech.modules.protocol.entity.dto.PltAgreementSchemeSaveDto;
-import com.ydtech.modules.protocol.entity.dto.PtlAgreementUndwrtRulesSaveDto;
-import com.ydtech.modules.protocol.entity.po.PtlAgreement;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementDept;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementNonCarProductCosts;
+import com.ydtech.modules.protocol.entity.po.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -28,7 +24,7 @@ public class PtlAgreementQueryVo {
     private List<PtlAgreementNonCarProductCosts> nonCarProductCosts;
 
     @ApiModelProperty("承保规则")
-    private List<PtlAgreementUndwrtRulesSaveDto> underwritingRules;
+    List<PtlAgreementUnderwritingRules> underwritingRules;
 
     @ApiModelProperty("账号信息")
     private PtlAgreementAttribution ptlAgreementAttribution;

src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementSaveVo.java

@@ -4,7 +4,8 @@ package com.ydtech.modules.protocol.entity.vo;
 import com.ydtech.modules.protocol.entity.dto.PltAgreementSchemeSaveDto;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementAttributionDto;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementSaveDto;
-import com.ydtech.modules.protocol.entity.dto.PtlAgreementUndwrtRulesSaveDto;
+import com.ydtech.modules.protocol.entity.dto.PtlAgreementUnderwritingRulesSaveDto;
+import com.ydtech.modules.protocol.entity.po.PtlAgreementUndwrtRules;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -25,7 +26,7 @@ public class PtlAgreementSaveVo {
     private List<PtlAgreementNonCarProductCostsSaveVo> nonCarProductCosts;
 
     @ApiModelProperty("承保规则")
-    private List<PtlAgreementUndwrtRulesSaveDto> underwritingRules;
+    private List<PtlAgreementUnderwritingRulesSaveDto> underwritingRules;
 
     @ApiModelProperty("授权部门id")
     private List<String> dept;

src/main/java/com/ydtech/modules/protocol/service/PtlAgreementUndwrtRulesService.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.protocol.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.protocol.entity.dto.PtlAgreementUndwrtRulesSaveDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementUndwrtRules;
 
 import java.util.List;
@@ -26,15 +25,15 @@ public interface PtlAgreementUndwrtRulesService extends IService<PtlAgreementUnd
      *
      * @param agreementId 协议id
      */
-    List<PtlAgreementUndwrtRulesSaveDto> getByAgreementId(String agreementId);
+    List<PtlAgreementUndwrtRules> getByAgreementId(String agreementId);
 
     /**
      * 批量提添加承保规则
      *
      * @param agreementId 协议id
-     * @param undwrtRulesSaveDtoList      产品
+     * @param undwrtRulesList      产品
      */
-    void saveBatchProductCosts(String agreementId, List<PtlAgreementUndwrtRulesSaveDto> undwrtRulesSaveDtoList);
+    void saveBatchProductCosts(String agreementId, List<PtlAgreementUndwrtRules> undwrtRulesList);
 
     /**
      * 通过 协议id 构造查询条件

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -62,12 +62,10 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     private final PtlAgreementNonCarProductCostsService ptlAgreementNonCarProductCostsService;
 
-    private final PtlAgreementUndwrtRulesService ptlAgreementUndwrtRulesService;
-
     public PtlAgreementServiceImpl(PtlAgreementProductCostsService ptlAgreementProductCostsService, PtlAgreementUnderwritingRulesService ptlAgreementUnderwritingRulesService,
                                    PtlAgreementAttributionService ptlAgreementAttributionService, PtlAgreementDeptService ptlAgreementDeptService,
                                    EsmInsCompanyService esmInsCompanyService, PtlAgreementNonCarProductCostsService ptlAgreementNonCarProductCostsService,
-                                   @Lazy InsCrawlerOrderService insCrawlerOrderController, @Lazy PtlAgreementService proxyObject,PtlNonCarInsuranceProductService ptlNonCarInsuranceProductService,@Lazy PtlAgreementUndwrtRulesService ptlAgreementUndwrtRulesService) {
+                                   @Lazy InsCrawlerOrderService insCrawlerOrderController, @Lazy PtlAgreementService proxyObject,PtlNonCarInsuranceProductService ptlNonCarInsuranceProductService) {
         this.ptlAgreementProductCostsService = ptlAgreementProductCostsService;
         this.ptlAgreementUnderwritingRulesService = ptlAgreementUnderwritingRulesService;
         this.ptlAgreementAttributionService = ptlAgreementAttributionService;
@@ -77,7 +75,6 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         this.insCrawlerOrderController = insCrawlerOrderController;
         this.proxyObject = proxyObject;
         this.ptlNonCarInsuranceProductService=ptlNonCarInsuranceProductService;
-        this.ptlAgreementUndwrtRulesService=ptlAgreementUndwrtRulesService;
     }
 
 
@@ -156,7 +153,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         // 获取非车险产品费用
         List<PtlAgreementNonCarProductCosts> nonCarProductCosts = ptlAgreementNonCarProductCostsService.getByAgreementId(agreementId);
         // 获取承保规则
-        List<PtlAgreementUndwrtRulesSaveDto> underwritingRules = ptlAgreementUndwrtRulesService.getByAgreementId(agreementId);
+        List<PtlAgreementUnderwritingRules> underwritingRules = ptlAgreementUnderwritingRulesService.getByAgreementId(agreementId);
         //  账号信息查询
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(agreementId);
         //2023-08-28 lig 增加  解决前端空对象为null问题，改为返回为空对象
@@ -244,7 +241,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             }
         }
         // 承包规则
-        ptlAgreementUndwrtRulesService.saveBatchProductCosts(agreementId,agreement.getUnderwritingRules());
+        ptlAgreementUnderwritingRulesService.saveBatchUnderwritingRules(agreementId, agreement.getUnderwritingRules());
         // 账号添加
         PtlAgreementAttributionDto attribution = agreement.getAttribution();
         if (StringUtils.isNotEmpty(attribution.getTemplateId())) {
@@ -268,7 +265,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         // 删除非车险产品费用
         ptlAgreementNonCarProductCostsService.deleteByAgreementId(agreementId);
         // 删除承保规则
-        ptlAgreementUndwrtRulesService.deleteByAgreementId(agreementId);
+        ptlAgreementUnderwritingRulesService.deleteByAgreementId(agreementId);
         // 删除账号信息
         ptlAgreementAttributionService.removeById(agreementId);
         // 删除授权部门

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementUndwrtRulesServiceImpl.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.protocol.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.modules.protocol.dao.PtlAgreementUndwrtRulesMapper;
-import com.ydtech.modules.protocol.entity.dto.PtlAgreementUndwrtRulesSaveDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementUndwrtRules;
 import com.ydtech.modules.protocol.service.PtlAgreementAttributionService;
 import com.ydtech.modules.protocol.service.PtlAgreementUndwrtRulesService;
@@ -34,18 +33,15 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
     }
 
     @Override
-    public List<PtlAgreementUndwrtRulesSaveDto> getByAgreementId(String agreementId) {
+    public List<PtlAgreementUndwrtRules> getByAgreementId(String agreementId) {
         List<PtlAgreementUndwrtRules> ptlAgreementUndwrtRulesList = baseMapper.selectList(getByAgreementIdWrapper(agreementId));
-
-        List<PtlAgreementUndwrtRulesSaveDto> undwrtRulesSaveDtoList = PtlAgreementUndwrtRulesSaveDto.toPltAgreementRuleSaveDto(ptlAgreementUndwrtRulesList);
-        return undwrtRulesSaveDtoList;
+        return ptlAgreementUndwrtRulesList;
     }
 
     @Override
     @Transactional
-    public void saveBatchProductCosts(String agreementId, List<PtlAgreementUndwrtRulesSaveDto> undwrtRulesSaveDtoList) {
-        if (undwrtRulesSaveDtoList != null && !undwrtRulesSaveDtoList.isEmpty()) {
-            List<PtlAgreementUndwrtRules> ptlAgreementUndwrtRulesList = PtlAgreementUndwrtRules.toPtlAgreementUndwrtRulesSaveDtoList(agreementId, undwrtRulesSaveDtoList);
+    public void saveBatchProductCosts(String agreementId, List<PtlAgreementUndwrtRules> ptlAgreementUndwrtRulesList) {
+        if (ptlAgreementUndwrtRulesList != null && !ptlAgreementUndwrtRulesList.isEmpty()) {
             boolean b = saveBatch(ptlAgreementUndwrtRulesList);
             AssertionUtils.isSucceed(b, "批量添加承保规则失败");
         }

src/main/resources/mapper/modules/protocol/PtlAgreementMapper.xml

@@ -75,6 +75,7 @@
           and pa.id in (select distinct agreement_id
                         from ptl_agreement_dept
                         where dept_id = #{deptId})
+          order by eic.serial_number
     </select>
 
 </mapper>