协议修改

src/main/java/com/ydtech/constants/enums/dict/SupplierTypeEnum.java → src/main/java/com/ydtech/constants/enums/dict/agreement/SupplierTypeEnum.java

@@ -1,6 +1,7 @@
-package com.ydtech.constants.enums.dict;
+package com.ydtech.constants.enums.dict.agreement;
 
 import com.ydtech.aop.request.DictEnum;
+import com.ydtech.constants.enums.dict.IBaseEnum;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

src/main/java/com/ydtech/modules/esm/controller/EsmInsCompanyController.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.ydtech.aop.request.RequestSingleParam;
-import com.ydtech.constants.enums.dict.SupplierTypeEnum;
+import com.ydtech.constants.enums.dict.agreement.SupplierTypeEnum;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;

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

@@ -34,7 +34,6 @@ public class InsRenewalServiceImpl extends ServiceImpl<InsRenewalMapper, InsRene
 
     private final RenewalComponents renewalComponents;
 
-
     private final EsmInsCompanyService esmInsCompanyService;
 
     public InsRenewalServiceImpl(RenewalComponents renewalComponents,  EsmInsCompanyService esmInsCompanyService) {

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

@@ -28,8 +28,20 @@ public class PtlAgreement implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private String id;
 
+    /**
+     * 供应商类型
+     * 1 渠道
+     * 2 财险
+     * 3 寿险
+     */
+    @TableField(value = "companies_type")
+    private String companiesType;
+
     /**
      * 协议类型
+     * 1  平台协议-平台结算
+     * 2  私有协议-自行结算
+     * 3  网销协议-自行结算
      */
     @TableField(value = "agreement_type")
     private String agreementType;

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

@@ -28,4 +28,7 @@ public class PtlAgreementPageVo extends BasePageVO {
     @ApiModelProperty("审核状态 0 申请审核 1 审核通过 2 审核不通过")
     private Integer auditStatus;
 
+    @ApiModelProperty("供应商类型")
+    private Integer companiesType;
+
 }

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

@@ -133,6 +133,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         List<String> lowerId = esmInsCompanyService.getByLowerId(ptlAgreementPageVo.getPartnerCompaniesId());
         // 审核状态
         wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAuditStatus()), PtlAgreement::getAuditStatus, ptlAgreementPageVo.getAuditStatus())
+                // 供应商类型
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType, ptlAgreementPageVo.getCompaniesType())
                 // 合作公司
                 .in(!lowerId.isEmpty(), PtlAgreement::getPartnerCompaniesId, lowerId)
                 // 录入时间
@@ -235,6 +237,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             insCrawlerOrderController.isLogin(attribution, nameSimple);
         }
 
+        ptlAgreement.setCompaniesType(esmInsCompany.getType());
         ptlAgreement.setInsuranceCompanyId(esmInsCompany.getId());
         ptlAgreement.setInsuranceCompany(esmInsCompany.getNamesimple());
         // 生成协议id

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

@@ -6,6 +6,7 @@
 
     <resultMap id="BaseResultMap" type="com.ydtech.modules.protocol.entity.po.PtlAgreement">
         <id property="id" column="id" jdbcType="BIGINT"/>
+        <result property="companiesType" column="companies_type" jdbcType="INTEGER"/>
         <result property="agreementType" column="agreement_type" jdbcType="VARCHAR"/>
         <result property="agreementCode" column="agreement_code" jdbcType="VARCHAR"/>
         <result property="agreementName" column="agreement_name" jdbcType="VARCHAR"/>