记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
董敬伟
liquidnet-bus-v1
Commits
7ebc6c22
Commit
7ebc6c22
authored
Jun 29, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
统计增加 use_end
parent
2aae3e85
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
PerformanceOrderStatisticalVo.java
...t/service/kylin/dto/vo/PerformanceOrderStatisticalVo.java
+2
-0
KylinPerformancesMapper.xml
...iquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
+2
-0
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/PerformanceOrderStatisticalVo.java
View file @
7ebc6c22
...
@@ -26,6 +26,8 @@ public class PerformanceOrderStatisticalVo {
...
@@ -26,6 +26,8 @@ public class PerformanceOrderStatisticalVo {
private
Integer
type
;
private
Integer
type
;
@ApiModelProperty
(
value
=
"适用时间"
)
@ApiModelProperty
(
value
=
"适用时间"
)
private
String
useStart
;
private
String
useStart
;
@ApiModelProperty
(
value
=
"适用时间"
)
private
String
useEnd
;
@ApiModelProperty
(
value
=
"总库存"
)
@ApiModelProperty
(
value
=
"总库存"
)
private
BigDecimal
totalGeneral
=
BigDecimal
.
ZERO
;
private
BigDecimal
totalGeneral
=
BigDecimal
.
ZERO
;
@ApiModelProperty
(
value
=
"销售数量"
)
@ApiModelProperty
(
value
=
"销售数量"
)
...
...
liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml
View file @
7ebc6c22
...
@@ -85,6 +85,7 @@
...
@@ -85,6 +85,7 @@
<result
column=
"price"
property=
"price"
/>
<result
column=
"price"
property=
"price"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"type"
property=
"type"
/>
<result
column=
"use_start"
property=
"useStart"
/>
<result
column=
"use_start"
property=
"useStart"
/>
<result
column=
"use_end"
property=
"useEnd"
/>
<result
column=
"total_general"
property=
"totalGeneral"
/>
<result
column=
"total_general"
property=
"totalGeneral"
/>
<result
column=
"sale_general"
property=
"saleGeneral"
/>
<result
column=
"sale_general"
property=
"saleGeneral"
/>
<result
column=
"surplus_general"
property=
"surplusGeneral"
/>
<result
column=
"surplus_general"
property=
"surplusGeneral"
/>
...
@@ -394,6 +395,7 @@
...
@@ -394,6 +395,7 @@
kt.price,
kt.price,
kt.type,
kt.type,
kt.use_start,
kt.use_start,
kt.use_end,
IFNULL(kts.total_general , 0) AS 'total_general' ,
IFNULL(kts.total_general , 0) AS 'total_general' ,
IFNULL(ot.total_sale_general , 0) AS 'sale_general' ,
IFNULL(ot.total_sale_general , 0) AS 'sale_general' ,
IFNULL((kts.total_general - IFNULL(ot.total_sale_general,0) - IFNULL(otp.total_paying_number , 0)),0) AS 'surplus_general',
IFNULL((kts.total_general - IFNULL(ot.total_sale_general,0) - IFNULL(otp.total_paying_number , 0)),0) AS 'surplus_general',
...
...
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