费用添加 bug调整

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

@@ -217,4 +217,9 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
 
     PtlAgreement getByAgreementIdNew(String agreementId);
 
+    /**
+     * 根据保险公司code 获取协议信息
+     */
+    List<PtlAgreement> getByCompanyCode(String companyCode);
+
 }

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

@@ -718,4 +718,10 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         return ptlAgreement;
     }
 
+    @Override
+    public List<PtlAgreement> getByCompanyCode(String companyCode) {
+        return baseMapper.selectList(new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getPartnerCompaniesId, companyCode));
+    }
+
+
 }

src/main/java/com/ydtech/modules/protocols/controller/PtlNewAgreementController.java

@@ -59,6 +59,13 @@ public class PtlNewAgreementController extends BaseController {
         return HttpResult.ok(undwrtRulesAttrList);
     }
 
+    @ApiOperation(value = "协议承保规则属性列表")
+    @GetMapping("/attr/listByCompanyId")
+    public HttpResult<List<PtlAgreementUndwrtRulesAttr>> listByCompanyId(String companyId) {
+        List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList = ptlAgreementUndwrtRulesAttrService.getUndwrtRulesAttrList(companyId);
+        return HttpResult.ok(undwrtRulesAttrList);
+    }
+
     @ApiOperation(value = "查询保险公司所有协议列表")
     @GetMapping("/companyAgreementList")
     public HttpResult<List<PtlAgreement>> companyAgreementList(String agreementId){

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementProductCostsAttrLink.java

@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
 public class PtlAgreementProductCostsAttrLink {
 
     @TableId(value = "id", type = com.baomidou.mybatisplus.annotation.IdType.AUTO)
-    private Integer id;
+    private String id;
 
     @ApiModelProperty(value = "费用id")
     @TableField(value = "costs_id")

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementProductCostsAttrLinkHistory.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 public class PtlAgreementProductCostsAttrLinkHistory {
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private String id;
 
     @ApiModelProperty(value = "费用id")
     @TableField(value = "costs_id")

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementUndwrtRulesAttr.java

@@ -23,7 +23,7 @@ import java.util.List;
 public class PtlAgreementUndwrtRulesAttr {
 
     @TableId(value = "id", type = com.baomidou.mybatisplus.annotation.IdType.AUTO)
-    private Integer id;
+    private String id;
 
     @ApiModelProperty(value = "属性名称")
     @TableField(value = "attr_name")
@@ -41,6 +41,10 @@ public class PtlAgreementUndwrtRulesAttr {
     @TableField(value = "dict_id")
     private Integer dictId;
 
+    @ApiModelProperty(value = "保险公司")
+    @TableField(value = "company_ids")
+    private String companyIds;
+
     @ApiModelProperty(value = "分组")
     @TableField(value = "attr_group")
     private String attrGroup;

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementUndwrtRulesAttrLink.java

@@ -19,7 +19,7 @@ import lombok.NoArgsConstructor;
 public class PtlAgreementUndwrtRulesAttrLink {
 
     @TableId(value = "id", type = com.baomidou.mybatisplus.annotation.IdType.AUTO)
-    private Integer id;
+    private String id;
 
     @ApiModelProperty(value = "承包规则id")
     @TableField(value = "rules_id")

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementUndwrtRulesAttrLinkHistory.java

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
 public class PtlAgreementUndwrtRulesAttrLinkHistory {
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private String id;
 
     @ApiModelProperty(value = "承包规则id")
     @TableField(value = "rules_id")

src/main/java/com/ydtech/modules/protocols/service/PtlAgreementUndwrtRulesAttrService.java

@@ -30,6 +30,12 @@ public interface PtlAgreementUndwrtRulesAttrService extends IService<PtlAgreemen
      */
     List<PtlAgreementUndwrtRulesAttr> getUndwrtRulesAttrList();
 
+    /**
+     * 协议承保规则属性列表
+     * @return
+     */
+    List<PtlAgreementUndwrtRulesAttr> getUndwrtRulesAttrList(String companyId);
+
     /**
      * 协议承保规则属性列表进行分类
      * @return

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -517,7 +517,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
 //                x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
                             x.setOperator("0");
                             x.setCostsId(ptlAgreementProductCostsNew.getId());
-                            x.setId(0);
+                            x.setId("0");
                             costsAttrLink.add(x);
                             BeanUtils.copyProperties(x, costsAttrLinkHistory);
                             //设置产品费用因子历史记录
@@ -531,7 +531,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                             if (ptlAgreementUndwrtRulesAttr.getAttrType().equals("radio") || (!"0".equals(x.getMin()) && null != x.getMin()) || (!"0".equals(x.getMax()) && null != x.getMax())) {
                                 if (x.getMin() != null || x.getMax() != null) {
                                     x.setCostsId(ptlAgreementProductCostsNew.getId());
-                                    x.setId(0);
+                                    x.setId("0");
                                     costsAttrLink.add(x);
                                     BeanUtils.copyProperties(x, costsAttrLinkHistory);
                                     //设置产品费用因子历史记录
@@ -736,7 +736,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
             if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && x.getMin() != "")) {
                 x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
                 x.setCostsId(ptlAgreementProductCostsNew.getId());
-                x.setId(0);
+                x.setId("0");
                 costsAttrLink.add(x);
                 //设置产品费用因子历史记录
                 PtlAgreementProductCostsAttrLinkHistory costsAttrLinkHistory = new PtlAgreementProductCostsAttrLinkHistory();
@@ -754,7 +754,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                 if ("radio".equals(ptlAgreementUndwrtRulesAttr.getAttrType())) {
                     if (null != x.getMin()) {
                         x.setCostsId(ptlAgreementProductCostsNew.getId());
-                        x.setId(0);
+                        x.setId("0");
                         costsAttrLink.add(x);
                         //设置产品费用因子历史记录
                         PtlAgreementProductCostsAttrLinkHistory costsAttrLinkHistory = new PtlAgreementProductCostsAttrLinkHistory();
@@ -771,7 +771,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
                     if ((!"0".equals(x.getMin()) && null != x.getMin()) || (!"0".equals(x.getMax()) && null != x.getMax())) {
 
                         x.setCostsId(ptlAgreementProductCostsNew.getId());
-                        x.setId(0);
+                        x.setId("0");
                         costsAttrLink.add(x);
                         //设置产品费用因子历史记录
                         PtlAgreementProductCostsAttrLinkHistory costsAttrLinkHistory = new PtlAgreementProductCostsAttrLinkHistory();

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementUndwrtRulesAttrServiceImpl.java

@@ -31,6 +31,28 @@ public class PtlAgreementUndwrtRulesAttrServiceImpl extends ServiceImpl<PtlAgree
     @Autowired
     PtlAgreementUndwrtRulesDictLabalService ptlAgreementUndwrtRulesDictLabalService;
 
+    /**
+     * 获取所有规则字典列表 根据保险公司查询
+     *
+     * @return
+     */
+    @Override
+    public List<PtlAgreementUndwrtRulesAttr> getUndwrtRulesAttrList(String companyId){
+        List<PtlAgreementUndwrtRulesDictLabal> undwrtRulesDictList = ptlAgreementUndwrtRulesDictService.getUndwrtRulesDictList();
+        List<PtlAgreementUndwrtRulesAttr> list = this.list(new LambdaQueryWrapper<PtlAgreementUndwrtRulesAttr>().eq(PtlAgreementUndwrtRulesAttr::getCompanyIds, "all"));
+        List<PtlAgreementUndwrtRulesAttr> companyList = this.list(new LambdaQueryWrapper<PtlAgreementUndwrtRulesAttr>().like(PtlAgreementUndwrtRulesAttr::getCompanyIds, companyId));
+        list.addAll(companyList);
+        list.forEach(attr -> {
+            List<PtlAgreementUndwrtRulesDictLabal> listTmp = undwrtRulesDictList.stream().filter(dict -> attr.getDictId() == dict.getDictId()).collect(Collectors.toList());
+            if(attr.getMinArray() == null)
+                attr.setMinArray(new String[]{});
+            if (attr.getDictLabal() == null)
+                attr.setDictLabal(new ArrayList<>());
+            attr.setDictLabal(listTmp);
+        });
+        return list;
+    }
+
     /**
      * 获取所有规则字典列表
      *

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementUndwrtRulesNewServiceImpl.java

@@ -243,7 +243,7 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
             if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && !x.getMin().equals(""))) {
                 x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
                 x.setRulesId(ptlAgreementUndwrtRulesNew.getId());
-                x.setId(0);
+                x.setId("0");
                 costsAttrLink.add(x);
                 PtlAgreementUndwrtRulesAttrLinkHistory undwrtRulesAttrLinkHistory = new PtlAgreementUndwrtRulesAttrLinkHistory();
                 BeanUtils.copyProperties(x, undwrtRulesAttrLinkHistory);
@@ -258,7 +258,7 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
                 if ((!"0".equals(x.getMin()) && null != x.getMin()) || (!"0".equals(x.getMax()) && null != x.getMax())) {
 
                     x.setRulesId(ptlAgreementUndwrtRulesNew.getId());
-                    x.setId(0);
+                    x.setId("0");
                     costsAttrLink.add(x);
                     PtlAgreementUndwrtRulesAttrLinkHistory undwrtRulesAttrLinkHistory = new PtlAgreementUndwrtRulesAttrLinkHistory();
                     BeanUtils.copyProperties(x, undwrtRulesAttrLinkHistory);
@@ -324,7 +324,7 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
             if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && x.getMin() != "")) {
                 x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
                 x.setRulesId(ptlAgreementUndwrtRulesNew.getId());
-                x.setId(0);
+                x.setId("0");
                 costsAttrLink.add(x);
                 PtlAgreementUndwrtRulesAttrLinkHistory undwrtRulesAttrLinkHistory = new PtlAgreementUndwrtRulesAttrLinkHistory();
                 BeanUtils.copyProperties(x, undwrtRulesAttrLinkHistory);
@@ -341,7 +341,7 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
                 if ("radio".equals(ptlAgreementUndwrtRulesAttr.getAttrType())) {
                     if (null != x.getMin()) {
                         x.setRulesId(ptlAgreementUndwrtRulesNew.getId());
-                        x.setId(0);
+                        x.setId("0");
                         costsAttrLink.add(x);
                         PtlAgreementUndwrtRulesAttrLinkHistory undwrtRulesAttrLinkHistory = new PtlAgreementUndwrtRulesAttrLinkHistory();
                         BeanUtils.copyProperties(x, undwrtRulesAttrLinkHistory);
@@ -356,7 +356,7 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
                 } else {
                     if ((!"0".equals(x.getMin()) && null != x.getMin()) || (!"0".equals(x.getMax()) && null != x.getMax())) {
                         x.setRulesId(ptlAgreementUndwrtRulesNew.getId());
-                        x.setId(0);
+                        x.setId("0");
                         costsAttrLink.add(x);
                         PtlAgreementUndwrtRulesAttrLinkHistory undwrtRulesAttrLinkHistory = new PtlAgreementUndwrtRulesAttrLinkHistory();
                         BeanUtils.copyProperties(x, undwrtRulesAttrLinkHistory);