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
4f6c3139
Commit
4f6c3139
authored
Jun 02, 2023
by
wangzb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feature-wzb :bug修复
parent
3722d2e2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
TEmployeeRetirementController.java
...fu/archives/controller/TEmployeeRetirementController.java
+1
-1
TEmployeeRetirementMapper.java
...us/v1/yifu/archives/mapper/TEmployeeRetirementMapper.java
+1
-1
TEmployeeRetirementServiceImpl.java
...archives/service/impl/TEmployeeRetirementServiceImpl.java
+3
-2
TEmployeeRetirementMapper.xml
...z/src/main/resources/mapper/TEmployeeRetirementMapper.xml
+2
-2
application-dev.yml
yifu-auth/src/main/resources/application-dev.yml
+0
-1
ArchiveTask.java
.../java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmployeeRetirementController.java
View file @
4f6c3139
...
...
@@ -48,7 +48,7 @@ public class TEmployeeRetirementController {
@Inner
@Operation
(
summary
=
"分页查询"
,
description
=
"分页查询"
)
@
Ge
tMapping
(
"/inner/retireeRemind"
)
@
Pos
tMapping
(
"/inner/retireeRemind"
)
public
void
retireeRemind
()
{
tEmployeeRetirementService
.
retireeRemind
();
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/mapper/TEmployeeRetirementMapper.java
View file @
4f6c3139
...
...
@@ -25,7 +25,7 @@ public interface TEmployeeRetirementMapper extends BaseMapper<TEmployeeRetiremen
IPage
<
TEmployeeRetirement
>
getTEmployeeRetirementPage
(
Page
page
,
@Param
(
"searchVo"
)
TEmployeeRetirementSearchVo
searchVo
);
List
<
TEmployeeRetirement
>
getBirthday
(
@Param
(
"
TT"
)
String
TT
,
@Param
(
"LL"
)
String
LL
);
List
<
TEmployeeRetirement
>
getBirthday
(
@Param
(
"
oo"
)
String
oo
,
@Param
(
"pp"
)
String
pp
);
boolean
changeHandleFlagAll
(
@Param
(
"changeHandleFlagAllVo"
)
ChangeHandleFlagAllVo
changeHandleFlagAllVo
);
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeRetirementServiceImpl.java
View file @
4f6c3139
...
...
@@ -55,7 +55,6 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
@Override
@Scheduled
(
cron
=
"0 */1 * * * ?"
)
public
void
retireeRemind
()
{
Date
date
=
DateUtil
.
getCurrentDateTime
();
YifuUser
user
=
SecurityUtils
.
getUser
();
...
...
@@ -67,7 +66,9 @@ private TEmployeeRetirementFlagDetailMapper tEmployeeRetirementFlagDetailMapper;
String
wRemainTime
=
DateUtil
.
getYearAndMonth
(
YearMonth
,
ArchivesConstants
.
WYEAR_MONTH
);
String
TT
=
mRemainTime
+
dateOne
;
String
LL
=
wRemainTime
+
dateOne
;
List
<
TEmployeeRetirement
>
list
=
baseMapper
.
getBirthday
(
DateUtil
.
dateToString
(
DateUtil
.
stringToDate
(
TT
),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
),
DateUtil
.
dateToString
(
DateUtil
.
stringToDate
(
LL
),
DateUtil
.
ISO_EXPANDED_DATE_FORMAT
));
String
oo
=
DateUtil
.
dateToString
(
DateUtil
.
stringToDate
(
TT
));
String
pp
=
DateUtil
.
dateToString
(
DateUtil
.
stringToDate
(
LL
));
List
<
TEmployeeRetirement
>
list
=
baseMapper
.
getBirthday
(
oo
,
pp
);
for
(
TEmployeeRetirement
tEmployeeRetirement
:
list
)
{
int
i
=
baseMapper
.
selectByEmpIdcard
(
tEmployeeRetirement
.
getEmpIdcard
());
if
(
i
==
0
)
{
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementMapper.xml
View file @
4f6c3139
...
...
@@ -184,8 +184,8 @@
b.EMP_BIRTHDAY
FROM t_employee_project a
LEFT JOIN t_employee_info b ON a.EMP_IDCARD = b.EMP_IDCARD
where ((datediff(#{
TT
}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '1')
or (datediff(#{
LL
}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '2'))
where ((datediff(#{
oo
}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '1')
or (datediff(#{
pp
}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '2'))
and b.FILE_STATUS = 0 and a.EMP_NATRUE in ('0','1','3')
GROUP BY a.EMP_ID
</select>
...
...
yifu-auth/src/main/resources/application-dev.yml
View file @
4f6c3139
...
...
@@ -9,7 +9,6 @@ spring:
matching-strategy
:
ant_path_matcher
redis
:
host
:
127.0.0.1
password
:
'
@yf_2017'
cloud
:
sentinel
:
eager
:
true
...
...
yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/ArchiveTask.java
View file @
4f6c3139
...
...
@@ -56,7 +56,7 @@ public class ArchiveTask {
public
void
retireeRemind
()
{
log
.
info
(
"-------------每日凌晨1点人员退休提醒-定时任务开始------------"
);
HttpDaprUtil
.
invokeMethodPost
(
daprArchivesProperties
.
getAppUrl
(),
daprArchivesProperties
.
getAppId
(),
"/temployeeretirement/inner/
everyDay
Remind"
,
""
,
Object
.
class
,
"/temployeeretirement/inner/
retiree
Remind"
,
""
,
Object
.
class
,
SecurityConstants
.
FROM_IN
);
log
.
info
(
"-------------每日凌晨1点人员退休提醒-定时任务开始------------"
);
}
...
...
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