Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
cloud-fb
Overview
Overview
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
王衍超
cloud-fb
Commits
11131e25
Commit
11131e25
authored
Jul 01, 2021
by
高晓磊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询时间的格式调整一下
parent
0547449e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
DischargingController.java
.../com/xyst/dinas/production/web/DischargingController.java
+2
-1
ProductionPlanReportController.java
.../dinas/production/web/ProductionPlanReportController.java
+3
-2
No files found.
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/web/DischargingController.java
View file @
11131e25
...
@@ -7,6 +7,7 @@ import com.beecode.bcp.type.KObject;
...
@@ -7,6 +7,7 @@ import com.beecode.bcp.type.KObject;
import
com.beecode.bcp.type.json.JSONObjectUtils
;
import
com.beecode.bcp.type.json.JSONObjectUtils
;
import
com.beecode.inz.basis.team.pojo.ResponseObj
;
import
com.beecode.inz.basis.team.pojo.ResponseObj
;
import
com.beecode.inz.common.BaseConstants
;
import
com.beecode.inz.common.BaseConstants
;
import
com.beecode.inz.common.util.DateTimeUtils
;
import
com.xyst.dinas.production.constant.DischargingConstant
;
import
com.xyst.dinas.production.constant.DischargingConstant
;
import
com.xyst.dinas.production.service.DischargingService
;
import
com.xyst.dinas.production.service.DischargingService
;
import
org.slf4j.Logger
;
import
org.slf4j.Logger
;
...
@@ -210,7 +211,7 @@ public class DischargingController {
...
@@ -210,7 +211,7 @@ public class DischargingController {
@RequestParam
(
value
=
"isGroupByStation"
,
required
=
false
,
defaultValue
=
"false"
)
Boolean
isGroupByStation
,
@RequestParam
(
value
=
"isGroupByStation"
,
required
=
false
,
defaultValue
=
"false"
)
Boolean
isGroupByStation
,
@RequestParam
(
value
=
"showType"
,
required
=
false
,
defaultValue
=
"0"
)
Integer
showType
@RequestParam
(
value
=
"showType"
,
required
=
false
,
defaultValue
=
"0"
)
Integer
showType
){
){
return
ResponseObj
.
success
(
"查询成功"
,
dischargingService
.
getDischargingGroup
(
startDate
,
endDate
,
stationIds
,
ids
,
isGroupByArea
,
isGroupByRegionalCompany
,
isGroupByStation
,
showType
));
return
ResponseObj
.
success
(
"查询成功"
,
dischargingService
.
getDischargingGroup
(
DateTimeUtils
.
getStartDateTimeOfDay
(
startDate
),
DateTimeUtils
.
getEndDateTimeOfDay
(
endDate
)
,
stationIds
,
ids
,
isGroupByArea
,
isGroupByRegionalCompany
,
isGroupByStation
,
showType
));
}
}
...
...
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/web/ProductionPlanReportController.java
View file @
11131e25
...
@@ -7,6 +7,7 @@ import com.beecode.bcp.type.KObject;
...
@@ -7,6 +7,7 @@ import com.beecode.bcp.type.KObject;
import
com.beecode.bcp.type.json.JSONObjectUtils
;
import
com.beecode.bcp.type.json.JSONObjectUtils
;
import
com.beecode.inz.basis.team.pojo.ResponseObj
;
import
com.beecode.inz.basis.team.pojo.ResponseObj
;
import
com.beecode.inz.common.BaseConstants
;
import
com.beecode.inz.common.BaseConstants
;
import
com.beecode.inz.common.util.DateTimeUtils
;
import
com.beecode.util.DateUtil
;
import
com.beecode.util.DateUtil
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.fasterxml.jackson.databind.JsonNode
;
import
com.xyst.dinas.production.constant.ProductionPlanReportConstant
;
import
com.xyst.dinas.production.constant.ProductionPlanReportConstant
;
...
@@ -210,7 +211,7 @@ public class ProductionPlanReportController {
...
@@ -210,7 +211,7 @@ public class ProductionPlanReportController {
@RequestParam
(
value
=
"isGroupByStation"
,
required
=
false
,
defaultValue
=
"false"
)
Boolean
isGroupByStation
,
@RequestParam
(
value
=
"isGroupByStation"
,
required
=
false
,
defaultValue
=
"false"
)
Boolean
isGroupByStation
,
@RequestParam
(
value
=
"showType"
,
required
=
false
,
defaultValue
=
"0"
)
Integer
showType
@RequestParam
(
value
=
"showType"
,
required
=
false
,
defaultValue
=
"0"
)
Integer
showType
)
{
)
{
return
ResponseObj
.
success
(
"查询成功"
,
productionPlanReportService
.
getProductionGroup
(
startDate
,
endDate
,
ids
,
stationIds
,
isGroupByProductionLine
,
isGroupByRegionalCompany
,
isGroupByStation
,
showType
));
return
ResponseObj
.
success
(
"查询成功"
,
productionPlanReportService
.
getProductionGroup
(
DateTimeUtils
.
getStartDateTimeOfDay
(
startDate
),
DateTimeUtils
.
getEndDateTimeOfDay
(
endDate
)
,
ids
,
stationIds
,
isGroupByProductionLine
,
isGroupByRegionalCompany
,
isGroupByStation
,
showType
));
}
}
...
@@ -224,7 +225,7 @@ public class ProductionPlanReportController {
...
@@ -224,7 +225,7 @@ public class ProductionPlanReportController {
@RequestParam
(
value
=
"ids"
,
required
=
false
)
List
<
UUID
>
ids
,
@RequestParam
(
value
=
"ids"
,
required
=
false
)
List
<
UUID
>
ids
,
@RequestParam
(
value
=
"stationIds"
,
required
=
false
)
List
<
UUID
>
stationIds
@RequestParam
(
value
=
"stationIds"
,
required
=
false
)
List
<
UUID
>
stationIds
){
){
return
ResponseObj
.
success
(
"查询成功"
,
productionPlanReportService
.
getProductionDinasTypeGroup
(
stationIds
,
ids
,
startDate
,
endDate
));
return
ResponseObj
.
success
(
"查询成功"
,
productionPlanReportService
.
getProductionDinasTypeGroup
(
stationIds
,
ids
,
DateTimeUtils
.
getStartDateTimeOfDay
(
startDate
),
DateTimeUtils
.
getEndDateTimeOfDay
(
endDate
)
));
}
}
...
...
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