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
1fbbaddf
Commit
1fbbaddf
authored
Jul 01, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-合同自动化代码提交
parent
2f92aa44
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
12 deletions
+13
-12
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+11
-10
IcbcTransactionFlowQueryServiceImpl.java
...ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
+2
-2
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
1fbbaddf
...
@@ -752,13 +752,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -752,13 +752,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//合同年限推算
//合同年限推算
if
(
Common
.
isEmpty
(
employeeContractPreVo
.
getContractStart
())
if
(
Common
.
isEmpty
(
employeeContractPreVo
.
getContractStart
())
&&
Common
.
isEmpty
(
employeeContractPreVo
.
getContractEnd
())
&&
Common
.
isEmpty
(
employeeContractPreVo
.
getContractEnd
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractDurationYear
())
&&
(
Common
.
isNotNull
(
employeeContractPreVo
.
getContractDurationYear
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractDurationMonth
(
))
||
Common
.
isNotNull
(
employeeContractPreVo
.
getContractDurationMonth
()
))
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractEndType
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getContractEndType
())
&&
CommonConstants
.
ZERO_STRING
.
equals
(
employeeContractPreVo
.
getContractEndType
()))
{
&&
CommonConstants
.
ZERO_STRING
.
equals
(
employeeContractPreVo
.
getContractEndType
()))
{
employeeContractPreVo
.
setContractStart
(
employeeContractPreVo
.
getJoinLeaveDate
());
employeeContractPreVo
.
setContractStart
(
employeeContractPreVo
.
getJoinLeaveDate
());
vo
.
setMonthAfter
(
Integer
.
parseInt
(
employeeContractPreVo
.
getContractDurationMonth
()));
vo
.
setMonthAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
employeeContractPreVo
.
getContractDurationMonth
())
?
"0"
:
employeeContractPreVo
.
getContractDurationMonth
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
employeeContractPreVo
.
getContractDurationYear
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
employeeContractPreVo
.
getContractDurationYear
())
?
"0"
:
employeeContractPreVo
.
getContractDurationYear
()));
vo
.
setRegistDate
(
employeeContractPreVo
.
getContractStart
());
vo
.
setRegistDate
(
employeeContractPreVo
.
getContractStart
());
employeeContractPreVo
.
setContractEnd
(
this
.
addYearsMonths
(
vo
));
employeeContractPreVo
.
setContractEnd
(
this
.
addYearsMonths
(
vo
));
}
}
...
@@ -780,11 +780,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -780,11 +780,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
}
//派遣开始日期、派遣结束日期
//派遣开始日期、派遣结束日期
if
(
Common
.
isEmpty
(
employeeContractPreVo
.
getDispatchPeriodStart
())
if
(
Common
.
isEmpty
(
employeeContractPreVo
.
getDispatchPeriodStart
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodYear
())
&&
(
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodYear
())
&&
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodMonth
(
)))
{
||
Common
.
isNotNull
(
employeeContractPreVo
.
getDispatchPeriodMonth
()
)))
{
employeeContractPreVo
.
setDispatchPeriodStart
(
employeeContractPreVo
.
getJoinLeaveDate
());
employeeContractPreVo
.
setDispatchPeriodStart
(
employeeContractPreVo
.
getJoinLeaveDate
());
vo
.
setMonthAfter
(
Integer
.
parseInt
(
employeeContractPreVo
.
getDispatchPeriodMonth
()));
vo
.
setMonthAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
employeeContractPreVo
.
getDispatchPeriodMonth
())
?
"0"
:
employeeContractPreVo
.
getDispatchPeriodMonth
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
employeeContractPreVo
.
getDispatchPeriodYear
()));
vo
.
setYearAfter
(
Integer
.
parseInt
(
Common
.
isEmpty
(
employeeContractPreVo
.
getDispatchPeriodYear
())
?
"0"
:
employeeContractPreVo
.
getDispatchPeriodYear
()));
vo
.
setRegistDate
(
employeeContractPreVo
.
getDispatchPeriodStart
());
vo
.
setRegistDate
(
employeeContractPreVo
.
getDispatchPeriodStart
());
employeeContractPreVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
employeeContractPreVo
.
setDispatchPeriodEnd
(
this
.
addYearsMonths
(
vo
));
}
}
...
@@ -961,8 +961,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -961,8 +961,9 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
initInsruancePreInfo
(
registration
,
insurancePreVo
,
user
,
domainR
.
getData
());
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
insuranceDaprUtil
.
saveInsurancePreInfo
(
preVo
);
}
}
TEmployeeContractPreVo
employeeContractPreVo
=
preVo
.
getEmployeeContractPreVos
();
TEmployeeContractPreVo
employeeContractPreVo
=
new
TEmployeeContractPreVo
();
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
Common
.
isNotNull
(
employeeContractPreVo
))
{
if
(
preVo
.
getServerItem
().
contains
(
"合同"
)
&&
Common
.
isNotNull
(
preVo
.
getEmployeeContractPreVos
()))
{
BeanUtils
.
copyProperties
(
preVo
.
getEmployeeContractPreVos
(),
employeeContractPreVo
);
//生成合同待购买数据
//生成合同待购买数据
initContractPreInfo
(
registration
,
employeeContractPreVo
,
user
,
domainR
.
getData
());
initContractPreInfo
(
registration
,
employeeContractPreVo
,
user
,
domainR
.
getData
());
}
}
...
...
yifu-ekp/yifu-ekp-biz/src/main/java/com/yifu/cloud/plus/v1/ekp/service/impl/IcbcTransactionFlowQueryServiceImpl.java
View file @
1fbbaddf
...
@@ -133,7 +133,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -133,7 +133,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
public
R
getIcbcTransactionFlowYesterdayInner
()
throws
IcbcApiException
{
public
R
getIcbcTransactionFlowYesterdayInner
()
throws
IcbcApiException
{
log
.
info
(
"开始推昨日新增网银到账明细条数"
);
log
.
info
(
"开始推昨日新增网银到账明细条数"
);
String
tranDate
=
DateUtil
.
addDay
(-
7
).
replace
(
"-"
,
""
);
String
tranDate
=
DateUtil
.
addDay
(-
3
).
replace
(
"-"
,
""
);
String
beginDate
=
tranDate
;
String
beginDate
=
tranDate
;
String
endDate
=
DateUtil
.
getThisDay
();
String
endDate
=
DateUtil
.
getThisDay
();
...
@@ -171,7 +171,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
...
@@ -171,7 +171,7 @@ public class IcbcTransactionFlowQueryServiceImpl extends ServiceImpl<EkpSocialIn
if
(
"0"
.
equals
(
flag
))
{
if
(
"0"
.
equals
(
flag
))
{
serioList
=
baseMapper
.
getAllserioNo
();
serioList
=
baseMapper
.
getAllserioNo
();
}
else
{
}
else
{
//ekp1.9.12 获取近
七
天的到账明细的交易流水号
//ekp1.9.12 获取近
三
天的到账明细的交易流水号
serioList
=
baseMapper
.
getAllserioNoLsatSevenDays
();
serioList
=
baseMapper
.
getAllserioNoLsatSevenDays
();
}
}
// 整理各个账户下的流水:账号为key,账户下流水号列表作为value
// 整理各个账户下的流水:账号为key,账户下流水号列表作为value
...
...
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