Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
4c2aea9f
Commit
4c2aea9f
authored
Nov 28, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
总业绩统计
parent
6efaf397
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
TotalPerformanceBiz.java
...java/com/xxfc/platform/order/biz/TotalPerformanceBiz.java
+0
-4
BaseOrderMapper.xml
...rder-server/src/main/resources/mapper/BaseOrderMapper.xml
+1
-1
OrderAccountMapper.xml
...r-server/src/main/resources/mapper/OrderAccountMapper.xml
+2
-2
No files found.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/TotalPerformanceBiz.java
View file @
4c2aea9f
...
...
@@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil;
import
com.github.pagehelper.PageInfo
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
import
com.google.common.collect.Lists
;
import
com.jayway.jsonpath.internal.function.numeric.Sum
;
import
com.xxfc.platform.order.contant.enumerate.AccountTypeEnum
;
import
com.xxfc.platform.order.pojo.Achievement
;
import
com.xxfc.platform.order.pojo.QueryCriteria
;
...
...
@@ -15,9 +14,6 @@ import com.xxfc.platform.order.pojo.account.OrderAccountDetail;
import
lombok.RequiredArgsConstructor
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.poi.hssf.usermodel.HSSFDataFormat
;
import
org.apache.poi.hssf.usermodel.HSSFRow
;
import
org.apache.poi.hssf.usermodel.HSSFSheet
;
import
org.apache.poi.hssf.usermodel.HSSFWorkbook
;
import
org.apache.poi.hssf.util.CellReference
;
import
org.apache.poi.ss.usermodel.*
;
import
org.apache.poi.xssf.usermodel.*
;
...
...
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @
4c2aea9f
...
...
@@ -415,7 +415,7 @@
<select
id=
"selectTotalStatistical"
parameterType=
"com.xxfc.platform.order.pojo.QueryCriteria"
resultType=
"com.xxfc.platform.order.pojo.Achievement"
>
select
crt_time,no,type,order_amount,real_amount,realname,username,parentRealname,positionName,parentUsername,companyName,pay_way,company_id
crt_time,no,type,order_amount,real_amount,realname,username,parentRealname,positionName,parentUsername,companyName,pay_way,company_id
,(order_amount-real_amount) as favorablePrice
from order_user_position_company
<where>
<if
test=
"startDate != null"
>
...
...
xx-order/xx-order-server/src/main/resources/mapper/OrderAccountMapper.xml
View file @
4c2aea9f
...
...
@@ -64,12 +64,12 @@
</if>
<if
test=
"queryCriteria.jurisdiction != null and queryCriteria.jurisdiction.size() !=0 "
>
and oupc.company_id in
<foreach
collection=
"jurisdiction"
index=
"index"
item=
"companyId"
open=
"("
separator=
","
close=
")"
>
<foreach
collection=
"
queryCriteria.
jurisdiction"
index=
"index"
item=
"companyId"
open=
"("
separator=
","
close=
")"
>
#{companyId}
</foreach>
</if>
<if
test=
"queryCriteria.orderType != null"
>
and oupc.type = #{orderType}
and oupc.type = #{
queryCriteria.
orderType}
</if>
order by oa.crt_time DESC
</select>
...
...
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