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
4fdf842d
Commit
4fdf842d
authored
Apr 16, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
huych-入职登记商险待办提交
parent
095651f3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
5 deletions
+30
-5
EmployeeRegistrationPreServiceImpl.java
...ives/service/impl/EmployeeRegistrationPreServiceImpl.java
+3
-0
TEmployeePreLogServiceImpl.java
...ifu/archives/service/impl/TEmployeePreLogServiceImpl.java
+11
-2
TEmployeeProjectBelongDeptServiceImpl.java
...s/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
+1
-1
TCompleteMonitorMapper.xml
...-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
+1
-1
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+10
-0
THolidayInfoServiceImpl.java
.../v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
+4
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/EmployeeRegistrationPreServiceImpl.java
View file @
4fdf842d
...
...
@@ -886,6 +886,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
@Override
public
R
batchSendMessage
(
List
<
SendMessageUpdateVo
>
voList
,
String
type
)
{
if
(
Common
.
isNotNull
(
voList
)
&&
voList
.
size
()
>
200
)
{
return
R
.
failed
(
"短信批量发送单次最多两百条"
);
}
//获取短信待发放和信息待填写的数据
List
<
String
>
errorList
=
new
ArrayList
<>();
if
(
CommonConstants
.
ONE_STRING
.
equals
(
type
))
{
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeePreLogServiceImpl.java
View file @
4fdf842d
...
...
@@ -34,7 +34,6 @@ import com.yifu.cloud.plus.v1.yifu.archives.vo.TEmployeePreLogSearchVo;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.SecurityConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.equator.HrEquator
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.dapr.config.DaprInsurancesProperties
;
...
...
@@ -154,6 +153,16 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
IGNORE_FIELD
.
add
(
"isAddress"
);
}
private
static
final
List
<
String
>
PRE_IGNORE_FIELD
=
new
ArrayList
<>();
static
{
IGNORE_FIELD
.
add
(
"createTime"
);
IGNORE_FIELD
.
add
(
"deptId"
);
IGNORE_FIELD
.
add
(
"dataSource"
);
IGNORE_FIELD
.
add
(
"createBy"
);
IGNORE_FIELD
.
add
(
"createName"
);
IGNORE_FIELD
.
add
(
"updateBy"
);
}
@Override
public
void
saveModifyAndUpdateInsurance
(
String
empPreId
,
EmployeeRegistrationPre
oldInfo
,
EmployeeRegistrationPre
newInfo
,
YifuUser
user
,
Map
<
String
,
TEmployeeInsurancePre
>
oldMap
)
{
...
...
@@ -319,7 +328,7 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
if
(
Common
.
isNotNull
(
newInsurance
.
getId
()))
{
oldInsurance
=
oldMap
.
get
(
newInsurance
.
getId
());
if
(
oldInsurance
!=
null
)
{
differenceInsuranceKey
=
HrEquator
.
comparisonValue
(
oldInsurance
,
newInsurance
);
differenceInsuranceKey
=
HrEquator
.
comparisonValue
IgnoreField
(
oldInsurance
,
newInsurance
,
PRE_IGNORE_FIELD
);
}
if
(
Common
.
isNotNull
(
differenceInsuranceKey
)
||
oldInsurance
==
null
)
{
detailInsuranceLog
=
new
TEmployeePreLogDetail
();
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectBelongDeptServiceImpl.java
View file @
4fdf842d
...
...
@@ -203,7 +203,7 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee
dept
.
setId
(
vo
.
getProjectId
());
dept
.
setEmpDeptid
(
vo
.
getDepartId
().
toString
());
dept
.
setEmpDeptname
(
vo
.
getDepartName
());
this
.
save
(
dept
);
this
.
save
OrUpdate
(
dept
);
}
else
{
this
.
removeById
(
vo
.
getProjectId
());
}
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml
View file @
4fdf842d
...
...
@@ -186,7 +186,7 @@
inner join t_employee_info b on a.EMP_ID = b.id
inner join t_settle_domain c on a.DEPT_NO = c.DEPART_NO
<where>
a.delete_flag = '0' and a.IS_COMPLETE = '1'
a.delete_flag = '0' and a.IS_COMPLETE = '1'
and a.project_status = 0
<include
refid=
"employeeRegistrationPre_where"
/>
</where>
order by a.CREATE_TIME desc
...
...
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
4fdf842d
...
...
@@ -580,6 +580,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insurancePreVo
.
setProcessStatus
(
CommonConstants
.
ZERO_STRING
);
}
}
//特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期
if
(
insurancePreVo
.
getBuyType
()
==
1
&&
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
()).
compareTo
(
DateUtil
.
dateToString
(
insurancePreVo
.
getExpectedCollectionTime
()))>
0
)
{
insurancePreVo
.
setPolicyStart
(
registration
.
getJoinLeaveDate
());
insurancePreVo
.
setExpectedCollectionTime
(
registration
.
getJoinLeaveDate
());
}
}
if
(!
errorList
.
isEmpty
())
{
return
R
.
other
(
CommonConstants
.
TWO_INT
,
null
,
errorList
);
...
...
@@ -680,6 +685,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
insurancePreVo
.
setPolicyEffect
(
registration
.
getJoinLeaveDate
());
insurancePreVo
.
setPolicyStart
(
registration
.
getJoinLeaveDate
());
}
//特殊场景如果针对新增,如果入职日期大于等于预计生效时间 那预计生效和保单开始时间就取入职日期
if
(
insurancePreVo
.
getBuyType
()
==
1
&&
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
()).
compareTo
(
DateUtil
.
dateToString
(
insurancePreVo
.
getExpectedCollectionTime
()))>
0
)
{
insurancePreVo
.
setPolicyStart
(
registration
.
getJoinLeaveDate
());
insurancePreVo
.
setExpectedCollectionTime
(
registration
.
getJoinLeaveDate
());
}
//入职日期需要小于保单截止日期
if
((
DateUtil
.
dateToString
(
registration
.
getJoinLeaveDate
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
).
compareTo
(
DateUtil
.
dateToString
(
insurancePreVo
.
getPolicyEnd
(),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
))
>
0
)
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/THolidayInfoServiceImpl.java
View file @
4fdf842d
...
...
@@ -309,6 +309,9 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
for
(
THolidayInfo
h:
holidayInfos
){
holidayMap
.
put
(
h
.
getDate
(),
h
.
getDay
());
}
}
else
{
vo
.
setPriDisDate
(
vo
.
getPriDisDate
());
return
vo
;
}
//查找入职日期的前一个工作日
TEmployeeInsuranceWorkDayVo
newVo
=
new
TEmployeeInsuranceWorkDayVo
();
...
...
@@ -326,7 +329,7 @@ public class THolidayInfoServiceImpl extends ServiceImpl<THolidayInfoMapper, THo
if
(
givenLocalDate
.
isBefore
(
today
)
||
givenLocalDate
.
isEqual
(
today
))
{
// 如果日期前一个工作日日期小于等于今天
if
(
currentTime
.
isBefore
(
LocalTime
.
of
(
15
,
20
))
||
currentTime
.
equals
(
LocalTime
.
of
(
15
,
2
0
)))
{
if
(
currentTime
.
isBefore
(
LocalTime
.
of
(
15
,
30
))
||
currentTime
.
equals
(
LocalTime
.
of
(
15
,
3
0
)))
{
// 如果当前时间在15:20之前
vo
.
setPriDisDate
(
LocalDateTimeUtils
.
convertLDToDate
(
today
));
vo
.
setRegistDate
(
DateUtil
.
addDayByDate
(
vo
.
getPriDisDate
(),
CommonConstants
.
ONE_INT
));
...
...
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