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
c11fdbe5
Commit
c11fdbe5
authored
Jan 12, 2026
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.18' into MVP1.7.18
parents
cc759bea
9d3cd0fd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
12 deletions
+32
-12
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+12
-5
TDispatchInfoPreServiceImpl.java
...yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
+14
-5
THouseHoldLimitServiceImpl.java
.../yifu/social/service/impl/THouseHoldLimitServiceImpl.java
+6
-2
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
c11fdbe5
...
@@ -902,11 +902,18 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
...
@@ -902,11 +902,18 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
//当月办次月生效
//当月办次月生效
if
(
CommonConstants
.
ONE_STRING
.
equals
(
innerVo
.
getAddHandleRule
())){
if
(
CommonConstants
.
ONE_STRING
.
equals
(
innerVo
.
getAddHandleRule
())){
if
(
canBeHandle
){
if
(
canBeHandle
){
Date
today
=
new
Date
();
if
(
isBeforeThreshold
){
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
Date
today
=
new
Date
();
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo2
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
confirmTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
preVo2
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
confirmTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
else
{
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
tomorrow
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
preVo2
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
tomorrow
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
confirmTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
}
else
{
}
else
{
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
nextMonthFirstDay
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
nextMonthFirstDay
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoPreServiceImpl.java
View file @
c11fdbe5
...
@@ -1007,11 +1007,20 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
...
@@ -1007,11 +1007,20 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
//当月办次月生效
//当月办次月生效
if
(
CommonConstants
.
ONE_STRING
.
equals
(
innerVo
.
getAddHandleRule
())){
if
(
CommonConstants
.
ONE_STRING
.
equals
(
innerVo
.
getAddHandleRule
())){
if
(
canBeHandle
){
if
(
canBeHandle
){
Date
today
=
new
Date
();
//发起时间不看工作日
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
if
(
isBeforeThreshold
)
{
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
Date
today
=
new
Date
();
preVo2
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
confirmTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
preVo2
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
confirmTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
else
{
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
tomorrow
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
preVo2
.
setExpectedConfirmTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
tomorrow
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
confirmTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
}
}
else
{
}
else
{
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
preVo2
.
setExpectedCollectionTime
(
DateUtil
.
parseDate
(
DateUtil
.
dateToString
(
nextMonthFirstDay
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
nextMonthFirstDay
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
)
+
collectionTimeFormat
,
DateUtil
.
DATETIME_PATTERN_MINUTE
));
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/THouseHoldLimitServiceImpl.java
View file @
c11fdbe5
...
@@ -508,8 +508,12 @@ public class THouseHoldLimitServiceImpl extends ServiceImpl<THouseHoldLimitMappe
...
@@ -508,8 +508,12 @@ public class THouseHoldLimitServiceImpl extends ServiceImpl<THouseHoldLimitMappe
//当月办次月生效
//当月办次月生效
if
(
CommonConstants
.
ONE_STRING
.
equals
(
addHandleRule
)){
if
(
CommonConstants
.
ONE_STRING
.
equals
(
addHandleRule
)){
if
(
canBeHandle
){
if
(
canBeHandle
){
Date
today
=
new
Date
();
if
(
isBeforeThreshold
){
return
DateUtil
.
dateToString
(
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
Date
today
=
new
Date
();
return
DateUtil
.
dateToString
(
today
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
}
else
{
return
DateUtil
.
dateToString
(
tomorrow
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
}
}
else
{
}
else
{
return
DateUtil
.
dateToString
(
nextMonthFirstDay
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
return
DateUtil
.
dateToString
(
nextMonthFirstDay
,
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
);
}
}
...
...
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