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
4b381c36
Commit
4b381c36
authored
Oct 20, 2020
by
qinhu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补提交
parent
744b734e
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
7 deletions
+1
-7
NormProductionController.java
.../cement/business/controller/NormProductionController.java
+0
-5
WorkloadStatisticsVo.java
...ise/sc/cement/business/model/vo/WorkloadStatisticsVo.java
+0
-1
NormProductionServiceImpl.java
...ment/business/service/impl/NormProductionServiceImpl.java
+1
-1
No files found.
cement-business/src/main/java/cn/wise/sc/cement/business/controller/NormProductionController.java
View file @
4b381c36
...
...
@@ -2,12 +2,10 @@ package cn.wise.sc.cement.business.controller;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.StrUtil
;
import
cn.wise.sc.cement.business.entity.NonStandardValue
;
import
cn.wise.sc.cement.business.entity.NormProduction
;
import
cn.wise.sc.cement.business.entity.NormProductionStatistics
;
import
cn.wise.sc.cement.business.model.BaseResponse
;
import
cn.wise.sc.cement.business.model.PageQuery
;
import
cn.wise.sc.cement.business.model.vo.NonStandardValueVo
;
import
cn.wise.sc.cement.business.model.vo.NormProductionVo
;
import
cn.wise.sc.cement.business.model.vo.ProductionVo
;
import
cn.wise.sc.cement.business.model.vo.WorkloadStatisticsVo
;
...
...
@@ -24,10 +22,7 @@ import org.springframework.web.bind.annotation.PutMapping;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.servlet.http.HttpServletResponse
;
import
java.time.LocalDate
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.HashSet
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/WorkloadStatisticsVo.java
View file @
4b381c36
...
...
@@ -3,7 +3,6 @@ package cn.wise.sc.cement.business.model.vo;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Map
;
...
...
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NormProductionServiceImpl.java
View file @
4b381c36
...
...
@@ -629,7 +629,7 @@ public class NormProductionServiceImpl extends ServiceImpl<NormProductionMapper,
workloadStatisticsVo
.
setType
(
0
);
workloadStatisticsVo
.
setMap
(
map1
);
WorkloadStatisticsVo
workloadStatisticsVo2
=
new
WorkloadStatisticsVo
();
workloadStatisticsVo
.
setType
(
1
);
workloadStatisticsVo
2
.
setType
(
1
);
workloadStatisticsVo2
.
setMap
(
map2
);
List
<
WorkloadStatisticsVo
>
rts
=
new
ArrayList
<>(
2
);
rts
.
add
(
workloadStatisticsVo
);
...
...
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