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
d75a814f
Commit
d75a814f
authored
Oct 20, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16
parents
64fc5e8a
0ef53aab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
45 additions
and
17 deletions
+45
-17
TSocialAlertInfoServiceImpl.java
...yifu/social/service/impl/TSocialAlertInfoServiceImpl.java
+17
-5
TSocialAlertInfoMapper.xml
...-biz/src/main/resources/mapper/TSocialAlertInfoMapper.xml
+28
-12
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialAlertInfoServiceImpl.java
View file @
d75a814f
...
@@ -168,11 +168,23 @@ public class TSocialAlertInfoServiceImpl extends ServiceImpl<TSocialAlertInfoMap
...
@@ -168,11 +168,23 @@ public class TSocialAlertInfoServiceImpl extends ServiceImpl<TSocialAlertInfoMap
socialCount
=
socialCountMap
.
getOrDefault
(
key
,
0L
);
socialCount
=
socialCountMap
.
getOrDefault
(
key
,
0L
);
fundCount
=
fundCountMap
.
getOrDefault
(
key
,
0L
);
fundCount
=
fundCountMap
.
getOrDefault
(
key
,
0L
);
message
=
new
StringBuilder
();
message
=
new
StringBuilder
();
message
.
append
(
"当前存在社保派单失败数量:"
)
//提示信息拼接,社保公积金都有值提示:当前存在社保派单失败数量:10,当前存在公积金派单失败数量:10。请及时至HRO系统进行处理
.
append
(
socialCount
)
//提示信息社保没有值提示:当前存在派单失败数量:10。请及时至HRO系统进行处理
.
append
(
",公积金派单失败数量:"
)
//提示信息公积金没有值提示:当前存在公积金派单失败数量:10。请及时至HRO系统进行处理
.
append
(
fundCount
)
boolean
hasAppend
=
false
;
.
append
(
"。请及时至HRO系统进行处理。"
);
if
(
socialCount
>
0
)
{
message
.
append
(
"当前存在社保派单失败数量:"
)
.
append
(
socialCount
);
hasAppend
=
true
;
}
if
(
fundCount
>
0
)
{
if
(
hasAppend
)
{
message
.
append
(
","
);
}
message
.
append
(
"当前存在公积金派单失败数量:"
)
.
append
(
fundCount
);
}
message
.
append
(
"。请及时至HRO系统进行处理"
);
countMap
.
put
(
key
,
message
);
countMap
.
put
(
key
,
message
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialAlertInfoMapper.xml
View file @
d75a814f
...
@@ -184,10 +184,7 @@
...
@@ -184,10 +184,7 @@
WHEN di.TYPE =1 THEN si.REDUCE_HANDLE_TIME
WHEN di.TYPE =1 THEN si.REDUCE_HANDLE_TIME
ELSE NULL
ELSE NULL
END AS HANDLE_TIME,
END AS HANDLE_TIME,
CASE
rc.reasons AS REASON
WHEN di.SOCIAL_HANDLE_STATUS IN ('2', '3') THEN di.SOCIAL_HANDLE_REMARK
ELSE NULL
END AS REASON
FROM
FROM
t_dispatch_info as di
t_dispatch_info as di
LEFT JOIN
LEFT JOIN
...
@@ -200,12 +197,23 @@
...
@@ -200,12 +197,23 @@
WHERE
WHERE
CREATE_TIME > DATE_SUB(CURDATE(), INTERVAL 4 MONTH)
CREATE_TIME > DATE_SUB(CURDATE(), INTERVAL 4 MONTH)
) AS si ON di.SOCIAL_ID = si.ID
) AS si ON di.SOCIAL_ID = si.ID
(SELECT
SOCIAL_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons',
DISPATCH_INFO_ID
FROM
t_audit_info
WHERE
audit_time > DATE_SUB(CURDATE(), INTERVAL 3 DAY)
AND AUDIT_STATUS IN ('4', '5') AND SOCIAL_ID is not NULL
GROUP BY DISPATCH_INFO_ID
) rc ON rc.DISPATCH_INFO_ID =di.id
WHERE
WHERE
(
(
(si.HANDLE_TIME >=
DATE_SUB(CURDATE(), INTERVAL 1 DAY
)
(si.HANDLE_TIME >=
CONCAT(DATE_SUB(CURDATE(), INTERVAL 1 DAY),' 10:00:00'
)
AND si.HANDLE_TIME
<![CDATA[ <= ]]>
CONCAT(CURDATE(), ' 10:00:00'))
AND si.HANDLE_TIME
<![CDATA[ <= ]]>
CONCAT(CURDATE(), ' 10:00:00'))
OR
OR
(si.REDUCE_HANDLE_TIME >=
DATE_SUB(CURDATE(), INTERVAL 1 DAY
)
(si.REDUCE_HANDLE_TIME >=
CONCAT(DATE_SUB(CURDATE(), INTERVAL 1 DAY),' 10:00:00'
)
AND si.REDUCE_HANDLE_TIME
<![CDATA[ <= ]]>
CONCAT(CURDATE(), ' 10:00:00'))
AND si.REDUCE_HANDLE_TIME
<![CDATA[ <= ]]>
CONCAT(CURDATE(), ' 10:00:00'))
)
)
AND di.SOCIAL_HANDLE_STATUS IN ('2', '3')
AND di.SOCIAL_HANDLE_STATUS IN ('2', '3')
...
@@ -236,10 +244,7 @@
...
@@ -236,10 +244,7 @@
WHEN di.TYPE =1 THEN pf.REDUCE_HANDLE_TIME
WHEN di.TYPE =1 THEN pf.REDUCE_HANDLE_TIME
ELSE NULL
ELSE NULL
END AS HANDLE_TIME,
END AS HANDLE_TIME,
CASE
rc.reasons AS REASON
WHEN di.FUND_HANDLE_STATUS = '2' THEN di.FUND_HANDLE_REMARK
ELSE NULL
END AS REASON
FROM
FROM
t_dispatch_info as di
t_dispatch_info as di
LEFT JOIN
LEFT JOIN
...
@@ -252,12 +257,23 @@
...
@@ -252,12 +257,23 @@
WHERE
WHERE
CREATE_TIME > DATE_SUB(CURDATE(), INTERVAL 4 MONTH )
CREATE_TIME > DATE_SUB(CURDATE(), INTERVAL 4 MONTH )
) AS pf ON di.FUND_ID = pf.ID
) AS pf ON di.FUND_ID = pf.ID
(SELECT
PROVIDENT_ID,
GROUP_CONCAT(DISTINCT AUDIT_REMARK) as 'reasons',
DISPATCH_INFO_ID
FROM
t_audit_info
WHERE
audit_time > DATE_SUB(CURDATE(), INTERVAL 3 DAY)
AND AUDIT_STATUS IN ('4', '5') AND PROVIDENT_ID is not NULL
GROUP BY DISPATCH_INFO_ID
) rc ON rc.DISPATCH_INFO_ID =di.id
WHERE
WHERE
(
(
(pf.HANDLE_TIME >=
DATE_SUB(CURDATE(), INTERVAL 1 DAY
)
(pf.HANDLE_TIME >=
CONCAT(DATE_SUB(CURDATE(), INTERVAL 1 DAY),' 10:00:00'
)
AND pf.HANDLE_TIME
<![CDATA[ <= ]]>
CONCAT(CURDATE(), ' 10:00:00'))
AND pf.HANDLE_TIME
<![CDATA[ <= ]]>
CONCAT(CURDATE(), ' 10:00:00'))
OR
OR
(pf.REDUCE_HANDLE_TIME >=
DATE_SUB(CURDATE(), INTERVAL 1 DAY
)
(pf.REDUCE_HANDLE_TIME >=
CONCAT(DATE_SUB(CURDATE(), INTERVAL 1 DAY),' 10:00:00'
)
AND pf.REDUCE_HANDLE_TIME
<![CDATA[ <= ]]>
CONCAT(CURDATE(), ' 10:00:00'))
AND pf.REDUCE_HANDLE_TIME
<![CDATA[ <= ]]>
CONCAT(CURDATE(), ' 10:00:00'))
)
)
AND di.FUND_HANDLE_STATUS = '2'
AND di.FUND_HANDLE_STATUS = '2'
...
...
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