Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-backend
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
AutogeneralShanghai
yd-backend
Commits
566053b8
Commit
566053b8
authored
Aug 19, 2021
by
jianan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【AGMS】-【线上来佣比对】,增加筛选条件,
1.来佣项目类型: 首年佣金, 续年佣金
parent
bec68df2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/QueryComeCommissionListRequestVO.java
+1
-0
yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml
+10
-2
No files found.
yd-api/src/main/java/com/yd/api/commission/vo/lifecommission/QueryComeCommissionListRequestVO.java
View file @
566053b8
...
...
@@ -11,5 +11,6 @@ public class QueryComeCommissionListRequestVO {
private
Long
insurerId
;
private
Long
practitionerTypeId
;
private
String
commissionCheckStatus
;
private
String
commissionCategory
;
private
PageInfo
<
ComeCommissionVO
>
page
;
}
yd-api/src/main/resources/mapper/lifecommission/LifeCommissionMapper.xml
View file @
566053b8
...
...
@@ -33,6 +33,7 @@
commission_status commissionCheckStatus,
amount commissionAmount,
rate commissionRate,
commission_category,
commission_period
from
(SELECT id, policy_no, order_price, product_id, commission_rate, commission_amount, commission_check_status,
...
...
@@ -45,7 +46,7 @@
) o
LEFT JOIN
(SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, commission_check_id,
commission_period, rate, order_id
commission_period, rate, order_id
, commission_category
from ag_po_order_commission t
) orderCommission
ON o.id = orderCommission.order_id
...
...
@@ -101,6 +102,9 @@
<if
test=
"commissionCheckStatus != null"
>
and o.commissionCheckStatus = #{commissionCheckStatus}
</if>
<if
test=
"commissionCategory != null"
>
and o.commission_category = #{commissionCategory}
</if>
<choose>
<when
test=
"historyDate != null "
>
and c.check_yearmonth = #{historyDate}
...
...
@@ -164,6 +168,7 @@
commission_status commissionCheckStatus,
amount commissionAmount,
rate commissionRate,
commission_category,
commission_period
from
(SELECT id, policy_no, order_price, commission_rate, commission_amount, commission_check_status, product_id,
...
...
@@ -176,7 +181,7 @@
) o
LEFT JOIN
(SELECT policy_no policyNo, commission_no, commission_year, amount, commission_status, commission_time, rate, commission_check_id,
commission_period, order_id
commission_period, order_id
, commission_category
from ag_po_order_commission t
) orderCommission
ON o.id = orderCommission.order_id
...
...
@@ -208,6 +213,9 @@
<if
test=
"commissionCheckStatus != null"
>
and o.commissionCheckStatus = #{commissionCheckStatus}
</if>
<if
test=
"commissionCategory != null"
>
and o.commission_category = #{commissionCategory}
</if>
<choose>
<when
test=
"historyDate != null "
>
and c.check_yearmonth = #{historyDate}
...
...
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