协议 添加协议 分页查询协议 通过协议id查询所有信息 删除协议

src/main/java/com/ydtech/core/page/HttpResult.java

@@ -12,56 +12,57 @@ public class HttpResult<T> {
     private String msg;
     private T data;
 
-    public static HttpResult error() {
+    public static <T> HttpResult<T> error() {
         return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, "未知异常，请联系管理员");
     }
 
-    public static HttpResult error(String msg) {
+    public static <T> HttpResult<T> error(String msg) {
         return error(HttpStatus.SC_INTERNAL_SERVER_ERROR, msg);
     }
 
-    public static HttpResult error(int code, String msg) {
-        HttpResult r = new HttpResult();
+    public static <T> HttpResult<T> error(int code, String msg) {
+        HttpResult<T> r = new HttpResult<>();
         r.setCode(code);
         r.setMsg(msg);
         return r;
     }
-    public static HttpResult error(int code,Object data, String msg) {
-        HttpResult r = new HttpResult();
+
+    public static <T> HttpResult<T> error(int code, T data, String msg) {
+        HttpResult<T> r = new HttpResult<>();
         r.setCode(code);
         r.setData(data);
         r.setMsg(msg);
         return r;
     }
 
-    public static HttpResult error(Object data) {
-        HttpResult r = new HttpResult();
+    public static <T> HttpResult<T> error(T data) {
+        HttpResult<T> r = new HttpResult<>();
         r.setCode(HttpStatus.SC_INTERNAL_SERVER_ERROR);
         r.setData(data);
         return r;
     }
 
-    public static HttpResult ok(String msg) {
-        HttpResult r = new HttpResult();
+    public static <T> HttpResult<T> ok(String msg) {
+        HttpResult<T> r = new HttpResult<>();
         r.setMsg(msg);
         return r;
     }
 
-    public static HttpResult ok(Object data) {
-        HttpResult r = new HttpResult();
+    public static <T> HttpResult<T> ok(T data) {
+        HttpResult<T> r = new HttpResult<>();
         r.setData(data);
         return r;
     }
 
-    public static HttpResult ok(String msg, Object data) {
-        HttpResult r = new HttpResult();
+    public static <T> HttpResult<T> ok(String msg, T data) {
+        HttpResult<T> r = new HttpResult<>();
         r.msg = msg;
         r.setData(data);
         return r;
     }
 
-    public static HttpResult ok() {
-        return new HttpResult();
+    public static <T> HttpResult<T> ok() {
+        return new HttpResult<>();
     }
 
     public int getCode() {
@@ -90,10 +91,6 @@ public class HttpResult<T> {
 
     @Override
     public String toString() {
-        return "HttpResult{" +
-                "code=" + code +
-                ", msg='" + msg + '\'' +
-                ", data=" + data +
-                '}';
+        return "HttpResult{" + "code=" + code + ", msg='" + msg + '\'' + ", data=" + data + '}';
     }
 }

src/main/java/com/ydtech/core/page/PageRequest.java

@@ -14,6 +14,7 @@ import java.util.Map;
  * @date Aug 19, 2018
  */
 public class PageRequest {
+
     /**
      * 当前页码
      */
@@ -22,6 +23,7 @@ public class PageRequest {
      * 每页数量
      */
     private int pageSize = 10;
+
     /**
      * map
      */
@@ -69,8 +71,7 @@ public class PageRequest {
     public static Page<T>  buildPageRequestByVo(BasePageVO basePageVo){
         int pageNum = basePageVo.getPageNum() < 1?1:basePageVo.getPageNum();
         int pageSize = basePageVo.getPageSize() <1?1:basePageVo.getPageSize();
-
-        Page<T> p = new Page();
+        Page<T> p = new Page<>();
         p.setSize(pageSize);
         p.setCurrent(pageNum);
         return p;

src/main/java/com/ydtech/core/page/PageResult.java

@@ -61,7 +61,7 @@ public class PageResult<T> {
 
     }
 
-    public PageResult(int currentPage, int numPerPage, int totalCount, List<T> recordList) {
+    public PageResult(int currentPage, int numPerPage, long totalCount, List<T> recordList) {
         this.pageNum = currentPage;
         this.pageSize = numPerPage;
         this.totalSize = totalCount;
@@ -69,7 +69,7 @@ public class PageResult<T> {
         setContent(recordList);
     }
 
-    public PageResult(int currentPage, int numPerPage, int totalCount, String jsum, String yfsum, String ssum, String yssum, List recordList) {
+    public PageResult(int currentPage, int numPerPage, long totalCount, String jsum, String yfsum, String ssum, String yssum, List recordList) {
         this.pageNum = currentPage;
         this.pageSize = numPerPage;
         this.totalSize = totalCount;

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

@@ -56,7 +56,7 @@ public class EsmInsAttributionController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "insCompanyId", value = "保险公司ID")
     })
-    public HttpResult<EsmInsAttributionVo> gainAffiliation(@PathVariable String insCompanyId, HttpServletRequest request) {
+    public HttpResult<EsmInsAttributionTemplate> gainAffiliation(@PathVariable String insCompanyId, HttpServletRequest request) {
 
 
         LambdaQueryWrapper<EsmInsAttributionTemplate> queryWrapper = new LambdaQueryWrapper<>();
@@ -165,7 +165,7 @@ public class EsmInsAttributionController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "username", value = "保险公司用户名")
     })
-    public HttpResult<EsmInsAttributionVo> gainAffiliation(@PathVariable String username) {
+    public HttpResult<EsmInsAttribution> gainAffiliation(@PathVariable String username) {
 
         LambdaQueryWrapper<EsmInsAttribution> lqw = new LambdaQueryWrapper<>();
         lqw.eq(EsmInsAttribution::getUsername, username);

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

@@ -10,19 +10,25 @@ import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.protocol.entity.po.EsProduct;
 import com.ydtech.modules.protocol.service.EsProductService;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+@Api(tags = "产品管理")
 @RestController
-@RequestMapping("/api/emProduct")
+@RequestMapping("/ptl/product")
 public class EsProductController extends BaseController {
 
-    @Autowired
-    EsProductService esProductService;
+    private final EsProductService esProductService;
+
+    public EsProductController(EsProductService esProductService) {
+        this.esProductService = esProductService;
+    }
 
     /**
      * 新增产品信息
@@ -31,6 +37,7 @@ public class EsProductController extends BaseController {
      * @return
      */
     @PostMapping(value = "/addProduct")
+    @ApiOperation("新增产品信息")
     public HttpResult save(@RequestBody EsProduct record) {
 
         record.setCreateBy(getUserName());
@@ -48,6 +55,7 @@ public class EsProductController extends BaseController {
      * @return
      */
     @PostMapping(value = "/editProduct")
+    @ApiOperation("修改产品信息")
     public HttpResult edit(@RequestBody EsProduct record) {
         record.setLastUpdateBy(getUserName());
         record.setLastUpdateTime(new Date());
@@ -62,6 +70,7 @@ public class EsProductController extends BaseController {
      * @return
      */
     @PostMapping(value = "/deleteProduct")
+    @ApiOperation("删除产品信息")
     public HttpResult delete(@RequestParam List<String> idList) {
 
         esProductService.removeBatchByIds(idList);
@@ -81,6 +90,7 @@ public class EsProductController extends BaseController {
      * @return
      */
     @GetMapping(value = "/productList")
+    @ApiOperation("产品列表")
     public HttpResult query(@RequestParam String id) {
         QueryWrapper<EsProduct> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("del_flag ", 0);
@@ -97,6 +107,7 @@ public class EsProductController extends BaseController {
      * @return
      */
     @PostMapping(value = "/findPage")
+    @ApiOperation("基础分页查询")
     public HttpResult findPage(@RequestBody PageRequest pageRequest) {
 
         int pageNum = pageRequest.getPageNum();
@@ -134,8 +145,14 @@ public class EsProductController extends BaseController {
 
         //传入查询条件
         Page<EsProduct> page = esProductService.page(pageInfo, queryWrapper);
-        PageResult<EsProduct> pageResult = new PageResult<>(pageNum, pageSize, (int) page.getTotal(), page.getRecords());
+        PageResult<EsProduct> pageResult = new PageResult<>(pageNum, pageSize, page.getTotal(), page.getRecords());
         return HttpResult.ok(pageResult);
     }
 
+    @GetMapping("/getCodeAndName")
+    @ApiOperation("获取编号和名称")
+    public HttpResult getCodeAndName() {
+        return esProductService.getCodeAndName();
+    }
+
 }

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

@@ -1,18 +1,20 @@
 package com.ydtech.modules.protocol.controller;
 
 
+import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.protocol.entity.vo.PtlAgreementPageVo;
+import com.ydtech.modules.protocol.entity.vo.PtlAgreementSaveVo;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @Api(tags = "协议")
 @RequestMapping("/plt/agreement")
 @RestController
-public class PtlAgreementController {
+public class PtlAgreementController extends BaseController {
 
     private final PtlAgreementService ptlAgreementService;
 
@@ -22,14 +24,27 @@ public class PtlAgreementController {
 
     @PostMapping
     @ApiOperation("添加协议")
-    public HttpResult save(){
-        return null;
+    public HttpResult save(@RequestBody PtlAgreementSaveVo agreement) {
+        String userName = getUserName();
+        return ptlAgreementService.saveAgreement(agreement, userName);
     }
 
+    @PostMapping("/page")
+    @ApiOperation("分页查询协议")
+    public HttpResult page(@RequestBody PtlAgreementPageVo ptlAgreementPageVo) {
+        return ptlAgreementService.pageAgreement(ptlAgreementPageVo);
+    }
 
+    @GetMapping("/{agreementId}")
+    @ApiModelProperty("通过协议id查询所有信息")
+    public HttpResult getByAgreementId(@PathVariable String agreementId){
+        return ptlAgreementService.getByAgreementId(agreementId);
+    }
 
-
-
-
+    @PostMapping("/{agreementId}")
+    @ApiOperation("删除协议")
+    public HttpResult delete(@PathVariable String agreementId) {
+        return ptlAgreementService.deleteAgreement(agreementId);
+    }
 
 }

src/main/java/com/ydtech/modules/protocol/dao/PtlAgreementCostsFactorMapper.java

@@ -1,18 +0,0 @@
-package com.ydtech.modules.protocol.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementCostsFactor;
-
-/**
-* @author Administrator
-* @description 针对表【ptl_agreement_costs_factor(协议产品费用因子)】的数据库操作Mapper
-* @createDate 2023-06-05 17:59:52
-* @Entity com.ydtech.modules.protocol.entity.po.PtlAgreementCostsFactor
-*/
-public interface PtlAgreementCostsFactorMapper extends BaseMapper<PtlAgreementCostsFactor> {
-
-}
-
-
-
-

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

@@ -0,0 +1,19 @@
+package com.ydtech.modules.protocol.entity.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("费用因子")
+public class PtlAgreementCostsFactorSaveDto {
+
+    @ApiModelProperty("因子类型")
+    private String factorType;
+
+    @ApiModelProperty("费用因子")
+    private List<PtlFactorDto> factor;
+
+}

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

@@ -0,0 +1,59 @@
+package com.ydtech.modules.protocol.entity.dto;
+
+import com.alibaba.fastjson.JSON;
+import com.ydtech.modules.protocol.entity.po.PtlAgreementProductCosts;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel("协议费用Dto")
+public class PtlAgreementProductCostsSaveDto {
+
+    @ApiModelProperty("产品id")
+    private Integer productId;
+
+    @ApiModelProperty("费用描述")
+    private String costsDescription;
+
+    @ApiModelProperty("费用描述")
+    private String costsProportion;
+
+    @ApiModelProperty("费用级别")
+    private String costsLevel;
+
+    @ApiModelProperty("费用起期")
+    private LocalDate costsStartDate;
+
+    @ApiModelProperty("费用止期")
+    private LocalDate costsEndDate;
+
+    @ApiModelProperty("溢出保费")
+    private String spilloverPremiums;
+
+    @ApiModelProperty("溢出比例")
+    private String spilloverProportion;
+
+    @ApiModelProperty("费用")
+    private List<PtlAgreementCostsFactorSaveDto> factor;
+
+    public static List<PtlAgreementProductCosts> toPtlAgreementProductCosts(Integer agreementId, List<PtlAgreementProductCostsSaveDto> productCosts) {
+        List<PtlAgreementProductCosts> productCostsList = new ArrayList<>();
+        productCosts.forEach(x -> {
+            PtlAgreementProductCosts ptlAgreementProductCosts = new PtlAgreementProductCosts();
+            BeanUtils.copyProperties(x, ptlAgreementProductCosts);
+            String factor = JSON.toJSONString(x.getFactor());
+            ptlAgreementProductCosts.setAgreementId(agreementId);
+            ptlAgreementProductCosts.setCostsFactor(factor);
+            productCostsList.add(ptlAgreementProductCosts);
+        });
+        return productCostsList;
+    }
+
+}

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.protocol.entity.vo;
+package com.ydtech.modules.protocol.entity.dto;
 
 
 import io.swagger.annotations.ApiModel;
@@ -7,7 +7,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Data
 @ApiModel("协议添加实体")
@@ -61,12 +60,4 @@ public class PtlAgreementSaveDto implements Serializable {
     @ApiModelProperty("附件id")
     private String fileId;
 
-
-    @ApiModelProperty("创建者")
-    private String creator;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
-
-
 }

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

@@ -0,0 +1,37 @@
+package com.ydtech.modules.protocol.entity.dto;
+
+import com.alibaba.fastjson.JSON;
+import com.ydtech.modules.protocol.entity.po.PtlAgreementProductCosts;
+import com.ydtech.modules.protocol.entity.po.PtlAgreementUnderwritingRules;
+import com.ydtech.utils.CalculateUtils;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel("承包规则")
+public class PtlAgreementUnderwritingRulesSaveDto {
+
+    @ApiModelProperty("规则类型（0满足拒保 1满足承包）")
+    private Integer rulesType;
+
+    @ApiModelProperty("规则因子")
+    private List<PtlAgreementCostsFactorSaveDto> rulesFactor;
+
+    public static List<PtlAgreementUnderwritingRules> toPtlAgreementUnderwritingRules(Integer agreementId, List<PtlAgreementUnderwritingRulesSaveDto> underwritingRules) {
+        List<PtlAgreementUnderwritingRules> ptlAgreementUnderwritingRulesList = new ArrayList<>();
+        underwritingRules.forEach(x -> {
+            PtlAgreementUnderwritingRules ptlAgreementUnderwritingRules = new PtlAgreementUnderwritingRules();
+            String factor = JSON.toJSONString(x.getRulesFactor());
+            ptlAgreementUnderwritingRules.setRulesType(x.getRulesType());
+            ptlAgreementUnderwritingRules.setAgreementId(agreementId);
+            ptlAgreementUnderwritingRules.setRulesFactor(factor);
+            ptlAgreementUnderwritingRulesList.add(ptlAgreementUnderwritingRules);
+        });
+        return ptlAgreementUnderwritingRulesList;
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.ydtech.modules.protocol.entity.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("因子实体")
+public class PtlFactorDto {
+
+    @ApiModelProperty("参数名称")
+    private String name;
+
+    @ApiModelProperty("因子列表")
+    private List<String> parameter;
+
+    @ApiModelProperty("最大值")
+    private String maxValue;
+
+    @ApiModelProperty("最小值")
+    private String minValue;
+
+}
+

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

@@ -1,5 +1,9 @@
 package com.ydtech.modules.protocol.entity.po;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,117 +14,141 @@ import java.time.LocalDateTime;
  * 协议信息表
  * @TableName ptl_agreement
  */
+@TableName(value ="ptl_agreement")
 @Data
 public class PtlAgreement implements Serializable {
     /**
      * 主键/自增
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
      * 协议类型
      */
+    @TableField(value = "agreement_type")
     private String agreementType;
 
     /**
      * 协议代码
      */
+    @TableField(value = "agreement_code")
     private String agreementCode;
 
     /**
      * 协议名称
      */
+    @TableField(value = "agreement_name")
     private String agreementName;
 
     /**
      * 协议简称
      */
+    @TableField(value = "agreement_abbreviation")
     private String agreementAbbreviation;
 
     /**
      * 合作公司
      */
+    @TableField(value = "insurance_company")
     private String insuranceCompany;
 
     /**
      * 协议起期
      */
+    @TableField(value = "start_date")
     private LocalDate startDate;
 
     /**
      * 协议止期
      */
+    @TableField(value = "end_date")
     private LocalDate endDate;
 
     /**
      * 结算周期
      */
+    @TableField(value = "money_time")
     private Integer moneyTime;
 
     /**
      * 保单匹配协议日期类型(保单日期类型)
      */
+    @TableField(value = "match_type")
     private String matchType;
 
     /**
      * 对接人
      */
+    @TableField(value = "docking_person")
     private String dockingPerson;
 
     /**
      * 联系方式（对接人）
      */
+    @TableField(value = "docking_phone")
     private String dockingPhone;
 
     /**
      * 含增值税结算
      */
+    @TableField(value = "with_tax")
     private String withTax;
 
     /**
      * 佣金发放方式
      */
+    @TableField(value = "money_type")
     private String moneyType;
 
     /**
      * 合作渠道
      */
+    @TableField(value = "cooperation_channels")
     private String cooperationChannels;
 
     /**
      * 有效状态
      */
+    @TableField(value = "valid_status")
     private String validStatus;
 
     /**
      * 附件id
      */
+    @TableField(value = "file_id")
     private String fileId;
 
     /**
      * 审核状态 0 申请审核 1 审核通过 2 审核不通过
      */
+    @TableField(value = "audit_status")
     private Integer auditStatus;
 
     /**
      * 创建者
      */
+    @TableField(value = "creator")
     private String creator;
 
     /**
      * 创建时间
      */
+    @TableField(value = "create_time")
     private LocalDateTime createTime;
 
     /**
      * 修改人
      */
+    @TableField(value = "modified_by")
     private String modifiedBy;
 
     /**
      * 修改时间
      */
+    @TableField(value = "update_time")
     private LocalDateTime updateTime;
 
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

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

@@ -1,44 +0,0 @@
-package com.ydtech.modules.protocol.entity.po;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 协议产品费用因子
- * @TableName ptl_agreement_costs_factor
- */
-@Data
-public class PtlAgreementCostsFactor implements Serializable {
-    /**
-     * 主键/自增
-     */
-    private Integer id;
-
-    /**
-     * 协议id
-     */
-    private Integer agreementId;
-
-    /**
-     * 费用id
-     */
-    private Integer costsId;
-
-    /**
-     * 因子类型 1 车辆因子 2 人员因子 3 险种保费 4 其他因子 
-     */
-    private String factorType;
-
-    /**
-     * 费用因子
-     */
-    private String factor;
-
-    /**
-     * 是否是默认方案(true 默认方案 false 不是默认方案)
-     */
-    private Integer isDefault;
-
-    private static final long serialVersionUID = 1L;
-}

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

@@ -1,5 +1,9 @@
 package com.ydtech.modules.protocol.entity.po;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -9,57 +13,75 @@ import java.time.LocalDate;
  * 协议产品费用
  * @TableName ptl_agreement_product_costs
  */
+@TableName(value ="ptl_agreement_product_costs")
 @Data
 public class PtlAgreementProductCosts implements Serializable {
     /**
      * 主键/自增
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
      * 协议id
      */
+    @TableField(value = "agreement_id")
     private Integer agreementId;
 
     /**
      * 产品id
      */
+    @TableField(value = "product_id")
     private Integer productId;
 
+    /**
+     * 费用因子
+     */
+    @TableField(value = "costs_factor")
+    private String costsFactor;
+
     /**
      * 费用描述
      */
+    @TableField(value = "costs_description")
     private String costsDescription;
 
     /**
      * 费用比例
      */
+    @TableField(value = "costs_proportion")
     private String costsProportion;
 
     /**
      * 费用级别
      */
+    @TableField(value = "costs_level")
     private String costsLevel;
 
     /**
      * 费用起期
      */
+    @TableField(value = "costs_start_date")
     private LocalDate costsStartDate;
 
     /**
      * 费用止期
      */
+    @TableField(value = "costs_end_date")
     private LocalDate costsEndDate;
 
     /**
      * 溢出保费
      */
-    private String costspilloverPremiums;
+    @TableField(value = "spillover_premiums")
+    private String spilloverPremiums;
 
     /**
      * 溢出比例
      */
-    private String costspilloverProportion;
+    @TableField(value = "spillover_proportion")
+    private String spilloverProportion;
 
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

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

@@ -1,5 +1,9 @@
 package com.ydtech.modules.protocol.entity.po;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -8,27 +12,33 @@ import java.io.Serializable;
  * 协议承保规则
  * @TableName ptl_agreement_underwriting_rules
  */
+@TableName(value ="ptl_agreement_underwriting_rules")
 @Data
 public class PtlAgreementUnderwritingRules implements Serializable {
     /**
      * 主键/自增
      */
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
      * 协议id
      */
+    @TableField(value = "agreement_id")
     private Integer agreementId;
 
     /**
      * 规则类型（0满足拒保 1满足承包）
      */
+    @TableField(value = "rules_type")
     private Integer rulesType;
 
     /**
      * 规则因子
      */
+    @TableField(value = "rules_factor")
     private String rulesFactor;
 
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

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

@@ -0,0 +1,29 @@
+package com.ydtech.modules.protocol.entity.vo;
+
+
+import com.ydtech.core.page.BasePageVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDate;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("分页查询协议")
+public class PtlAgreementPageVo extends BasePageVO {
+
+    @ApiModelProperty("录入时间 开始")
+    private LocalDate startDate;
+
+    @ApiModelProperty("录入时间 结束")
+    private LocalDate endDate;
+
+    @ApiModelProperty("合作公司")
+    private String insuranceCompany;
+
+    @ApiModelProperty("审核状态 0 申请审核 1 审核通过 2 审核不通过")
+    private Integer auditStatus;
+
+}

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

@@ -0,0 +1,26 @@
+package com.ydtech.modules.protocol.entity.vo;
+
+
+import com.ydtech.modules.protocol.entity.dto.PtlAgreementProductCostsSaveDto;
+import com.ydtech.modules.protocol.entity.dto.PtlAgreementSaveDto;
+import com.ydtech.modules.protocol.entity.dto.PtlAgreementUnderwritingRulesSaveDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("协议信息上传")
+public class PtlAgreementSaveVo {
+
+    @ApiModelProperty("协议信息")
+    private PtlAgreementSaveDto agreement;
+
+    @ApiModelProperty("产品费用")
+    private List<PtlAgreementProductCostsSaveDto> productCosts;
+
+    @ApiModelProperty("承包规则")
+    private List<PtlAgreementUnderwritingRulesSaveDto> underwritingRules;
+
+}

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

@@ -0,0 +1,31 @@
+package com.ydtech.modules.protocol.entity.vo;
+
+import com.ydtech.modules.protocol.entity.po.EsProduct;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@ApiModel("产品")
+@Data
+@AllArgsConstructor
+public class PtlProductVo {
+
+    @ApiModelProperty("编号")
+    private String id;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    public static List<PtlProductVo> toPtlProductVoList(List<EsProduct> esProducts) {
+       return esProducts.stream().map(PtlProductVo::toPtlProductVo).collect(Collectors.toList());
+    }
+
+    public static PtlProductVo toPtlProductVo(EsProduct esProducts) {
+        return new PtlProductVo(esProducts.getId(), esProducts.getName());
+    }
+
+}

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

@@ -3,6 +3,7 @@ package com.ydtech.modules.protocol.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.protocol.entity.po.EsProduct;
 
 import java.util.List;
@@ -11,6 +12,7 @@ public interface EsProductService extends IService<EsProduct> {
 
     List<EsProduct> selectList(QueryWrapper queryWrapper);
 
+    HttpResult getCodeAndName();
 }
 
 

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

@@ -1,13 +0,0 @@
-package com.ydtech.modules.protocol.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementCostsFactor;
-
-/**
-* @author Administrator
-* @description 针对表【ptl_agreement_costs_factor(协议产品费用因子)】的数据库操作Service
-* @createDate 2023-06-05 17:59:52
-*/
-public interface PtlAgreementCostsFactorService extends IService<PtlAgreementCostsFactor> {
-
-}

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

@@ -10,4 +10,10 @@ import com.ydtech.modules.protocol.entity.po.PtlAgreementProductCosts;
 */
 public interface PtlAgreementProductCostsService extends IService<PtlAgreementProductCosts> {
 
+    /**
+     * 根据 协议id 删除协议产品费用
+     *
+     * @param agreementId 协议id
+     */
+    void deleteByAgreementId(String agreementId);
 }

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

@@ -1,7 +1,10 @@
 package com.ydtech.modules.protocol.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
+import com.ydtech.modules.protocol.entity.vo.PtlAgreementPageVo;
+import com.ydtech.modules.protocol.entity.vo.PtlAgreementSaveVo;
 
 /**
 * @author Administrator
@@ -10,4 +13,33 @@ import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 */
 public interface PtlAgreementService extends IService<PtlAgreement> {
 
+    /**
+     * 添加协议
+     * @param agreement 上传的协议信息
+     * @param userName 用户名
+     * @return HttpResult
+     */
+    HttpResult saveAgreement(PtlAgreementSaveVo agreement, String userName);
+
+    /**
+     * 分页查询协议
+     * @param ptlAgreementPageVo 分页查询参数
+     * @return HttpResult
+     */
+    HttpResult pageAgreement(PtlAgreementPageVo ptlAgreementPageVo);
+
+    /**
+     * 通过协议id查询
+     * @param agreementId 协议id
+     * @return HttpResult
+     */
+    HttpResult getByAgreementId(String agreementId);
+
+    /**
+     * 删除协议
+     * @param agreementId 协议id
+     * @return HttpResult
+     */
+    HttpResult deleteAgreement(String agreementId);
+
 }

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

@@ -4,10 +4,16 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementUnderwritingRules;
 
 /**
-* @author Administrator
-* @description 针对表【ptl_agreement_underwriting_rules(协议承保规则)】的数据库操作Service
-* @createDate 2023-06-05 17:59:52
-*/
+ * @author Administrator
+ * @description 针对表【ptl_agreement_underwriting_rules(协议承保规则)】的数据库操作Service
+ * @createDate 2023-06-05 17:59:52
+ */
 public interface PtlAgreementUnderwritingRulesService extends IService<PtlAgreementUnderwritingRules> {
 
+    /**
+     * 根据 协议id 删除承保规则
+     *
+     * @param agreementId 协议id
+     */
+    void deleteByAgreementId(String agreementId);
 }

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

@@ -1,13 +1,18 @@
 package com.ydtech.modules.protocol.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.protocol.dao.EsProductMapper;
 import com.ydtech.modules.protocol.entity.po.EsProduct;
+import com.ydtech.modules.protocol.entity.vo.PtlProductVo;
 import com.ydtech.modules.protocol.service.EsProductService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -22,6 +27,16 @@ public class EsProductServiceImpl extends ServiceImpl<EsProductMapper, EsProduct
         return productMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public HttpResult getCodeAndName() {
+        LambdaQueryWrapper<EsProduct> wrapper = new LambdaQueryWrapper<>();
+        // 查询id 和 用户名
+        wrapper.select(EsProduct::getId, EsProduct::getName);
+        List<EsProduct> esProducts = productMapper.selectList(wrapper);
+        // 转换vo
+        List<PtlProductVo> productVos = PtlProductVo.toPtlProductVoList(esProducts);
+        return HttpResult.ok(productVos);
+    }
 
 }
 

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

@@ -1,22 +0,0 @@
-package com.ydtech.modules.protocol.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.protocol.dao.PtlAgreementCostsFactorMapper;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementCostsFactor;
-import com.ydtech.modules.protocol.service.PtlAgreementCostsFactorService;
-import org.springframework.stereotype.Service;
-
-/**
-* @author Administrator
-* @description 针对表【ptl_agreement_costs_factor(协议产品费用因子)】的数据库操作Service实现
-* @createDate 2023-06-05 17:59:52
-*/
-@Service
-public class PtlAgreementCostsFactorServiceImpl extends ServiceImpl<PtlAgreementCostsFactorMapper, PtlAgreementCostsFactor>
-    implements PtlAgreementCostsFactorService {
-
-}
-
-
-
-

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

@@ -1,5 +1,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.entity.po.PtlAgreementProductCosts;
 import com.ydtech.modules.protocol.service.PtlAgreementProductCostsService;
@@ -15,6 +16,12 @@ import org.springframework.stereotype.Service;
 public class PtlAgreementProductCostsServiceImpl extends ServiceImpl<PtlAgreementProductCostsMapper, PtlAgreementProductCosts>
     implements PtlAgreementProductCostsService{
 
+    @Override
+    public void deleteByAgreementId(String agreementId) {
+        LambdaQueryWrapper<PtlAgreementProductCosts> costsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        costsLambdaQueryWrapper.eq(PtlAgreementProductCosts::getAgreementId, agreementId);
+        baseMapper.delete(costsLambdaQueryWrapper);
+    }
 }
 
 

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

@@ -1,19 +1,108 @@
 package com.ydtech.modules.protocol.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.protocol.entity.dto.PtlAgreementProductCostsSaveDto;
+import com.ydtech.modules.protocol.entity.dto.PtlAgreementSaveDto;
+import com.ydtech.modules.protocol.entity.dto.PtlAgreementUnderwritingRulesSaveDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
+import com.ydtech.modules.protocol.entity.po.PtlAgreementProductCosts;
+import com.ydtech.modules.protocol.entity.po.PtlAgreementUnderwritingRules;
+import com.ydtech.modules.protocol.entity.vo.PtlAgreementPageVo;
+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 org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.List;
 
 /**
-* @author Administrator
-* @description 针对表【ptl_agreement(协议信息表)】的数据库操作Service实现
-* @createDate 2023-06-05 17:59:52
-*/
+ * @author Administrator
+ * @description 针对表【ptl_agreement(协议信息表)】的数据库操作Service实现
+ * @createDate 2023-06-05 17:59:52
+ */
 @Service
 public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, PtlAgreement>
-    implements PtlAgreementService{
+        implements PtlAgreementService {
+
+    private final PtlAgreementProductCostsService ptlAgreementProductCostsService;
+
+    private final PtlAgreementUnderwritingRulesService ptlAgreementUnderwritingRulesService;
+
+    public PtlAgreementServiceImpl(PtlAgreementProductCostsService ptlAgreementProductCostsService, PtlAgreementUnderwritingRulesService ptlAgreementUnderwritingRulesService) {
+        this.ptlAgreementProductCostsService = ptlAgreementProductCostsService;
+        this.ptlAgreementUnderwritingRulesService = ptlAgreementUnderwritingRulesService;
+    }
+
+    @Override
+    @Transactional
+    public HttpResult saveAgreement(PtlAgreementSaveVo agreement, String userName) {
+        PtlAgreementSaveDto agreementSaveDto = agreement.getAgreement();
+        PtlAgreement ptlAgreement = new PtlAgreement();
+        BeanUtils.copyProperties(agreementSaveDto, ptlAgreement);
+        ptlAgreement.setCreator(userName);
+        ptlAgreement.setCreateTime(LocalDateTime.now());
+        save(ptlAgreement);
+        // 产品费用
+        List<PtlAgreementProductCostsSaveDto> productCosts = agreement.getProductCosts();
+        Integer agreementId = ptlAgreement.getId();
+        List<PtlAgreementProductCosts> ptlAgreementProductCostsList = PtlAgreementProductCostsSaveDto.toPtlAgreementProductCosts(agreementId, productCosts);
+        ptlAgreementProductCostsService.saveBatch(ptlAgreementProductCostsList);
+        // 承包规则
+        List<PtlAgreementUnderwritingRulesSaveDto> underwritingRules = agreement.getUnderwritingRules();
+        List<PtlAgreementUnderwritingRules> ptlAgreementUnderwritingRulesList = PtlAgreementUnderwritingRulesSaveDto.toPtlAgreementUnderwritingRules(agreementId, underwritingRules);
+        ptlAgreementUnderwritingRulesService.saveBatch(ptlAgreementUnderwritingRulesList);
+        return HttpResult.ok();
+    }
+
+    @Override
+    public HttpResult pageAgreement(PtlAgreementPageVo ptlAgreementPageVo) {
+        int pageNum = ptlAgreementPageVo.getPageNum();
+        int pageSize = ptlAgreementPageVo.getPageSize();
+        Page<PtlAgreement> ptlAgreementPage = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<PtlAgreement> wrapper = new LambdaQueryWrapper<>();
+        // 审核状态
+        wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAuditStatus()), PtlAgreement::getAuditStatus, ptlAgreementPageVo.getAuditStatus())
+                // 保险公司
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getInsuranceCompany()), PtlAgreement::getInsuranceCompany, ptlAgreementPageVo.getInsuranceCompany())
+                // 录入时间
+                .between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate()), PtlAgreement::getCreateTime, ptlAgreementPageVo.getStartDate(), ptlAgreementPageVo.getEndDate());
+        Page<PtlAgreement> agreementPage = page(ptlAgreementPage, wrapper);
+        PageResult<PtlAgreement> ptlAgreementPageResult = new PageResult<>(pageNum, pageSize, (int) agreementPage.getTotal(), agreementPage.getRecords());
+        return HttpResult.ok(ptlAgreementPageResult);
+    }
+
+    @Override
+    public HttpResult getByAgreementId(String agreementId) {
+        LambdaQueryWrapper<PtlAgreementProductCosts> costsLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        costsLambdaQueryWrapper.eq(PtlAgreementProductCosts::getAgreementId, agreementId);
+        ptlAgreementProductCostsService.list();
+
+        LambdaQueryWrapper<PtlAgreementUnderwritingRules> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PtlAgreementUnderwritingRules::getAgreementId, agreementId);
+        List<PtlAgreementUnderwritingRules> list = ptlAgreementUnderwritingRulesService.list(wrapper);
+        return HttpResult.ok();
+    }
+
+    @Override
+    @Transactional
+    public HttpResult deleteAgreement(String agreementId) {
+        removeById(agreementId);
+        // 删除产品费用
+        ptlAgreementProductCostsService.deleteByAgreementId(agreementId);
+        // 删除承包规则
+        ptlAgreementUnderwritingRulesService.deleteByAgreementId(agreementId);
+        return HttpResult.ok();
+    }
 
 }
 

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

@@ -1,5 +1,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.entity.po.PtlAgreementUnderwritingRules;
 import com.ydtech.modules.protocol.service.PtlAgreementUnderwritingRulesService;
@@ -15,6 +16,13 @@ import org.springframework.stereotype.Service;
 public class PtlAgreementUnderwritingRulesServiceImpl extends ServiceImpl<PtlAgreementUnderwritingRulesMapper, PtlAgreementUnderwritingRules>
     implements PtlAgreementUnderwritingRulesService{
 
+
+    @Override
+    public void deleteByAgreementId(String agreementId) {
+        LambdaQueryWrapper<PtlAgreementUnderwritingRules> rulesLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        rulesLambdaQueryWrapper.eq(PtlAgreementUnderwritingRules::getAgreementId, agreementId);
+        baseMapper.delete(rulesLambdaQueryWrapper);
+    }
 }
 
 

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

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ydtech.modules.protocol.dao.PtlAgreementCostsFactorMapper">
-
-    <resultMap id="BaseResultMap" type="com.ydtech.modules.protocol.entity.po.PtlAgreementCostsFactor">
-            <id property="id" column="id" jdbcType="INTEGER"/>
-            <result property="agreementId" column="agreement_id" jdbcType="INTEGER"/>
-            <result property="costsId" column="costs_id" jdbcType="INTEGER"/>
-            <result property="factorType" column="factor_type" jdbcType="VARCHAR"/>
-            <result property="factor" column="factor" jdbcType="VARCHAR"/>
-            <result property="isDefault" column="is_default" jdbcType="TINYINT"/>
-    </resultMap>
-
-    <sql id="Base_Column_List">
-        id,agreement_id,costs_id,
-        factor_type,factor,is_default
-    </sql>
-</mapper>