ljx 4 жил өмнө
parent
commit
58c2d3f6d1

+ 2 - 2
src/main/java/com/imed/costaccount/model/CostShareLevel.java

@@ -22,7 +22,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName("cost_share_level")
-public class CostShareLevel implements Serializable {
+public class   CostShareLevel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
@@ -45,7 +45,7 @@ public class CostShareLevel implements Serializable {
 	/**
 	 * 目标层级
 	 */
-	private Integer targetLevel;
+	private String targetLevel;
 	/**
 	 * 计算方式
 	 */

+ 1 - 1
src/main/java/com/imed/costaccount/model/dto/CostShareLevelEditDto.java

@@ -27,7 +27,7 @@ public class CostShareLevelEditDto {
 
     @ApiModelProperty(name = "targetLevel",value = "目标层级")
     @NotNull(message = "目标层级不能为空")
-    private Integer targetLevel;
+    private String targetLevel;
 
     @ApiModelProperty(name = "calcType",value = "计算方式  0合并计算  1 分开计算")
     @NotNull(message = "计算方式不能为空")

+ 1 - 1
src/main/java/com/imed/costaccount/model/dto/CostShareLevelSaveDto.java

@@ -23,7 +23,7 @@ public class CostShareLevelSaveDto {
     private Integer leverSort;
     @ApiModelProperty(name = "targetLevel",value = "目标层级")
     @NotNull(message = "目标层级不能为空")
-    private Integer targetLevel;
+    private String targetLevel;
     @ApiModelProperty(name = "calcType",value = "计算方式  0合并计算  1 分开计算")
     @NotNull(message = "计算方式不能为空")
     private Integer calcType;

+ 6 - 2
src/main/java/com/imed/costaccount/model/vo/CostShareLevelVO.java

@@ -26,9 +26,13 @@ public class CostShareLevelVO {
     @ApiModelProperty(name = "leverSort",value = "分摊层级序号")
     private Integer leverSort;
 
-    @ApiModelProperty(name = "targetLevel",value = "目标层级")
-    private Integer targetLevel;
+    @ApiModelProperty(name = "targetLevels",value = "目标层级")
+    private String targetLevel;
 
     @ApiModelProperty(name = "calcType",value = "计算方式  0合并计算  1 分开计算")
     private Integer calcType;
+    /**
+     * 最大值
+     */
+    private Integer maxLevel;
 }

+ 4 - 0
src/main/java/com/imed/costaccount/service/impl/CostShareLevelServiceImpl.java

@@ -45,6 +45,10 @@ public class CostShareLevelServiceImpl extends ServiceImpl<CostShareLevelMapper,
                 .orderByAsc(CostShareLevel::getLeverSort));
         List<CostShareLevel> costShareLevelList = pages.getRecords();
         List<CostShareLevelVO> costShareLevelVOList = BeanUtil.convertList(costShareLevelList, CostShareLevelVO.class);
+        int max=costShareLevelVOList.size();
+        costShareLevelVOList.forEach(i->{
+            i.setMaxLevel(max);
+        });
         PageUtils pageUtils = new PageUtils(pages);
         pageUtils.setList(costShareLevelVOList);
         return pageUtils;