Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
fad31180
Commit
fad31180
authored
Mar 05, 2024
by
tanyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据结构优化
parent
afabbaf0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
CbCostMeasureActualSaveBo.java
...va/com/dsk/cscec/domain/bo/CbCostMeasureActualSaveBo.java
+8
-10
CbCostMeasureServiceImpl.java
.../com/dsk/cscec/service/impl/CbCostMeasureServiceImpl.java
+1
-1
No files found.
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbCostMeasureActualSaveBo.java
View file @
fad31180
...
@@ -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
;
...
...
dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbCostMeasureServiceImpl.java
View file @
fad31180
...
@@ -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
(
"children
s
"
);
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment