Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
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
8bc1216d
You need to sign in or sign up before continuing.
Commit
8bc1216d
authored
Nov 11, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
888a8f34
dd799215
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
157 additions
and
35 deletions
+157
-35
TEmpChangeInfoServiceImpl.java
...yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
+3
-6
CommonConstants.java
...ud/plus/v1/yifu/common/core/constant/CommonConstants.java
+2
-0
EkpPushFundParam.java
.../com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushFundParam.java
+5
-0
EkpPushSocialParam.java
...om/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
+4
-0
ekpIncomeConfig.properties
...-common-ekp/src/main/resources/ekpIncomeConfig.properties
+2
-2
ekpInsuranceConfig.properties
...mmon-ekp/src/main/resources/ekpInsuranceConfig.properties
+2
-2
ekpOrderConfig.properties
...u-common-ekp/src/main/resources/ekpOrderConfig.properties
+4
-4
ekpSalaryConfig.properties
...-common-ekp/src/main/resources/ekpSalaryConfig.properties
+2
-2
TPaymentInfo.java
...m/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
+6
-0
SocialConstants.java
.../cloud/plus/v1/yifu/social/constants/SocialConstants.java
+1
-0
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+126
-19
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java
View file @
8bc1216d
...
...
@@ -220,12 +220,9 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
updateTEmployeePro
.
setBusinessPrimaryType
(
tSettleDomain
.
getBusinessPrimaryType
());
updateTEmployeePro
.
setBusinessSecondType
(
tSettleDomain
.
getBusinessSecondType
());
updateTEmployeePro
.
setBusinessThirdType
(
tSettleDomain
.
getBusinessThirdType
());
TCustomerInfo
tCustomerInfo
=
tCustomerInfoService
.
getById
(
tSettleDomain
.
getCustomerId
());
if
(
Common
.
isNotNull
(
tCustomerInfo
))
{
updateTEmployeePro
.
setUnitId
(
tCustomerInfo
.
getId
());
updateTEmployeePro
.
setUnitNo
(
tCustomerInfo
.
getCustomerCode
());
updateTEmployeePro
.
setUnitName
(
tCustomerInfo
.
getCustomerName
());
}
updateTEmployeePro
.
setUnitId
(
tSettleDomain
.
getCustomerId
());
updateTEmployeePro
.
setUnitNo
(
tSettleDomain
.
getCustomerNo
());
updateTEmployeePro
.
setUnitName
(
tSettleDomain
.
getCustomerName
());
updateTEmployeePro
.
setChangeStartMonth
(
excel
.
getChangeStartMonth
());
updateTEmployeePro
.
setUnsettleDeal
(
CommonConstants
.
IS_NO_CHANGE
);
updateList
.
add
(
updateTEmployeePro
);
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/constant/CommonConstants.java
View file @
8bc1216d
...
...
@@ -449,6 +449,8 @@ public interface CommonConstants {
public
static
final
String
PAYMENT_SOCIAL_WAIT_EXPORT
=
"payment_social_wait_export"
;
public
static
final
String
PAYMENT_SOCIAL_PUSH
=
"payment_social_push"
;
//百分之一 1/100
public
static
final
BigDecimal
ONE_OF_PERCENT
=
new
BigDecimal
(
"0.01"
);
...
...
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushFundParam.java
View file @
8bc1216d
...
...
@@ -148,4 +148,9 @@ public class EkpPushFundParam implements Serializable {
* 薪酬申请编号
**/
private
String
fd_3b3cabde83d1d0
;
/**
* 公积金创建人姓名
**/
private
String
fd_3b43922217c6f8
;
}
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/vo/EkpPushSocialParam.java
View file @
8bc1216d
...
...
@@ -252,5 +252,9 @@ public class EkpPushSocialParam implements Serializable {
* 薪酬申请编号
**/
private
String
fd_3b3cab77923f44
;
/**
* 社保创建人姓名
**/
private
String
fd_3b438e33f37378
;
}
\ No newline at end of file
yifu-common/yifu-common-ekp/src/main/resources/ekpIncomeConfig.properties
View file @
8bc1216d
#
income.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
income.url
=
http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
income.url
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
#
income.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
income.fdModelIdManage
=
181d76db26e419a88dba97b0c406689e
income.fdFlowIdManage
=
182d3b6e522b2690119e70d4ff082136
income.fdModelIdRisk
=
181d76db26e4112e14b9bb4274d06ba1
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpInsuranceConfig.properties
View file @
8bc1216d
#
insurance.insuranceUrl=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
insurance.insuranceUrl
=
http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
insurance.insuranceUrl
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
#
insurance.insuranceUrl=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
insurance.insuranceFdModelId
=
181d73279372e5a55438a47d7436ab7e
insurance.insuranceFdFlowId
=
18267f206233f29cbd3c5ee425c9408a
insurance.insuranceDocStatus
=
20
...
...
yifu-common/yifu-common-ekp/src/main/resources/ekpOrderConfig.properties
View file @
8bc1216d
#
ekporder.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
ekporder.url
=
http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
ekporder.url
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
#
ekporder.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
ekporder.orderFdModelId
=
182f1b7ffe2e96f975564e44e559847d
ekporder.orderFdFlowId
=
182f1c098ce991ca96bc927408792beb
ekporder.replyFdModelId
=
182f1bb35bb2156fb9a02904bc88dd8a
...
...
@@ -7,7 +7,7 @@ ekporder.replyFdFlowId=182f1c3d6f5724e335b88d544be8c993
ekporder.replyAttachKey
=
fd_3ac904c9342fe2
ekporder.docStatus
=
20
ekporder.LoginName
=
admin
ekporder.orderDocSubject
=
\u7528\u
4
e8e
\u9879\u
76ee
\u
8ba2
\u5355\u
66f4
\u
65b0
\u
63a5
\u
53e
3
ekporder.replyDocSubject
=
\u7528\u
4
e8e
\u
8ba2
\u5355\u
56de
\u
590d
\u
63a5
\u
53e
3
ekporder.orderDocSubject
=
\u7528\u
4
E8E
\u9879\u
76EE
\u
8BA2
\u5355\u
66F4
\u
65B0
\u
63A5
\u
53E
3
ekporder.replyDocSubject
=
\u7528\u
4
E8E
\u
8BA2
\u5355\u
56DE
\u
590D
\u
63A5
\u
53E
3
yifu-common/yifu-common-ekp/src/main/resources/ekpSalaryConfig.properties
View file @
8bc1216d
#
ekp.url=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
ekp.url
=
http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
ekp.url
=
http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
#
ekp.url=http://36.7.147.19:28080/api/sys-modeling/appModelRestService/addModel
ekp.fdModelId
=
181d7633ff8bc797276d0d3a54e80ad6
ekp.fdFlowId
=
182b40249c1bc940d7226b941c7a4183
ekp.docStatus
=
20
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPaymentInfo.java
View file @
8bc1216d
...
...
@@ -668,6 +668,12 @@ public class TPaymentInfo extends BaseEntity {
@TableField
(
exist
=
false
)
@ExcelIgnore
private
String
ybSameFlg
;
/**
* 补缴是否导入重复标识
*/
@TableField
(
exist
=
false
)
@ExcelIgnore
private
String
bjSameFlg
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/constants/SocialConstants.java
View file @
8bc1216d
...
...
@@ -21,6 +21,7 @@ public class SocialConstants {
public
static
final
String
BIR
=
"生育"
;
public
static
final
String
GS
=
"工伤"
;
public
static
final
String
YB
=
"医保"
;
public
static
final
String
BJ
=
"补缴"
;
public
static
final
String
YEAR_1970
=
"1970-02"
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
8bc1216d
This diff is collapsed.
Click to expand it.
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