Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
tianjin-cement
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
竹天卫
tianjin-cement
Commits
cd8e18c0
Commit
cd8e18c0
authored
Oct 18, 2020
by
mengbali153
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
标准产值
parent
fc0eef77
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
26 deletions
+35
-26
NormProductionController.java
.../cement/business/controller/NormProductionController.java
+1
-0
NormProduction.java
...ava/cn/wise/sc/cement/business/entity/NormProduction.java
+0
-1
ProductionVo.java
...ava/cn/wise/sc/cement/business/model/vo/ProductionVo.java
+2
-0
NormProductionServiceImpl.java
...ment/business/service/impl/NormProductionServiceImpl.java
+32
-25
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NormProductionController.java
View file @
cd8e18c0
...
...
@@ -164,6 +164,7 @@ public class NormProductionController {
finalNormProduction
.
setPosition
(
productionVo
.
getPosition
());
finalNormProduction
.
setTime
(
productionVo
.
getTime
());
finalNormProduction
.
setGroupId
(
productionVo
.
getGroupId
());
finalNormProduction
.
setGroupName
(
productionVo
.
getGroupName
());
Double
newFinalValue
=
productionVo
.
getProductionTotalValue
()+
finalNormProduction
.
getProductionTotalValue
();
finalNormProduction
.
setProductionTotalValue
(
newFinalValue
);
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/entity/NormProduction.java
View file @
cd8e18c0
...
...
@@ -120,7 +120,6 @@ public class NormProduction implements Serializable {
private
BigDecimal
workTimeCoefficient
;
private
Integer
type
;
private
String
groupTeamName
;
private
Integer
groupId
;
}
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/ProductionVo.java
View file @
cd8e18c0
...
...
@@ -38,4 +38,6 @@ public class ProductionVo implements Serializable {
private
Double
productionTotalValue
=
0
D
;
@ApiModelProperty
(
"部门id"
)
private
Integer
groupId
;
@ApiModelProperty
(
"部门名"
)
private
String
groupName
;
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NormProductionServiceImpl.java
View file @
cd8e18c0
This diff is collapsed.
Click to expand it.
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