fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpItemAddBo.java

@@ -29,8 +29,17 @@ public class TopCostTpItemAddBo {
     /** 业务层ID */
     @ApiModelProperty("业务层ID")
     private Long businessId;
-    @ApiModelProperty("阶梯列表")
-    private List<TopCostItemRangeBo> rangeList;
+    /** 成本类型 1百分比 2固定成本 */
+    @ApiModelProperty("成本类型 1百分比 2固定成本")
+    private Integer itemType;
+    @ApiModelProperty("最大值")
+    private BigDecimal maxValue;
+
+    @ApiModelProperty("最小值")
+    private BigDecimal minValue;
+    /** 百分比值为 0到 100 */
+    @ApiModelProperty("百分比值为 0到 100")
+    private BigDecimal typeValue;
     /** 0 禁用 1启用 */
     @ApiModelProperty("0 禁用 1启用")
     private Integer status;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/bo/TopCostTpItemEditBo.java

@@ -37,8 +37,6 @@ public class TopCostTpItemEditBo {
     @ApiModelProperty("业务层ID")
     private Long businessId;
 
-    @ApiModelProperty("阶梯列表")
-    private List<TopCostItemRangeBo> rangeList;
 
     /** 0 禁用 1启用 */
     @ApiModelProperty("0 禁用 1启用")
@@ -54,5 +52,16 @@ public class TopCostTpItemEditBo {
     /** 项目id */
     @ApiModelProperty("项目id")
     private Integer projectId;
+    /** 成本类型 1百分比 2固定成本 */
+    @ApiModelProperty("成本类型 1百分比 2固定成本")
+    private Integer itemType;
+    @ApiModelProperty("最大值")
+    private BigDecimal maxValue;
+
+    @ApiModelProperty("最小值")
+    private BigDecimal minValue;
+    /** 百分比值为 0到 100 */
+    @ApiModelProperty("百分比值为 0到 100")
+    private BigDecimal typeValue;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/domain/TopCostTpItem.java

@@ -53,4 +53,10 @@ private static final long serialVersionUID=1L;
     private Long educationTypeId;
     /** 项目id */
     private Integer projectId;
+    /** 成本类型 1百分比 2固定成本 */
+
+    private BigDecimal maxValue;
+
+    private BigDecimal minValue;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/service/impl/TopCostTpItemServiceImpl.java

@@ -72,9 +72,12 @@ public class TopCostTpItemServiceImpl extends ServiceImpl<TopCostTpItemMapper, T
 
     @Override
     public Boolean insertByAddBo(TopCostTpItemAddBo bo) {
-        if(Validator.isEmpty(bo.getTpId())||Validator.isEmpty(bo.getItemName())){
+        if(Validator.isEmpty(bo.getTpId())||Validator.isEmpty(bo.getItemName())||Validator.isEmpty(bo.getItemCategory())){
             throw new CustomException("参数缺少");
         }
+        if(bo.getItemCategory()==1&&(Validator.isEmpty(bo.getBusinessId())||Validator.isEmpty(bo.getProjectId())||Validator.isEmpty(bo.getEducationTypeId()))){
+            throw new CustomException("业务层参数缺少");
+        }
         TopCostTpItem add = BeanUtil.toBean(bo, TopCostTpItem.class);
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopCostTpItemVo.java

@@ -57,4 +57,8 @@ public class TopCostTpItemVo {
 	/** 项目id */
 	@ApiModelProperty("项目id")
 	private Integer projectId;
+	@ApiModelProperty("最大值")
+	private BigDecimal maxValue;
+	@ApiModelProperty("最小值")
+	private BigDecimal minValue;
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopCostTpItemMapper.xml

@@ -15,6 +15,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="educationTypeId" column="education_type_id"/>
+        <result property="projectId" column="project_id"/>
+        <result property="maxValue" column="max_value"/>
+        <result property="minValue" column="min_value"/>
     </resultMap>