Commit fad31180 authored by tanyang's avatar tanyang

数据结构优化

parent afabbaf0
...@@ -4,7 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,7 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data; import lombok.Data;
import org.hibernate.validator.constraints.Range;
import javax.annotation.CheckForNull;
import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.DecimalMin;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
...@@ -19,61 +25,53 @@ public class CbCostMeasureActualSaveBo { ...@@ -19,61 +25,53 @@ public class CbCostMeasureActualSaveBo {
/** /**
* 计划成本措施费id * 计划成本措施费id
*/ */
@TableField(value = "plan_measure_id")
private Long planMeasureId; private Long planMeasureId;
/** /**
* 本月发生成本比例 * 本月发生成本比例
*/ */
@TableField(value = "month_cost_rate") @DecimalMin(value = "-1",message = "数据格式不正确")
@DecimalMax(value = "1",message = "数据格式不正确")
private BigDecimal monthCostRate; private BigDecimal monthCostRate;
/** /**
* 成本合价 * 成本合价
*/ */
@TableField(value = "cost_effective")
private BigDecimal costEffective; private BigDecimal costEffective;
/** /**
* 截止本月工程量 * 截止本月工程量
*/ */
@TableField(value = "current_project_volume")
private BigDecimal currentProjectVolume; private BigDecimal currentProjectVolume;
/** /**
* 推送工程量 * 推送工程量
*/ */
@TableField(value = "submit_project_volume")
private BigDecimal submitProjectVolume; private BigDecimal submitProjectVolume;
/** /**
* 年月 * 年月
*/ */
@TableField(value = "`month`")
private String month; private String month;
/** /**
* 推送时间 * 推送时间
*/ */
@TableField(value = "push_time")
private Date pushTime; private Date pushTime;
/** /**
* 推送数据json * 推送数据json
*/ */
@TableField(value = "push_data_json")
private String pushDataJson; private String pushDataJson;
/** /**
* 修改人 * 修改人
*/ */
@TableField(value = "update_user")
private String updateUser; private String updateUser;
/** /**
* 修改人id * 修改人id
*/ */
@TableField(value = "update_id")
private String updateId; private String updateId;
......
...@@ -179,7 +179,7 @@ public class CbCostMeasureServiceImpl extends ServiceImpl<CbCostMeasureMapper, C ...@@ -179,7 +179,7 @@ public class CbCostMeasureServiceImpl extends ServiceImpl<CbCostMeasureMapper, C
TreeNodeConfig treeNodeConfig = new TreeNodeConfig(); TreeNodeConfig treeNodeConfig = new TreeNodeConfig();
treeNodeConfig.setIdKey("id"); treeNodeConfig.setIdKey("id");
treeNodeConfig.setParentIdKey("parentId"); treeNodeConfig.setParentIdKey("parentId");
treeNodeConfig.setChildrenKey("childrens"); treeNodeConfig.setChildrenKey("children");
//构建树形 //构建树形
List<Tree<Long>> trees = TreeUtil.build(dataList, costMeasureActualBo.getId(), treeNodeConfig, ((object, treeNode) -> { List<Tree<Long>> trees = TreeUtil.build(dataList, costMeasureActualBo.getId(), treeNodeConfig, ((object, treeNode) -> {
treeNode.setId(object.getId());//id treeNode.setId(object.getId());//id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment