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
129a6fc5
Commit
129a6fc5
authored
May 17, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.4-优化社保士兵, 提示语等
parent
be3687d0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
12 deletions
+31
-12
TSocialSoldierPushServiceImpl.java
...fu/social/service/impl/TSocialSoldierPushServiceImpl.java
+6
-5
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+25
-7
No files found.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java
View file @
129a6fc5
...
...
@@ -44,6 +44,7 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import
java.io.*
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -102,7 +103,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
public
MultipartFile
getFile
(
List
<
SocialSoldierYgsAddVo
>
list
,
int
type
)
{
if
(
list
!=
null
)
{
String
fileName
=
"so
cialSoldierFile"
+
DateUtil
.
getThis
Time
()
+
CommonConstants
.
XLSX
;
String
fileName
=
"so
ldierFile"
+
DateUtil
.
getThisTime
()
+
new
Date
().
get
Time
()
+
CommonConstants
.
XLSX
;
ExcelWriter
excelWriter
=
EasyExcelFactory
.
write
(
fileName
).
build
();
WriteSheet
writeSheet
=
EasyExcelFactory
.
writerSheet
(
"社保明细"
).
head
(
SocialSoldierYgsAddVo
.
class
).
build
();
...
...
@@ -166,7 +167,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
MultipartFile
file
=
this
.
getFile
(
ygsAddlist
,
1
);
if
(
Common
.
isNotNull
(
file
))
{
log
.
error
(
"社保增员"
);
log
.
error
(
"社保增员"
+
file
.
getOriginalFilename
()
);
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"社保增员"
);
}
}
...
...
@@ -182,7 +183,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
MultipartFile
file
=
this
.
getFile
(
ygsReducelist
,
2
);
if
(
Common
.
isNotNull
(
file
))
{
log
.
error
(
"社保减员"
);
log
.
error
(
"社保减员"
+
file
.
getOriginalFilename
()
);
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"社保减员"
);
}
}
...
...
@@ -198,7 +199,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
MultipartFile
file
=
this
.
getFile
(
ysdAddlist
,
3
);
if
(
Common
.
isNotNull
(
file
))
{
log
.
error
(
"医保增员"
);
log
.
error
(
"医保增员"
+
file
.
getOriginalFilename
()
);
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"医保增员"
);
}
}
...
...
@@ -214,7 +215,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
MultipartFile
file
=
this
.
getFile
(
ysdReducelist
,
4
);
if
(
Common
.
isNotNull
(
file
))
{
log
.
error
(
"医保减员"
);
log
.
error
(
"医保减员"
+
file
.
getOriginalFilename
()
);
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"医保减员"
);
}
}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
129a6fc5
...
...
@@ -397,8 +397,16 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
ygsList
.
add
(
socialInfo
.
getDispatchId
());
handleRemark
=
"社保士兵自动办理成功!"
;
remark
=
"社保士兵自动办理成功!!"
;
updateSocial
.
setYgsRemark
(
handleRemark
);
updateSocial
.
setYgsRemarkOld
(
handleRemark
);
if
(
Common
.
isNotNull
(
excel
.
getMsg
()))
{
failConfig
=
getConfig
(
excel
.
getMsg
(),
errorMap
);
if
(
failConfig
!=
null
)
{
updateSocial
.
setYgsRemark
(
failConfig
.
getSimpleReason
());
}
updateSocial
.
setYgsRemarkOld
(
handleRemark
);
}
else
{
updateSocial
.
setYgsRemark
(
handleRemark
);
updateSocial
.
setYgsRemarkOld
(
handleRemark
);
}
}
else
{
updateSocial
.
setYgsRemark
(
excel
.
getMsg
());
updateSocial
.
setYgsRemarkOld
(
excel
.
getMsg
());
...
...
@@ -477,8 +485,16 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
ysdList
.
add
(
socialInfo
.
getDispatchId
());
handleRemark
=
"社保士兵自动办理成功!"
;
remark
=
"社保士兵自动办理成功!!"
;
updateSocial
.
setYsdRemark
(
handleRemark
);
updateSocial
.
setYsdRemarkOld
(
handleRemark
);
if
(
Common
.
isNotNull
(
excel
.
getMsg
()))
{
failConfig
=
getConfig
(
excel
.
getMsg
(),
errorMap
);
if
(
failConfig
!=
null
)
{
updateSocial
.
setYsdRemark
(
failConfig
.
getSimpleReason
());
}
updateSocial
.
setYsdRemarkOld
(
handleRemark
);
}
else
{
updateSocial
.
setYsdRemark
(
handleRemark
);
updateSocial
.
setYsdRemarkOld
(
handleRemark
);
}
}
else
{
updateSocial
.
setYsdRemark
(
excel
.
getMsg
());
updateSocial
.
setYsdRemarkOld
(
excel
.
getMsg
());
...
...
@@ -582,9 +598,11 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
* @return: com.yifu.cloud.plus.v1.yifu.social.entity.FailReasonConfig
**/
private
FailReasonConfig
getConfig
(
String
msg
,
Map
<
String
,
FailReasonConfig
>
errorMap
)
{
for
(
Map
.
Entry
<
String
,
FailReasonConfig
>
config
:
errorMap
.
entrySet
())
{
if
(
msg
.
contains
(
config
.
getKey
()))
{
return
config
.
getValue
();
if
(
errorMap
!=
null
)
{
for
(
Map
.
Entry
<
String
,
FailReasonConfig
>
config
:
errorMap
.
entrySet
())
{
if
(
msg
.
contains
(
config
.
getKey
()))
{
return
config
.
getValue
();
}
}
}
return
null
;
...
...
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