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
9ade7484
Commit
9ade7484
authored
May 17, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.4-优化社保士兵, 列信息
parent
d8c64055
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+5
-1
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+2
-0
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
9ade7484
...
...
@@ -357,7 +357,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
Set
<
String
>
dbAuthsSet
=
new
HashSet
<>();
Collection
<?
extends
GrantedAuthority
>
authorities
=
AuthorityUtils
.
createAuthorityList
(
dbAuthsSet
.
toArray
(
new
String
[
0
]));
YifuUser
user
=
new
YifuUser
(
"1"
,
1L
,
"
社保士兵部门
"
,
"社保士兵"
,
YifuUser
user
=
new
YifuUser
(
"1"
,
1L
,
""
,
"社保士兵"
,
"社保士兵"
,
"0"
,
SecurityConstants
.
BCRYPT
+
"123456"
,
"12345678911"
,
true
,
true
,
true
,
true
,
...
...
@@ -397,6 +397,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
ygsList
.
add
(
socialInfo
.
getDispatchId
());
handleRemark
=
"社保士兵自动办理成功!"
;
remark
=
"社保士兵自动办理成功!!"
;
updateSocial
.
setYgsRemark
(
handleRemark
);
updateSocial
.
setYgsRemarkOld
(
handleRemark
);
}
else
{
updateSocial
.
setYgsRemark
(
excel
.
getMsg
());
updateSocial
.
setYgsRemarkOld
(
excel
.
getMsg
());
...
...
@@ -475,6 +477,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
ysdList
.
add
(
socialInfo
.
getDispatchId
());
handleRemark
=
"社保士兵自动办理成功!"
;
remark
=
"社保士兵自动办理成功!!"
;
updateSocial
.
setYsdRemark
(
handleRemark
);
updateSocial
.
setYsdRemarkOld
(
handleRemark
);
}
else
{
updateSocial
.
setYsdRemark
(
excel
.
getMsg
());
updateSocial
.
setYsdRemarkOld
(
excel
.
getMsg
());
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
9ade7484
...
...
@@ -1259,6 +1259,7 @@
left join sys_area st2 on st2.id = s.SOCIAL_TOWN
left join view_sys_dict_item emp_natrue on emp_natrue.value=a.EMP_TYPE and emp_natrue.type='emp_natrue'
<include
refid=
"where_getSocialSoldier"
/>
order by a.AUDIT_TIME desc
</select>
<update
id=
"updateSocialRecords"
>
...
...
@@ -1313,6 +1314,7 @@
left join t_social_info s on a.SOCIAL_ID = s.id
left join t_dispatch_social_fund_info h on a.id = h.REDUCE_SOCIAL_FUND_ID
<include
refid=
"where_getSocialSoldier"
/>
order by a.AUDIT_TIME desc
</select>
<!--tDispatchInfo 社保办理数据查询-->
...
...
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