Commit 9be99c70 authored by hongguangwu's avatar hongguangwu

EKP1.2-工资推送

parent 8f84461c
...@@ -255,7 +255,7 @@ public class EkpSalaryParam implements Serializable { ...@@ -255,7 +255,7 @@ public class EkpSalaryParam implements Serializable {
**/ **/
private String fd_3af9d49d165e90; private String fd_3af9d49d165e90;
/** /**
* 税务主体 * 税务主体-封面抬头
**/ **/
private String fd_3afab1895feea2; private String fd_3afab1895feea2;
/** /**
...@@ -275,5 +275,9 @@ public class EkpSalaryParam implements Serializable { ...@@ -275,5 +275,9 @@ public class EkpSalaryParam implements Serializable {
* 薪酬申请编号 * 薪酬申请编号
**/ **/
private String fd_3b3bef19b61c38; private String fd_3b3bef19b61c38;
/**
* 发放方式:银行、现金
**/
private String fd_3bbbfdd1fc2950;
} }
...@@ -208,6 +208,7 @@ ...@@ -208,6 +208,7 @@
<result property="fundSum" column="fund_sum"/> <result property="fundSum" column="fund_sum"/>
<result property="fd_3b178f0ded2114" column="fd_3b178f0ded2114"/> <result property="fd_3b178f0ded2114" column="fd_3b178f0ded2114"/>
<result property="fd_3b3bef19b61c38" column="fd_3b3bef19b61c38"/> <result property="fd_3b3bef19b61c38" column="fd_3b3bef19b61c38"/>
<result property="fd_3bbbfdd1fc2950" column="fd_3bbbfdd1fc2950"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
a.ID, a.ID,
...@@ -680,6 +681,7 @@ ...@@ -680,6 +681,7 @@
,concat(left(ifnull(a.DEDU_PROVIDENT_MONTH,'1970'),4),'-',right(ifnull(a.DEDU_PROVIDENT_MONTH,'02'),2)) DEDU_PROVIDENT_MONTH ,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.BPO_FLAG,'') fd_3b178f0ded2114
,ifnull(s.APPLY_NO,'') fd_3b3bef19b61c38 ,ifnull(s.APPLY_NO,'') fd_3b3bef19b61c38
,if(a.SALARY_STYLE='0','现金','银行') fd_3bbbfdd1fc2950
from t_salary_account a from t_salary_account a
LEFT JOIN t_salary_standard s on a.SALARY_FORM_ID=s.ID 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' left join t_salary_account_item withholidingPersonSocial on withholidingPersonSocial.SALARY_ACCOUNT_ID = a.id and withholidingPersonSocial.JAVA_FIED_NAME='withholidingPersonSocial'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment