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
a5fee1c2
Commit
a5fee1c2
authored
Oct 30, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
fd2e493d
0704d902
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
8 deletions
+16
-8
TEmployeeContractInfoServiceImpl.java
...chives/service/impl/TEmployeeContractInfoServiceImpl.java
+2
-7
TEmployeeContractPreMapper.xml
.../src/main/resources/mapper/TEmployeeContractPreMapper.xml
+1
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+6
-0
TDispatchInfoPreSearchVo.java
...loud/plus/v1/yifu/social/vo/TDispatchInfoPreSearchVo.java
+3
-0
TDispatchInfoPreMapper.xml
...-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
+4
-0
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @
a5fee1c2
...
...
@@ -1455,13 +1455,8 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
}
else
{
insert
.
setEmpId
(
project
.
getEmpId
());
insert
.
setSettleDomain
(
project
.
getDeptId
());
//电子签更新为签署中
if
(
Common
.
isNotNull
(
insert
.
getSignType
())
&&
"0"
.
equals
(
insert
.
getSignType
()))
{
insert
.
setAuditStatus
(
CommonConstants
.
FOUR_INT
);
}
else
{
// 批量直接待审核
insert
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
}
// 批量直接待审核
insert
.
setAuditStatus
(
CommonConstants
.
ONE_INT
);
if
(
Common
.
isEmpty
(
insert
.
getContractTerm
())
&&
Common
.
isNotNull
(
insert
.
getContractStart
())
&&
Common
.
isNotNull
(
insert
.
getContractEnd
()))
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractPreMapper.xml
View file @
a5fee1c2
...
...
@@ -383,7 +383,7 @@
null changeContractAndEmployee,
if(a.TRY_PERIOD = '' or a.TRY_PERIOD is null,'无',a.TRY_PERIOD) as tryPeriod,
a.id preId,
if(#{type} = '1',concat('
手动签署-',a.customer_username),concat('自动化签署
-',a.customer_username)) preName
if(#{type} = '1',concat('
自动化手动-',a.customer_username),concat('自动化自动
-',a.customer_username)) preName
FROM t_employee_contract_pre a,(select @i:=0) as itable
<where>
1=1
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
a5fee1c2
...
...
@@ -1739,6 +1739,12 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
preVo
.
setDispatchItem
(
"养老、医疗、生育、失业、工伤、大病"
);
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
preVo
.
getIsCreateDate
())
&&
Common
.
isEmpty
(
preVo
.
getSocialStartDate
()))
{
preVo
.
setBigailmentStart
(
registration
.
getJoinLeaveDate
());
preVo
.
setPensionStart
(
registration
.
getJoinLeaveDate
());
preVo
.
setMedicalStart
(
registration
.
getJoinLeaveDate
());
preVo
.
setBirthStart
(
registration
.
getJoinLeaveDate
());
preVo
.
setWorkInjuryStart
(
registration
.
getJoinLeaveDate
());
preVo
.
setUnemployStart
(
registration
.
getJoinLeaveDate
());
preVo
.
setSocialStartDate
(
registration
.
getJoinLeaveDate
());
}
//如果自动触发派增为是,计算派单发起时间和派单确认时间
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoPreSearchVo.java
View file @
a5fee1c2
...
...
@@ -60,4 +60,7 @@ public class TDispatchInfoPreSearchVo extends TDispatchInfoPre {
@Schema
(
description
=
"自动标识 1不查询确认时间为空的数据"
)
private
String
autoSendFlag
;
@Schema
(
description
=
"自动标识 1查询派单时间为空或者当天之前的数据"
)
private
String
timeSendFlag
;
}
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoPreMapper.xml
View file @
a5fee1c2
...
...
@@ -240,6 +240,10 @@
<if
test=
"tDispatchInfoPre.autoSendFlag != null and tDispatchInfoPre.autoSendFlag.trim() != ''"
>
AND a.EXPECTED_CONFIRM_TIME is not null and DATE_FORMAT(a.EXPECTED_CONFIRM_TIME,'%Y-%m-%d')
<![CDATA[ <= ]]>
CURDATE()
</if>
<if
test=
"tDispatchInfoPre.timeSendFlag != null and tDispatchInfoPre.timeSendFlag.trim() != ''"
>
AND (a.EXPECTED_COLLECTION_TIME is null or
DATE_FORMAT(a.EXPECTED_COLLECTION_TIME,'%Y-%m-%d')
<![CDATA[ <= ]]>
CURDATE() )
</if>
<if
test=
"tDispatchInfoPre.authSql != null and tDispatchInfoPre.authSql.trim() != ''"
>
${tDispatchInfoPre.authSql}
</if>
...
...
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