协议管理内容

src/main/java/com/ydtech/modules/protocol/controller/EsProductController.java

@@ -11,7 +11,6 @@ import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.protocol.entity.po.EsProduct;
 import com.ydtech.modules.protocol.service.EsProductService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/com/ydtech/modules/protocol/controller/PtlAgreementController.java

@@ -38,19 +38,18 @@ public class PtlAgreementController extends BaseController {
 
     @PostMapping
     @ApiOperation("添加协议")
-    public HttpResult<?> save(@RequestBody PtlAgreementSaveVo agreement) {
+    public HttpResult<Object> save(@RequestBody PtlAgreementSaveVo agreement) {
         String userName = getUserName();
         return ptlAgreementService.saveAgreement(agreement, userName);
     }
 
     @PutMapping("/{agreementId}")
     @ApiOperation("修改协议")
-    public HttpResult<?> revise(@PathVariable Integer agreementId, @RequestBody PtlAgreementSaveVo agreement) {
+    public HttpResult<Object> revise(@PathVariable Integer agreementId, @RequestBody PtlAgreementSaveVo agreement) {
         String userName = getUserName();
         return ptlAgreementService.reviseAgreement(userName, agreementId, agreement);
     }
 
-
     @GetMapping("/{agreementId}")
     @ApiOperation("通过协议id查询所有信息")
     public HttpResult<PtlAgreementQueryVo> getByAgreementId(@PathVariable Integer agreementId) {
@@ -59,13 +58,13 @@ public class PtlAgreementController extends BaseController {
 
     @DeleteMapping("/{agreementId}")
     @ApiOperation("删除协议")
-    public HttpResult<?> delete(@PathVariable Integer agreementId) {
+    public HttpResult<Object> delete(@PathVariable Integer agreementId) {
         return ptlAgreementService.deleteAgreement(agreementId);
     }
 
     @PostMapping("/audit/{agreementId}")
     @ApiOperation("审核协议")
-    public HttpResult<?> audit(@PathVariable Integer agreementId, @RequestBody PtlAgreementAuditVo ptlAgreementAuditVo){
+    public HttpResult<Object> audit(@PathVariable Integer agreementId, @RequestBody PtlAgreementAuditVo ptlAgreementAuditVo) {
         return ptlAgreementService.auditAgreement(agreementId, ptlAgreementAuditVo);
     }
 

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

@@ -1,11 +1,15 @@
 package com.ydtech.modules.protocol.entity.dto;
 
+import com.alibaba.fastjson.JSONArray;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 @Data
 @ApiModel("费用因子")
@@ -17,4 +21,25 @@ public class PtlAgreementCostsFactorSaveDto {
     @ApiModelProperty("费用因子")
     private List<Map<String, PtlFactorDto>> factor;
 
+
+    /**
+     * jsonArray 转 Map<String, PtlFactorDto>  过滤 无用数据
+     *
+     * @param jsonArray jsonArray 对象
+     * @return Map<String, PtlFactorDto>
+     */
+    public static Map<String, PtlFactorDto> toMapPtlFactorDto(JSONArray jsonArray) {
+        List<PtlAgreementCostsFactorSaveDto> javaList = jsonArray.toJavaList(PtlAgreementCostsFactorSaveDto.class);
+        return javaList.stream()
+                .flatMap(x -> x.getFactor().stream())
+                .map(Map::entrySet)
+                .flatMap(Set::stream)
+                .filter(x -> (
+                        !ObjectUtils.isEmpty(x.getValue().getParameter()) ||
+                                (!ObjectUtils.isEmpty(x.getValue().getMaxValue()) && !ObjectUtils.isEmpty(x.getValue().getMinValue()) &&
+                                        (!(x.getValue().getMaxValue() == 0) && !(x.getValue().getMinValue() == 0))
+                )))
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (a, b) -> a));
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.ydtech.modules.protocol.entity.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.util.List;
@@ -13,14 +14,17 @@ public class PtlFactorDto {
     @ApiModelProperty("参数名称")
     private String name;
 
+    @ApiModelProperty("默认值")
+    private String value;
+
     @ApiModelProperty("因子列表")
     private List<String> parameter;
 
     @ApiModelProperty("最大值")
-    private String maxValue;
+    private Integer maxValue;
 
     @ApiModelProperty("最小值")
-    private String minValue;
+    private Integer minValue;
 
 }
 

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

@@ -12,11 +12,15 @@ import java.io.Serializable;
 
 /**
  * 协议承保规则
+ *
  * @TableName ptl_agreement_underwriting_rules
  */
-@TableName(value ="ptl_agreement_underwriting_rules", autoResultMap = true)
+@TableName(value = "ptl_agreement_underwriting_rules", autoResultMap = true)
 @Data
 public class PtlAgreementUnderwritingRules implements Serializable {
+
+    private static final long serialVersionUID = -5917413561899040616L;
+
     /**
      * 主键/自增
      */
@@ -41,8 +45,4 @@ public class PtlAgreementUnderwritingRules implements Serializable {
     @TableField(value = "rules_factor", typeHandler = FastjsonTypeHandler.class)
     private JSONArray rulesFactor;
 
-
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
-
 }

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

@@ -32,7 +32,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
      * @param userName  用户名
      * @return HttpResult
      */
-    HttpResult<?> saveAgreement(PtlAgreementSaveVo agreement, String userName);
+    HttpResult<Object> saveAgreement(PtlAgreementSaveVo agreement, String userName);
 
     /**
      * 分页查询协议
@@ -56,7 +56,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
      * @param agreementId 协议id
      * @return HttpResult
      */
-    HttpResult<?> deleteAgreement(Integer agreementId);
+    HttpResult<Object> deleteAgreement(Integer agreementId);
 
 
     /**
@@ -66,7 +66,7 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
      * @param agreement 上传的协议信息
      * @return HttpResult
      */
-    HttpResult<?> reviseAgreement(String userName, Integer agreementId, PtlAgreementSaveVo agreement);
+    HttpResult<Object> reviseAgreement(String userName, Integer agreementId, PtlAgreementSaveVo agreement);
 
     /**
      * 提交 产品费用 承保规则
@@ -81,5 +81,5 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
      * @param ptlAgreementAuditVo 审核内容
      * @return
      */
-    HttpResult<?> auditAgreement(Integer agreementId, PtlAgreementAuditVo ptlAgreementAuditVo);
+    HttpResult<Object> auditAgreement(Integer agreementId, PtlAgreementAuditVo ptlAgreementAuditVo);
 }

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

@@ -2,9 +2,11 @@ package com.ydtech.modules.protocol.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementUnderwritingRulesSaveDto;
+import com.ydtech.modules.protocol.entity.dto.PtlFactorDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementUnderwritingRules;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -36,4 +38,40 @@ public interface PtlAgreementUnderwritingRulesService extends IService<PtlAgreem
      * @param underwritingRules 承保规则
      */
     void saveBatchUnderwritingRules(Integer agreementId, List<PtlAgreementUnderwritingRulesSaveDto> underwritingRules);
+
+    /**
+     * 通过协议id 和 规则类型 获取 配置规则
+     *
+     * @param agreementId 协议id
+     * @param rulesType   规则类型
+     * @return Map<String, PtlFactorDto>
+     */
+    Map<String, PtlFactorDto> getMapPtlFactorDto(Integer agreementId, Integer rulesType);
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -29,8 +29,7 @@ public class PtlAgreementProductCostsServiceImpl extends ServiceImpl<PtlAgreemen
     public void deleteByAgreementId(Integer agreementId) {
         LambdaQueryWrapper<PtlAgreementProductCosts> costsLambdaQueryWrapper = new LambdaQueryWrapper<>();
         costsLambdaQueryWrapper.eq(PtlAgreementProductCosts::getAgreementId, agreementId);
-        int delete = baseMapper.delete(costsLambdaQueryWrapper);
-        AssertionUtils.isSucceed(delete, "产品费用删除失败");
+        baseMapper.delete(costsLambdaQueryWrapper);
     }
 
     @Override

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

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.protocol.entity.dto.*;
+import com.ydtech.modules.protocol.dao.PtlAgreementMapper;
+import com.ydtech.modules.protocol.entity.dto.PltAgreementSchemeQueryDto;
+import com.ydtech.modules.protocol.entity.dto.PtlAgreementSaveDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementUnderwritingRules;
 import com.ydtech.modules.protocol.entity.vo.PtlAgreementAuditVo;
@@ -15,7 +17,6 @@ import com.ydtech.modules.protocol.entity.vo.PtlAgreementQueryVo;
 import com.ydtech.modules.protocol.entity.vo.PtlAgreementSaveVo;
 import com.ydtech.modules.protocol.service.PtlAgreementProductCostsService;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
-import com.ydtech.modules.protocol.dao.PtlAgreementMapper;
 import com.ydtech.modules.protocol.service.PtlAgreementUnderwritingRulesService;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -63,7 +64,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     @Override
     @Transactional
-    public HttpResult<?> saveAgreement(PtlAgreementSaveVo agreement, String userName) {
+    public HttpResult<Object> saveAgreement(PtlAgreementSaveVo agreement, String userName) {
         PtlAgreementSaveDto agreementSaveDto = agreement.getAgreement();
         PtlAgreement ptlAgreement = new PtlAgreement();
         BeanUtils.copyProperties(agreementSaveDto, ptlAgreement);
@@ -105,7 +106,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     @Override
     @Transactional
-    public HttpResult<?> deleteAgreement(Integer agreementId) {
+    public HttpResult<Object> deleteAgreement(Integer agreementId) {
         proxyObject.ifExistsById(agreementId);
         boolean b = removeById(agreementId);
         AssertionUtils.isSucceed(b, "协议信息删除失败");
@@ -118,7 +119,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
     @Override
     @Transactional
-    public HttpResult<?> reviseAgreement(String userName, Integer agreementId, PtlAgreementSaveVo agreement) {
+    public HttpResult<Object> reviseAgreement(String userName, Integer agreementId, PtlAgreementSaveVo agreement) {
         PtlAgreementSaveDto agreementSaveDto = agreement.getAgreement();
         PtlAgreement ptlAgreement = proxyObject.ifExistsById(agreementId);
         BeanUtils.copyProperties(agreementSaveDto, ptlAgreement);
@@ -150,7 +151,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     }
 
     @Override
-    public HttpResult<?> auditAgreement(Integer agreementId, PtlAgreementAuditVo ptlAgreementAuditVo) {
+    public HttpResult<Object> auditAgreement(Integer agreementId, PtlAgreementAuditVo ptlAgreementAuditVo) {
         PtlAgreement ptlAgreement = proxyObject.ifExistsById(agreementId);
         ptlAgreement.setAuditStatus(ptlAgreementAuditVo.getAuditStatus());
         ptlAgreement.setAuditContent(ptlAgreementAuditVo.getAuditContent());

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

@@ -2,7 +2,9 @@ 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.entity.dto.PtlAgreementCostsFactorSaveDto;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementUnderwritingRulesSaveDto;
+import com.ydtech.modules.protocol.entity.dto.PtlFactorDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementUnderwritingRules;
 import com.ydtech.modules.protocol.service.PtlAgreementUnderwritingRulesService;
 import com.ydtech.modules.protocol.dao.PtlAgreementUnderwritingRulesMapper;
@@ -11,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author wenks
@@ -26,8 +29,7 @@ public class PtlAgreementUnderwritingRulesServiceImpl extends ServiceImpl<PtlAgr
     public void deleteByAgreementId(Integer agreementId) {
         LambdaQueryWrapper<PtlAgreementUnderwritingRules> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(PtlAgreementUnderwritingRules::getAgreementId, agreementId);
-        int delete = baseMapper.delete(wrapper);
-        AssertionUtils.isSucceed(delete, "承保规则删除失败");
+        baseMapper.delete(wrapper);
     }
 
     @Override
@@ -45,8 +47,13 @@ public class PtlAgreementUnderwritingRulesServiceImpl extends ServiceImpl<PtlAgr
         AssertionUtils.isSucceed(b, "批量添加协议承保规则失败");
     }
 
-}
-
-
-
+    @Override
+    public Map<String, PtlFactorDto> getMapPtlFactorDto(Integer agreementId, Integer rulesType) {
+        LambdaQueryWrapper<PtlAgreementUnderwritingRules> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PtlAgreementUnderwritingRules::getAgreementId, agreementId)
+                .eq(PtlAgreementUnderwritingRules::getRulesType, rulesType);
+        PtlAgreementUnderwritingRules rules = baseMapper.selectOne(wrapper);
+        return PtlAgreementCostsFactorSaveDto.toMapPtlFactorDto(rules.getRulesFactor());
+    }
 
+}