Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
fangxinjiang
yifu-mvp
Commits
9be99c70
Commit
9be99c70
authored
Apr 13, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
EKP1.2-工资推送
parent
8f84461c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
EkpSalaryParam.java
...va/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java
+5
-1
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+2
-0
No files found.
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpSalaryParam.java
View file @
9be99c70
...
...
@@ -255,7 +255,7 @@ public class EkpSalaryParam implements Serializable {
**/
private
String
fd_3af9d49d165e90
;
/**
* 税务主体
* 税务主体
-封面抬头
**/
private
String
fd_3afab1895feea2
;
/**
...
...
@@ -275,5 +275,9 @@ public class EkpSalaryParam implements Serializable {
* 薪酬申请编号
**/
private
String
fd_3b3bef19b61c38
;
/**
* 发放方式:银行、现金
**/
private
String
fd_3bbbfdd1fc2950
;
}
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
9be99c70
...
...
@@ -208,6 +208,7 @@
<result
property=
"fundSum"
column=
"fund_sum"
/>
<result
property=
"fd_3b178f0ded2114"
column=
"fd_3b178f0ded2114"
/>
<result
property=
"fd_3b3bef19b61c38"
column=
"fd_3b3bef19b61c38"
/>
<result
property=
"fd_3bbbfdd1fc2950"
column=
"fd_3bbbfdd1fc2950"
/>
</resultMap>
<sql
id=
"Base_Column_List"
>
a.ID,
...
...
@@ -680,6 +681,7 @@
,concat(left(ifnull(a.DEDU_PROVIDENT_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_PROVIDENT_MONTH,'02'),2)) DEDU_PROVIDENT_MONTH
,ifnull(s.BPO_FLAG,'') fd_3b178f0ded2114
,ifnull(s.APPLY_NO,'') fd_3b3bef19b61c38
,if(a.SALARY_STYLE='0','现金','银行') fd_3bbbfdd1fc2950
from t_salary_account a
LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID
left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial'
...
...
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