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
173ef402
Commit
173ef402
authored
Dec 15, 2021
by
hongzhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
寿险经纪人发佣关账新增字段,insurerBranchId
parent
a1a21250
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
yd-api/src/main/java/com/yd/dal/entity/agms/fortune/WithdrawLabelInfo.java
+5
-0
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
+3
-2
No files found.
yd-api/src/main/java/com/yd/dal/entity/agms/fortune/WithdrawLabelInfo.java
View file @
173ef402
...
@@ -78,6 +78,11 @@ public class WithdrawLabelInfo {
...
@@ -78,6 +78,11 @@ public class WithdrawLabelInfo {
*/
*/
private
BigDecimal
afterTaxAmount
;
private
BigDecimal
afterTaxAmount
;
/**
* 银盾分公司id
*/
private
Long
insurerBranchId
;
}
}
yd-api/src/main/resources/mapper/agms/AgmsFortuneMapper.xml
View file @
173ef402
...
@@ -249,7 +249,7 @@
...
@@ -249,7 +249,7 @@
<result
column=
"practitionerId"
jdbcType=
"BIGINT"
property=
"practitionerId"
/>
<result
column=
"practitionerId"
jdbcType=
"BIGINT"
property=
"practitionerId"
/>
<result
column=
"taxAmount"
jdbcType=
"DECIMAL"
property=
"taxAmount"
/>
<result
column=
"taxAmount"
jdbcType=
"DECIMAL"
property=
"taxAmount"
/>
<result
column=
"afterTaxAmount"
jdbcType=
"DECIMAL"
property=
"afterTaxAmount"
/>
<result
column=
"afterTaxAmount"
jdbcType=
"DECIMAL"
property=
"afterTaxAmount"
/>
<result
column=
"insurerBranchId"
jdbcType=
"BIGINT"
property=
"insurerBranchId"
/>
</resultMap>
</resultMap>
<select
id=
"transformForWithdrawLabel"
<select
id=
"transformForWithdrawLabel"
parameterType=
"com.yd.dal.entity.agms.fortune.WithdrawQueryInfo"
parameterType=
"com.yd.dal.entity.agms.fortune.WithdrawQueryInfo"
...
@@ -268,7 +268,8 @@
...
@@ -268,7 +268,8 @@
date_format(pay.pay_date, '%Y-%m-%d %H:%i:%s') payDate,
date_format(pay.pay_date, '%Y-%m-%d %H:%i:%s') payDate,
pra.ID practitionerId,
pra.ID practitionerId,
if(salary.taxout_amount is null,0,salary.taxout_amount) taxAmount,
if(salary.taxout_amount is null,0,salary.taxout_amount) taxAmount,
if(salary.net_amount is null,0,salary.net_amount) afterTaxAmount
if(salary.net_amount is null,0,salary.net_amount) afterTaxAmount,
ib.id insurerBranchId
from ag_acl_customer_fortune_pay pay
from ag_acl_customer_fortune_pay pay
inner join ag_acl_customer_fortune f on f.fortune_payed_id = pay.id
inner join ag_acl_customer_fortune f on f.fortune_payed_id = pay.id
<!-- inner JOIN ag_po_order o on o.id = f.order_id -->
<!-- inner JOIN ag_po_order o on o.id = f.order_id -->
...
...
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