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
6828011b
Commit
6828011b
authored
Sep 06, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.9-社保自动化日志
parent
bbb67e48
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
TSocialSoldierPushServiceImpl.java
...fu/social/service/impl/TSocialSoldierPushServiceImpl.java
+3
-3
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+3
-2
TSocialSoldierMapper.xml
...al-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
+3
-3
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java
View file @
6828011b
...
...
@@ -232,7 +232,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
ygsAddlistCopy
.
add
(
vo
);
remark
=
"
提交成功
!"
;
remark
=
"
已推送提交任务
!"
;
}
else
{
if
(
0
==
canPushType
)
{
remark
=
"未到时间,不推送!"
;
...
...
@@ -299,7 +299,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
ysdAddlistCopy
.
add
(
vo
);
remark
=
"
提交成功
!"
;
remark
=
"
已推送提交任务
!"
;
}
else
{
if
(
0
==
canPushType
)
{
remark
=
"未到时间,不推送!"
;
...
...
@@ -459,7 +459,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
List
<
SocialSoldierYgsAuditVo
>
ygsAddByGroupBylist
=
baseMapper
.
getSocialSoldierYgsAuditVoListByGroupBy
();
String
sheetName
=
"审核数据查询"
;
String
type
=
"审核"
;
String
remark
=
"
推送审核成功
!"
;
String
remark
=
"
已推送审核任务
!"
;
String
errorRemark
=
"推送社保士兵审核异常!"
;
TSocialSoldierLog
socialLog
;
List
<
TSocialSoldierLog
>
logList
=
new
ArrayList
<>();
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
6828011b
...
...
@@ -2384,8 +2384,6 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
&&
Common
.
isNotNull
(
configTemp
.
getReplaceLeft
())
&&
Common
.
isNotNull
(
configTemp
.
getReplaceRight
())
)
{
configReturn
=
new
FailReasonConfig
();
BeanUtil
.
copyProperties
(
configTemp
,
configReturn
);
String
[]
leftRes
=
msg
.
split
(
configTemp
.
getReplaceLeft
());
if
(
leftRes
.
length
>
1
)
{
String
result
=
null
;
...
...
@@ -2401,12 +2399,15 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
result
=
leftRes
[
1
];
}
if
(
Common
.
isNotNull
(
result
))
{
configReturn
=
new
FailReasonConfig
();
BeanUtil
.
copyProperties
(
configTemp
,
configReturn
);
configReturn
.
setSimpleReason
(
configReturn
.
getSimpleReason
()
+
configReturn
.
getReplaceLeft
()
+
result
+
configReturn
.
getReplaceRight
());
return
configReturn
;
}
}
}
return
configTemp
;
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
View file @
6828011b
...
...
@@ -221,7 +221,7 @@
SELECT
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','增员','减员') type,
DATE_FORMAT(
a.AUDIT_TIME,'%Y%m01
') startDate,
DATE_FORMAT(
min(a.AUDIT_TIME),'%Y%m%d
') startDate,
DATE_FORMAT(now(),'%Y%m%d') endDate,
'' backInfo,'' backInfoOne,'' backInfoTwo
FROM t_dispatch_info a
...
...
@@ -236,7 +236,7 @@
SELECT
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','参保人员增员申报','参保人员减员申报') type,
DATE_FORMAT(
a.AUDIT_TIME,'%Y%m01
') startDate,
DATE_FORMAT(
min(a.AUDIT_TIME),'%Y%m%d
') startDate,
DATE_FORMAT(now(),'%Y%m%d') endDate,
'' backInfo,'' backInfoOne,'' backInfoTwo
FROM t_dispatch_info a
...
...
@@ -269,7 +269,7 @@
SELECT
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','职工新参保登记','参保人员减员申报') type,
DATE_FORMAT(
a.AUDIT_TIME,'%Y%m01
') startDate,
DATE_FORMAT(
min(a.AUDIT_TIME),'%Y%m%d
') startDate,
DATE_FORMAT(now(),'%Y%m%d') endDate,
'' backInfo,'' backInfoOne,'' backInfoTwo
FROM t_dispatch_info a
...
...
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