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
ebd8017d
You need to sign in or sign up before continuing.
Commit
ebd8017d
authored
Sep 03, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.9-社保自动化日志
parent
2c03b025
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
671 additions
and
90 deletions
+671
-90
DateUtil.java
...om/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
+18
-0
SocialSoldierYgsAddVo.java
...u/cloud/plus/v1/yifu/social/vo/SocialSoldierYgsAddVo.java
+1
-1
SocialSoldierYgsAuditVo.java
...cloud/plus/v1/yifu/social/vo/SocialSoldierYgsAuditVo.java
+5
-1
SocialSoldierYsdAuditVo.java
...cloud/plus/v1/yifu/social/vo/SocialSoldierYsdAuditVo.java
+4
-0
TSocialSoldierMapper.java
...loud/plus/v1/yifu/social/mapper/TSocialSoldierMapper.java
+19
-0
TSocialDeadlineInfoService.java
...us/v1/yifu/social/service/TSocialDeadlineInfoService.java
+10
-0
TSocialSoldierLogService.java
...plus/v1/yifu/social/service/TSocialSoldierLogService.java
+24
-1
TSocialDeadlineInfoServiceImpl.java
...u/social/service/impl/TSocialDeadlineInfoServiceImpl.java
+62
-22
TSocialSoldierLogServiceImpl.java
...ifu/social/service/impl/TSocialSoldierLogServiceImpl.java
+72
-2
TSocialSoldierPushServiceImpl.java
...fu/social/service/impl/TSocialSoldierPushServiceImpl.java
+347
-62
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+58
-1
TSocialSoldierMapper.xml
...al-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
+51
-0
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java
View file @
ebd8017d
...
...
@@ -1331,6 +1331,7 @@ public class DateUtil {
return
cal
.
getTime
();
}
// fxj编写的获取当前时间,并替换 日
public
static
Date
getDayOfThisMonth
(
int
day
){
Calendar
cal
=
Calendar
.
getInstance
();
cal
.
setTime
(
new
Date
());
...
...
@@ -1339,6 +1340,23 @@ public class DateUtil {
return
cal
.
getTime
();
}
/**
* @Description: 替换当前时间的 日+时+分
* @Author: hgw
* @Date: 2024/9/2 11:07
* @return: java.util.Date
**/
public
static
Date
getDayOfThisMonthByHourAndMin
(
int
day
,
Date
dateHourAndMin
){
Calendar
cal
=
Calendar
.
getInstance
();
cal
.
setTime
(
new
Date
());
cal
.
set
(
Calendar
.
DAY_OF_MONTH
,
day
);
cal
.
set
(
Calendar
.
HOUR_OF_DAY
,
Integer
.
parseInt
(
new
SimpleDateFormat
(
"HH"
).
format
(
dateHourAndMin
)));
cal
.
set
(
Calendar
.
MINUTE
,
Integer
.
parseInt
(
new
SimpleDateFormat
(
"mm"
).
format
(
dateHourAndMin
)));
cal
.
set
(
Calendar
.
SECOND
,
0
);
cal
.
set
(
Calendar
.
MILLISECOND
,
0
);
return
cal
.
getTime
();
}
/**
* @Description: 增减(日)
* @Author: hgw
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierYgsAddVo.java
View file @
ebd8017d
...
...
@@ -84,7 +84,7 @@ public class SocialSoldierYgsAddVo implements Serializable {
private
String
socialTown
;
@ExcelProperty
(
"养老起缴日期"
)
private
String
pensionStart
;
;
@ExcelProperty
(
"养老基数"
)
private
BigDecimal
unitPensionCardinal
;
@ExcelProperty
(
"医疗起缴日期"
)
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierYgsAuditVo.java
View file @
ebd8017d
...
...
@@ -16,7 +16,11 @@ public class SocialSoldierYgsAuditVo implements Serializable {
// 社保id,用于回写
@ExcelIgnore
private
String
socialId
;
private
String
socialId
;
// 社保id,用于回写
@ExcelIgnore
private
String
empName
;
@ExcelIgnore
private
String
empIdcard
;
// #企业名称 业务类型 开始日期 结束日期 回传信息 回传信息1 回传信息2
@ExcelProperty
(
"企业名称"
)
private
String
socialHouseholdName
;
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierYsdAuditVo.java
View file @
ebd8017d
...
...
@@ -17,6 +17,10 @@ public class SocialSoldierYsdAuditVo implements Serializable {
// 社保id,用于回写
@ExcelIgnore
private
String
socialId
;
@ExcelIgnore
private
String
empName
;
@ExcelIgnore
private
String
empIdcard
;
// #企业名称 业务类型 申办日期起 申办日期止 回传信息 回传信息1 回传信息2
@ExcelProperty
(
"企业名称"
)
private
String
socialHouseholdName
;
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialSoldierMapper.java
View file @
ebd8017d
...
...
@@ -72,6 +72,18 @@ public interface TSocialSoldierMapper extends BaseMapper<TSocialInfo> {
* @Date 2024-5-24 16:39:43
**/
List
<
SocialSoldierYsdAuditVo
>
getSocialSoldierYsdAuditVoList
();
/**
* 社保士兵养工失审核模板——推送给社保士兵的归总模板
* @Author hgw
* @Date 2024-9-2 18:03:04
**/
List
<
SocialSoldierYgsAuditVo
>
getSocialSoldierYgsAuditVoListByGroupBy
();
/**
* 社保士兵医生大审核续保模板——推送给社保士兵的归总模板
* @Author hgw
* @Date 2024-9-2 18:03:07
**/
List
<
SocialSoldierYsdAuditVo
>
getSocialSoldierYsdAuditVoListByGroupBy
();
/**
* 社保士兵医生大审核新增模板
* @Author hgw
...
...
@@ -86,6 +98,13 @@ public interface TSocialSoldierMapper extends BaseMapper<TSocialInfo> {
* @return: java.util.List<com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierSalaryShenBaoVo>
**/
List
<
SocialSoldierSalaryShenBaoVo
>
getSoldierSalaryByShenBaoList
();
/**
* 社保士兵医生大审核新增模板
* @Author hgw
* @Date 2024-5-24 16:39:43
**/
List
<
SocialSoldierYsdAuditVo
>
getSocialSoldierYsdAddAuditVoListByGroupBy
();
/**
* @Description: 工资调整
* @Author: hgw
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialDeadlineInfoService.java
View file @
ebd8017d
...
...
@@ -28,6 +28,7 @@ import com.yifu.cloud.plus.v1.yifu.social.vo.TSocialDeadlineInfoSearchVo;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.util.List
;
import
java.util.Map
;
/**
* 社保医疗截止日配置
...
...
@@ -55,4 +56,13 @@ public interface TSocialDeadlineInfoService extends IService<TSocialDeadlineInfo
R
<
Boolean
>
updateByIdAsso
(
TSocialDeadlineInfo
tSocialDeadlineInfo
);
R
<
Boolean
>
saveAsso
(
TSocialDeadlineInfo
tSocialDeadlineInfo
);
/**
* @Description: 获取 当月启用 的配置
* @Author: hgw
* @Date: 2024/9/2 15:26
* @return: java.util.Map<java.lang.String, com.yifu.cloud.plus.v1.yifu.social.entity.TSocialDeadlineInfo>
**/
Map
<
String
,
TSocialDeadlineInfo
>
getSocialSet
();
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TSocialSoldierLogService.java
View file @
ebd8017d
...
...
@@ -20,8 +20,9 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierLog
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.
TSocialSoldierLogSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.
*
;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.List
;
...
...
@@ -44,4 +45,26 @@ public interface TSocialSoldierLogService extends IService<TSocialSoldierLog> {
void
listExport
(
HttpServletResponse
response
,
TSocialSoldierLogSearchVo
searchVo
);
List
<
TSocialSoldierLog
>
noPageDiy
(
TSocialSoldierLogSearchVo
searchVo
);
/**
* @param vo 社保模板
* @param type 类型
* @param remark 备注结果
* @Description: 社保提交日志
* @Author: hgw
* @Date: 2024/9/2 16:33
* @return: void
**/
TSocialSoldierLog
getYgsSoldierLog
(
SocialSoldierYgsAddVo
vo
,
String
type
,
String
remark
);
// 医保提交日志
TSocialSoldierLog
getYsdSoldierLog
(
SocialSoldierYsdAddVo
vo
,
String
type
,
String
remark
);
// 审核社保提交日志
TSocialSoldierLog
getYgsSoldierAuditLog
(
SocialSoldierYgsAuditVo
vo
,
String
type
,
String
remark
);
// 审核医保提交日志
TSocialSoldierLog
getYsdSoldierAuditLog
(
SocialSoldierYsdAuditVo
vo
,
String
type
,
String
remark
);
// 拉取提交结果日志 dispatchItem 社保、医保
TSocialSoldierLog
getSocialSoldierLog
(
TSocialInfo
social
,
String
type
,
String
dispatchItem
,
String
remark
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialDeadlineInfoServiceImpl.java
View file @
ebd8017d
...
...
@@ -27,7 +27,6 @@ import com.alibaba.excel.util.ListUtils;
import
com.alibaba.excel.write.metadata.WriteSheet
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
...
...
@@ -35,7 +34,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.THolidayInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialDeadlineInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.THolidayInfoMapper
;
...
...
@@ -44,9 +42,7 @@ import com.yifu.cloud.plus.v1.yifu.social.service.TSocialDeadlineInfoService;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialDeadlineInfoSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialDeadlineInfoVo
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.extern.log4j.Log4j2
;
import
org.aspectj.weaver.patterns.ConcreteCflowPointcut
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -275,7 +271,7 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
.
eq
(
TSocialDeadlineInfo:
:
getStatus
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TSocialDeadlineInfo:
:
getType
,
CommonConstants
.
ONE_STRING
));
if
(
Common
.
isNotNull
(
baseLists
)){
List
<
TSocialDeadlineInfo
>
saveList
=
new
ArrayList
<>();
;
List
<
TSocialDeadlineInfo
>
saveList
=
new
ArrayList
<>();
//获取当前月份所有假期配置表
Date
date
=
new
Date
();
List
<
THolidayInfo
>
holidayInfos
=
holidayInfoMapper
.
selectList
(
Wrappers
.<
THolidayInfo
>
query
().
lambda
()
...
...
@@ -289,10 +285,6 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
}
TSocialDeadlineInfo
save
;
LambdaQueryWrapper
<
TSocialDeadlineInfo
>
queryWrapper
;
int
medicalDay
;
int
socialDay
;
int
curlDay
;
int
setDay
;
for
(
TSocialDeadlineInfo
sd:
baseLists
){
queryWrapper
=
null
;
save
=
new
TSocialDeadlineInfo
();
...
...
@@ -300,22 +292,22 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
save
.
setId
(
null
);
save
.
setMonth
(
Integer
.
parseInt
(
DateUtil
.
getThisMonth
()));
save
.
setType
(
CommonConstants
.
ZERO_STRING
);
//如果月份超出当前月 大概率是 日设置有问题这里做个优化
setDay
=
DateUtil
.
getDays
(
save
.
getMedicalEndDate
());
curlDay
=
DateUtil
.
getLastDayOfDate
(
new
Date
());
if
(
setDay
>
curlDay
){
medicalDay
=
curlDay
;
}
else
{
medicalDay
=
setDay
;
// 初始化 月日时分
if
(
Common
.
isNotNull
(
save
.
getMedicalStartDate
()))
{
save
.
setMedicalStartDate
(
this
.
getNewDateByOldDate
(
save
.
getMedicalStartDate
()));
}
save
.
setMedicalEndDate
(
DateUtil
.
getDayOfThisMonth
(
medicalDay
));
setDay
=
DateUtil
.
getDays
(
save
.
getSocialEndDate
());
if
(
setDay
>
curlDay
){
socialDay
=
curlDay
;
}
else
{
socialDay
=
setDay
;
if
(
Common
.
isNotNull
(
save
.
getMedicalEndDate
()))
{
save
.
setMedicalEndDate
(
this
.
getNewDateByOldDate
(
save
.
getMedicalEndDate
()));
}
save
.
setSocialEndDate
(
DateUtil
.
getDayOfThisMonth
(
socialDay
));
if
(
Common
.
isNotNull
(
save
.
getSocialStartDate
()))
{
save
.
setSocialStartDate
(
this
.
getNewDateByOldDate
(
save
.
getSocialStartDate
()));
}
if
(
Common
.
isNotNull
(
save
.
getSocialEndDate
()))
{
save
.
setSocialEndDate
(
this
.
getNewDateByOldDate
(
save
.
getSocialEndDate
()));
}
initSocialEndDate
(
holidayMap
,
save
);
initMedicalEndDate
(
holidayMap
,
save
);
save
.
setUpdateTime
(
null
);
...
...
@@ -333,6 +325,17 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
}
}
/**
* @param oldDate 原先的时间
* @Description: 传入老时间,返回新时间,将 月日时分 替换为新的,超过下个月的,返回当前时间
* @Author: hgw
* @Date: 2024/9/2 11:15
* @return: java.util.Date
**/
private
Date
getNewDateByOldDate
(
Date
oldDate
)
{
return
DateUtil
.
getDayOfThisMonthByHourAndMin
(
Math
.
min
(
DateUtil
.
getDays
(
oldDate
),
DateUtil
.
getLastDayOfDate
(
new
Date
())),
oldDate
);
}
private
LambdaQueryWrapper
<
TSocialDeadlineInfo
>
initCountQuery
(
TSocialDeadlineInfo
save
,
LambdaQueryWrapper
<
TSocialDeadlineInfo
>
queryWrapper
)
{
queryWrapper
=
Wrappers
.
lambdaQuery
();
queryWrapper
.
eq
(
TSocialDeadlineInfo:
:
getMonth
,
save
.
getMonth
());
...
...
@@ -454,4 +457,41 @@ public class TSocialDeadlineInfoServiceImpl extends ServiceImpl<TSocialDeadlineI
}
initSocialEndDate
(
holidayMap
,
save
);
}
/**
* @Description: 获取 当月启用 的配置
* @Author: hgw
* @Date: 2024/9/2 15:25
* @return: java.util.Map<java.lang.String, com.yifu.cloud.plus.v1.yifu.social.entity.TSocialDeadlineInfo>
**/
@Override
public
Map
<
String
,
TSocialDeadlineInfo
>
getSocialSet
()
{
Map
<
String
,
TSocialDeadlineInfo
>
setMap
=
new
HashMap
<>();
List
<
TSocialDeadlineInfo
>
setlist
=
baseMapper
.
selectList
(
Wrappers
.<
TSocialDeadlineInfo
>
query
().
lambda
()
.
eq
(
TSocialDeadlineInfo:
:
getMonth
,
DateUtil
.
getThisMonth
())
.
eq
(
TSocialDeadlineInfo:
:
getStatus
,
CommonConstants
.
ZERO_STRING
));
if
(
setlist
!=
null
&&
!
setlist
.
isEmpty
())
{
StringBuilder
addressKey
;
ExcelUtil
<
TSocialDeadlineInfo
>
util
=
new
ExcelUtil
<>(
TSocialDeadlineInfo
.
class
);
for
(
TSocialDeadlineInfo
socialSet
:
setlist
)
{
if
(
Common
.
isNotNull
(
socialSet
.
getProvince
()))
{
util
.
convertEntity
(
socialSet
,
null
,
null
,
null
);
addressKey
=
new
StringBuilder
(
socialSet
.
getProvince
()).
append
(
CommonConstants
.
DOWN_LINE_STRING
);
if
(
Common
.
isEmpty
(
socialSet
.
getCity
()))
{
addressKey
.
append
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
}
else
{
addressKey
.
append
(
socialSet
.
getCity
());
}
addressKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
);
if
(
Common
.
isEmpty
(
socialSet
.
getTown
()))
{
addressKey
.
append
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
}
else
{
addressKey
.
append
(
socialSet
.
getTown
());
}
setMap
.
put
(
addressKey
.
toString
(),
socialSet
);
}
}
}
return
setMap
;
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierLogServiceImpl.java
View file @
ebd8017d
...
...
@@ -29,11 +29,11 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.Common
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierLog
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierLogMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierLogService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierLogExportVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.TSocialSoldierLogSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.*
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
...
...
@@ -136,6 +136,76 @@ public class TSocialSoldierLogServiceImpl extends ServiceImpl<TSocialSoldierLogM
return
baseMapper
.
selectList
(
wrapper
);
}
@Override
public
TSocialSoldierLog
getYgsSoldierLog
(
SocialSoldierYgsAddVo
vo
,
String
type
,
String
remark
)
{
TSocialSoldierLog
log
=
new
TSocialSoldierLog
();
log
.
setSocialId
(
vo
.
getSocialId
());
log
.
setEmpName
(
vo
.
getEmpName
());
log
.
setEmpIdcard
(
vo
.
getEmpIdcard
());
log
.
setDispatchItem
(
"社保"
);
log
.
setSocialHuName
(
vo
.
getSocialHouseholdName
());
// type 类型:提交;审核
log
.
setType
(
type
);
log
.
setRemark
(
remark
);
return
log
;
}
@Override
public
TSocialSoldierLog
getYsdSoldierLog
(
SocialSoldierYsdAddVo
vo
,
String
type
,
String
remark
)
{
TSocialSoldierLog
log
=
new
TSocialSoldierLog
();
log
.
setSocialId
(
vo
.
getSocialId
());
log
.
setEmpName
(
vo
.
getEmpName
());
log
.
setEmpIdcard
(
vo
.
getEmpIdcard
());
log
.
setDispatchItem
(
"医保"
);
log
.
setSocialHuName
(
vo
.
getSocialHouseholdName
());
// type 类型:提交;审核
log
.
setType
(
type
);
log
.
setRemark
(
remark
);
return
log
;
}
@Override
public
TSocialSoldierLog
getYgsSoldierAuditLog
(
SocialSoldierYgsAuditVo
vo
,
String
type
,
String
remark
)
{
TSocialSoldierLog
log
=
new
TSocialSoldierLog
();
log
.
setSocialId
(
vo
.
getSocialId
());
log
.
setEmpName
(
vo
.
getEmpName
());
log
.
setEmpIdcard
(
vo
.
getEmpIdcard
());
log
.
setDispatchItem
(
"社保"
);
log
.
setSocialHuName
(
vo
.
getSocialHouseholdName
());
// type 类型:提交;审核
log
.
setType
(
type
);
log
.
setRemark
(
remark
);
return
log
;
}
@Override
public
TSocialSoldierLog
getYsdSoldierAuditLog
(
SocialSoldierYsdAuditVo
vo
,
String
type
,
String
remark
)
{
TSocialSoldierLog
log
=
new
TSocialSoldierLog
();
log
.
setSocialId
(
vo
.
getSocialId
());
log
.
setEmpName
(
vo
.
getEmpName
());
log
.
setEmpIdcard
(
vo
.
getEmpIdcard
());
log
.
setDispatchItem
(
"医保"
);
log
.
setSocialHuName
(
vo
.
getSocialHouseholdName
());
// type 类型:提交;审核
log
.
setType
(
type
);
log
.
setRemark
(
remark
);
return
log
;
}
@Override
public
TSocialSoldierLog
getSocialSoldierLog
(
TSocialInfo
social
,
String
type
,
String
dispatchItem
,
String
remark
)
{
TSocialSoldierLog
log
=
new
TSocialSoldierLog
();
log
.
setSocialId
(
social
.
getId
());
log
.
setEmpName
(
social
.
getEmpName
());
log
.
setEmpIdcard
(
social
.
getEmpIdcard
());
log
.
setDispatchItem
(
dispatchItem
);
log
.
setSocialHuName
(
social
.
getSocialHouseholdName
());
// type 类型:提交;审核
log
.
setType
(
type
);
log
.
setRemark
(
remark
);
return
log
;
}
private
Long
noPageCountDiy
(
TSocialSoldierLogSearchVo
searchVo
)
{
LambdaQueryWrapper
<
TSocialSoldierLog
>
wrapper
=
buildQueryWrapper
(
searchVo
);
List
<
String
>
idList
=
Common
.
getList
(
searchVo
.
getIds
());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java
View file @
ebd8017d
...
...
@@ -25,7 +25,9 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.social.config.SocialConfig
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialDeadlineInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierLog
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TSocialSoldierShenBaoTask
;
import
com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper
;
import
com.yifu.cloud.plus.v1.yifu.social.service.*
;
...
...
@@ -42,7 +44,10 @@ import org.springframework.web.multipart.MultipartFile;
import
org.springframework.web.multipart.commons.CommonsMultipartFile
;
import
java.io.*
;
import
java.util.*
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
/**
* 社保士兵-推送
...
...
@@ -62,6 +67,8 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
private
final
TAutoPaymentInfoService
tAutoPaymentInfoService
;
private
final
TAutoPaymentErrorService
tAutoPaymentErrorService
;
private
final
TAutoPaymentDetailService
tAutoPaymentDetailService
;
private
final
TSocialDeadlineInfoService
tSocialDeadlineInfoService
;
private
final
TSocialSoldierLogService
tSocialSoldierLogService
;
/**
* @param socialList
...
...
@@ -117,6 +124,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
return
null
;
}
/**
* @Description: 组装社保与医保的文件流
* @Author: hgw
...
...
@@ -162,77 +170,283 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
**/
@Override
public
R
<
String
>
pushSoldier
(
List
<
String
>
dispatchIdList
)
{
log
.
info
(
"dispatchIdList="
+
dispatchIdList
);
log
.
info
(
"dispatchIdList="
+
dispatchIdList
);
// 获取时间限制配置(获取 当月启用 的配置)
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
=
tSocialDeadlineInfoService
.
getSocialSet
();
// 社保增员、社保减员、医保增员、医保减员
// 养工失新增列表
List
<
SocialSoldierYgsAddVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAddVoList
(
dispatchIdList
);
log
.
info
(
"ygsAddlist="
+
ygsAddlist
);
if
(
ygsAddlist
!=
null
&&
!
ygsAddlist
.
isEmpty
())
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
TSocialInfo
socialInfo
;
for
(
SocialSoldierYgsAddVo
vo
:
ygsAddlist
)
{
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
}
MultipartFile
file
=
this
.
getFileYgs
(
ygsAddlist
);
if
(
Common
.
isNotNull
(
file
))
{
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"社保增员"
);
}
this
.
doPushSocialAndLogYgs
(
socialsetMap
,
ygsAddlist
,
"社保增员"
);
}
// 养工失减少列表
List
<
SocialSoldierYgsAddVo
>
ygsReducelist
=
baseMapper
.
getSocialSoldierYgsReduceVoList
(
dispatchIdList
);
if
(
ygsReducelist
!=
null
&&
!
ygsReducelist
.
isEmpty
())
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
TSocialInfo
socialInfo
;
for
(
SocialSoldierYgsAddVo
vo
:
ygsReducelist
)
{
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
}
MultipartFile
file
=
this
.
getFileYgs
(
ygsReducelist
);
if
(
Common
.
isNotNull
(
file
))
{
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"社保减员"
);
}
this
.
doPushSocialAndLogYgs
(
socialsetMap
,
ygsReducelist
,
"社保减员"
);
}
// 医生大新增列表
List
<
SocialSoldierYsdAddVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddVoList
(
dispatchIdList
);
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialsetMap
,
ysdAddlist
,
"医保增员"
);
}
// 医生大减少列表
List
<
SocialSoldierYsdAddVo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
this
.
doPushSocialAndLogYsd
(
socialsetMap
,
ysdReducelist
,
"医保减员"
);
}
if
((
ygsAddlist
==
null
||
ygsAddlist
.
isEmpty
())
&&
(
ygsReducelist
==
null
||
ygsReducelist
.
isEmpty
())
&&
(
ysdAddlist
==
null
||
ysdAddlist
.
isEmpty
())
&&
(
ysdReducelist
==
null
||
ysdReducelist
.
isEmpty
())
)
{
return
R
.
failed
(
"无数据,推送结束!"
);
}
return
R
.
ok
(
"推送成功!!"
);
}
/**
* @Description: 推送社保和记录日志
* @Author: hgw
* @Date: 2024/9/2 17:21
* @return: void
**/
private
void
doPushSocialAndLogYgs
(
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
,
List
<
SocialSoldierYgsAddVo
>
ygsAddlist
,
String
socialType
)
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
int
canPushType
;
TSocialInfo
socialInfo
;
for
(
SocialSoldierYsdAddVo
vo
:
ysdAddlist
)
{
List
<
SocialSoldierYgsAddVo
>
ygsAddlistCopy
=
new
ArrayList
<>();
String
type
=
"提交"
;
List
<
TSocialSoldierLog
>
logList
=
new
ArrayList
<>();
TSocialSoldierLog
socialLog
;
String
remark
;
List
<
TSocialInfo
>
renGongList
=
new
ArrayList
<>();
for
(
SocialSoldierYgsAddVo
vo
:
ygsAddlist
)
{
// 0:未到时间不动; 1:推送; 2:转人工
canPushType
=
this
.
getCanPushType
(
socialsetMap
,
vo
);
if
(
1
==
canPushType
)
{
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
ygsAddlistCopy
.
add
(
vo
);
remark
=
"提交成功!"
;
}
else
{
ygsAddlist
.
remove
(
vo
);
if
(
0
==
canPushType
)
{
remark
=
"未到时间,不推送!"
;
}
else
{
remark
=
"无时间配置或超出办理截止时间,转人工!"
;
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
FIVE_STRING
);
renGongList
.
add
(
socialInfo
);
}
}
socialLog
=
tSocialSoldierLogService
.
getYgsSoldierLog
(
vo
,
type
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
MultipartFile
file
=
this
.
getFileYsd
(
ysdAddlist
);
}
if
(!
renGongList
.
isEmpty
())
{
tSocialInfoService
.
updateBatchById
(
renGongList
);
}
if
(!
logList
.
isEmpty
())
{
tSocialSoldierLogService
.
saveBatch
(
logList
);
}
// 3如果没有要办理的数据,就不需要推送
if
(!
socialIdList
.
isEmpty
())
{
try
{
MultipartFile
file
=
this
.
getFileYgs
(
ygsAddlistCopy
);
if
(
Common
.
isNotNull
(
file
))
{
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"医保增员"
);
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
socialType
);
}
}
catch
(
Exception
e
)
{
if
(!
logList
.
isEmpty
())
{
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
logTemp
.
setRemark
(
"提交社保士兵异常!"
);
}
// 医生大减少列表
List
<
SocialSoldierYsdAddVo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
tSocialSoldierLogService
.
updateBatchById
(
logList
);
}
}
}
}
/**
* @Description: 推送医保和记录日志
* @Author: hgw
* @Date: 2024/9/2 17:21
* @return: void
**/
private
void
doPushSocialAndLogYsd
(
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
,
List
<
SocialSoldierYsdAddVo
>
ysdAddlist
,
String
socialType
)
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
int
canPushType
;
TSocialInfo
socialInfo
;
for
(
SocialSoldierYsdAddVo
vo
:
ysdReducelist
)
{
List
<
SocialSoldierYsdAddVo
>
ysdAddlistCopy
=
new
ArrayList
<>();
String
type
=
"提交"
;
List
<
TSocialSoldierLog
>
logList
=
new
ArrayList
<>();
TSocialSoldierLog
socialLog
;
List
<
TSocialInfo
>
renGongList
=
new
ArrayList
<>();
String
remark
;
for
(
SocialSoldierYsdAddVo
vo
:
ysdAddlist
)
{
// 0:未到时间不动; 1:推送; 2:转人工
canPushType
=
this
.
getCanPushTypeYsd
(
socialsetMap
,
vo
);
if
(
1
==
canPushType
)
{
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
ysdAddlistCopy
.
add
(
vo
);
remark
=
"提交成功!"
;
}
else
{
ysdAddlist
.
remove
(
vo
);
if
(
0
==
canPushType
)
{
remark
=
"未到时间,不推送!"
;
}
else
{
remark
=
"无时间配置或超出办理截止时间,转人工!"
;
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setYgsHandleStatus
(
CommonConstants
.
FIVE_STRING
);
renGongList
.
add
(
socialInfo
);
}
}
socialLog
=
tSocialSoldierLogService
.
getYsdSoldierLog
(
vo
,
type
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
}
if
(!
renGongList
.
isEmpty
())
{
tSocialInfoService
.
updateBatchById
(
renGongList
);
}
if
(!
logList
.
isEmpty
())
{
tSocialSoldierLogService
.
saveBatch
(
logList
);
}
MultipartFile
file
=
this
.
getFileYsd
(
ysdReducelist
);
// 3如果没有要办理的数据,就不需要推送
if
(!
socialIdList
.
isEmpty
())
{
try
{
MultipartFile
file
=
this
.
getFileYsd
(
ysdAddlistCopy
);
if
(
Common
.
isNotNull
(
file
))
{
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"医保减员"
);
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
socialType
);
}
}
catch
(
Exception
e
)
{
if
(!
logList
.
isEmpty
())
{
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
logTemp
.
setRemark
(
"提交社保士兵异常!"
);
}
if
((
ygsAddlist
==
null
||
ygsAddlist
.
isEmpty
())
&&
(
ygsReducelist
==
null
||
ygsReducelist
.
isEmpty
())
&&
(
ysdAddlist
==
null
||
ysdAddlist
.
isEmpty
())
&&
(
ysdReducelist
==
null
||
ysdReducelist
.
isEmpty
())
)
{
return
R
.
failed
(
"无数据,推送结束!"
);
tSocialSoldierLogService
.
updateBatchById
(
logList
);
}
return
R
.
ok
(
"推送成功!!"
);
}
}
}
/**
* @param socialsetMap 时间限制配置Map
* @param vo 社保或医保
* @Description:
* @Author: hgw
* @Date: 2024/9/2 16:00
* @return: int
**/
private
int
getCanPushType
(
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
,
SocialSoldierYgsAddVo
vo
)
{
// 0:未到时间不动; 1:推送; 2:转人工
int
canPushType
=
0
;
if
(
socialsetMap
!=
null
)
{
TSocialDeadlineInfo
socialSet
;
StringBuilder
addressKey
;
Date
nowTime
=
new
Date
();
if
(
Common
.
isNotNull
(
vo
.
getSocialProvince
()))
{
addressKey
=
new
StringBuilder
(
vo
.
getSocialProvince
()).
append
(
CommonConstants
.
DOWN_LINE_STRING
);
if
(
Common
.
isEmpty
(
vo
.
getSocialCity
()))
{
addressKey
.
append
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
}
else
{
addressKey
.
append
(
vo
.
getSocialCity
());
}
addressKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
);
if
(
Common
.
isEmpty
(
vo
.
getSocialTown
()))
{
addressKey
.
append
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
}
else
{
addressKey
.
append
(
vo
.
getSocialTown
());
}
socialSet
=
socialsetMap
.
get
(
addressKey
.
toString
());
if
(
socialSet
!=
null
)
{
Date
start
=
socialSet
.
getSocialStartDate
();
Date
end
=
socialSet
.
getSocialEndDate
();
if
(
Common
.
isNotNull
(
start
)
&&
Common
.
isNotNull
(
end
))
{
if
(
nowTime
.
before
(
start
))
{
canPushType
=
0
;
}
else
if
(
nowTime
.
after
(
end
))
{
canPushType
=
2
;
}
else
{
canPushType
=
1
;
}
}
else
{
// 无配置或配置时间为空
canPushType
=
2
;
}
}
else
{
// 无配置或配置时间为空
canPushType
=
2
;
}
}
}
else
{
// 2无时间限制的转人工
canPushType
=
2
;
}
return
canPushType
;
}
private
int
getCanPushTypeYsd
(
Map
<
String
,
TSocialDeadlineInfo
>
socialsetMap
,
SocialSoldierYsdAddVo
vo
)
{
// 0:未到时间不动; 1:推送; 2:转人工
int
canPushType
=
0
;
if
(
socialsetMap
!=
null
)
{
TSocialDeadlineInfo
socialSet
;
StringBuilder
addressKey
;
Date
nowTime
=
new
Date
();
if
(
Common
.
isNotNull
(
vo
.
getSocialProvince
()))
{
addressKey
=
new
StringBuilder
(
vo
.
getSocialProvince
()).
append
(
CommonConstants
.
DOWN_LINE_STRING
);
if
(
Common
.
isEmpty
(
vo
.
getSocialCity
()))
{
addressKey
.
append
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
}
else
{
addressKey
.
append
(
vo
.
getSocialCity
());
}
addressKey
.
append
(
CommonConstants
.
DOWN_LINE_STRING
);
if
(
Common
.
isEmpty
(
vo
.
getSocialTown
()))
{
addressKey
.
append
(
CommonConstants
.
CENTER_SPLIT_LINE_STRING
);
}
else
{
addressKey
.
append
(
vo
.
getSocialTown
());
}
socialSet
=
socialsetMap
.
get
(
addressKey
.
toString
());
if
(
socialSet
!=
null
)
{
Date
start
=
socialSet
.
getMedicalStartDate
();
Date
end
=
socialSet
.
getMedicalEndDate
();
if
(
Common
.
isNotNull
(
start
)
&&
Common
.
isNotNull
(
end
))
{
if
(
nowTime
.
before
(
start
))
{
canPushType
=
0
;
}
else
if
(
nowTime
.
after
(
end
))
{
canPushType
=
2
;
}
else
{
canPushType
=
1
;
}
}
else
{
// 无配置或配置时间为空
canPushType
=
2
;
}
}
else
{
// 无配置或配置时间为空
canPushType
=
2
;
}
}
}
else
{
// 2无时间限制的转人工
canPushType
=
2
;
}
return
canPushType
;
}
/**
...
...
@@ -245,10 +459,15 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
public
R
<
String
>
pushSoldierByAudit
()
{
// 养工失待审核列表
List
<
SocialSoldierYgsAuditVo
>
ygsAddlist
=
baseMapper
.
getSocialSoldierYgsAuditVoList
();
log
.
info
(
"养工失待审核列表="
+
ygsAddlist
);
List
<
SocialSoldierYgsAuditVo
>
ygsAddByGroupBylist
=
baseMapper
.
getSocialSoldierYgsAuditVoListByGroupBy
(
);
String
sheetName
=
"审核数据查询"
;
String
type
=
"审核"
;
String
remark
=
"推送审核成功!"
;
String
errorRemark
=
"推送社保士兵审核异常!"
;
TSocialSoldierLog
socialLog
;
List
<
TSocialSoldierLog
>
logList
=
new
ArrayList
<>();
if
(
ygsAddlist
!=
null
&&
!
ygsAddlist
.
isEmpty
())
{
MultipartFile
file
=
this
.
getFileByAudit
(
ygsAddlist
,
null
,
sheetName
);
MultipartFile
file
=
this
.
getFileByAudit
(
ygsAdd
ByGroupBy
list
,
null
,
sheetName
);
if
(
Common
.
isNotNull
(
file
))
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
TSocialInfo
socialInfo
;
...
...
@@ -256,16 +475,37 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
// 组装日志
socialLog
=
tSocialSoldierLogService
.
getYgsSoldierAuditLog
(
vo
,
type
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
}
// 保存
if
(!
logList
.
isEmpty
())
{
tSocialSoldierLogService
.
saveBatch
(
logList
);
}
try
{
this
.
getOneAppGetModuleDetailByAudit
(
socialIdList
,
file
,
sheetName
);
}
catch
(
Exception
e
)
{
if
(!
logList
.
isEmpty
())
{
// 异常时,更新日志
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
logTemp
.
setRemark
(
errorRemark
);
}
tSocialSoldierLogService
.
updateBatchById
(
logList
);
}
}
}
}
// 医生大【续保】待审核列表
List
<
SocialSoldierYsdAuditVo
>
ysdXuBaolist
=
baseMapper
.
getSocialSoldierYsdAuditVoList
();
log
.
info
(
"医生大【续保】待审核列表="
+
ysdXuBaolist
);
List
<
SocialSoldierYsdAuditVo
>
ysdXuBaoByGroupBylist
=
baseMapper
.
getSocialSoldierYsdAuditVoListByGroupBy
(
);
sheetName
=
"审核数据信息查询"
;
logList
=
new
ArrayList
<>();
if
(
ysdXuBaolist
!=
null
&&
!
ysdXuBaolist
.
isEmpty
())
{
MultipartFile
file
=
this
.
getFileByAudit
(
null
,
ysdXuBaolist
,
sheetName
);
MultipartFile
file
=
this
.
getFileByAudit
(
null
,
ysdXuBao
ByGroupBy
list
,
sheetName
);
if
(
Common
.
isNotNull
(
file
))
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
TSocialInfo
socialInfo
;
...
...
@@ -273,15 +513,37 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
// 组装日志
socialLog
=
tSocialSoldierLogService
.
getYsdSoldierAuditLog
(
vo
,
type
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
}
// 保存
if
(!
logList
.
isEmpty
())
{
tSocialSoldierLogService
.
saveBatch
(
logList
);
}
try
{
this
.
getOneAppGetModuleDetailByAudit
(
socialIdList
,
file
,
sheetName
);
}
catch
(
Exception
e
)
{
if
(!
logList
.
isEmpty
())
{
// 异常时,更新日志
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
logTemp
.
setRemark
(
errorRemark
);
}
tSocialSoldierLogService
.
updateBatchById
(
logList
);
}
}
}
}
// 医生大【新增】待审核列表
List
<
SocialSoldierYsdAuditVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddAuditVoList
();
log
.
info
(
"医生大【新增】待审核列表="
+
ysdAddlist
);
List
<
SocialSoldierYsdAuditVo
>
ysdAddByGroupBylist
=
baseMapper
.
getSocialSoldierYsdAddAuditVoListByGroupBy
();
logList
=
new
ArrayList
<>();
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
MultipartFile
file
=
this
.
getFileByAudit
(
null
,
ysdAddlist
,
sheetName
);
MultipartFile
file
=
this
.
getFileByAudit
(
null
,
ysdAddByGroupBylist
,
sheetName
);
if
(
Common
.
isNotNull
(
file
))
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
TSocialInfo
socialInfo
;
...
...
@@ -289,8 +551,29 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
// 组装日志
socialLog
=
tSocialSoldierLogService
.
getYsdSoldierAuditLog
(
vo
,
type
,
remark
);
if
(
socialLog
!=
null
)
{
logList
.
add
(
socialLog
);
}
}
// 保存
if
(!
logList
.
isEmpty
())
{
tSocialSoldierLogService
.
saveBatch
(
logList
);
}
try
{
this
.
getOneAppGetModuleDetailByAudit
(
socialIdList
,
file
,
sheetName
);
}
catch
(
Exception
e
)
{
if
(!
logList
.
isEmpty
())
{
// 异常时,更新日志
for
(
TSocialSoldierLog
logTemp
:
logList
)
{
logTemp
.
setRemark
(
errorRemark
);
}
tSocialSoldierLogService
.
updateBatchById
(
logList
);
}
}
}
}
if
(
ygsAddlist
==
null
&&
ysdXuBaolist
==
null
&&
ysdAddlist
==
null
)
{
...
...
@@ -322,6 +605,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
return
R
.
ok
(
"推送成功!"
);
}
/**
* @Description: 推送审核结果的查询
* @Author: hgw
...
...
@@ -395,7 +679,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
public
R
<
String
>
pushSalaryByShenBao
()
{
// 工资申报
List
<
SocialSoldierSalaryShenBaoVo
>
shenBaolist
=
baseMapper
.
getSoldierSalaryByShenBaoList
();
log
.
info
(
"工资申报列表="
+
shenBaolist
);
log
.
info
(
"工资申报列表="
+
shenBaolist
);
String
sheetName
=
"年度缴费工资申报"
;
if
(
shenBaolist
!=
null
&&
!
shenBaolist
.
isEmpty
())
{
MultipartFile
file
=
this
.
getFile
(
shenBaolist
,
SocialSoldierSalaryShenBaoVo
.
class
,
sheetName
);
...
...
@@ -408,7 +692,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
// 工资调整
List
<
SocialSoldierSalaryTiaoZhengVo
>
tiaoZhenglist
=
baseMapper
.
getSoldierSalaryByTiaoZhengList
();
log
.
info
(
"工资调整列表="
+
tiaoZhenglist
);
log
.
info
(
"工资调整列表="
+
tiaoZhenglist
);
sheetName
=
"年度缴费工资调整"
;
if
(
tiaoZhenglist
!=
null
&&
!
tiaoZhenglist
.
isEmpty
())
{
MultipartFile
file
=
this
.
getFile
(
tiaoZhenglist
,
SocialSoldierSalaryTiaoZhengVo
.
class
,
sheetName
);
...
...
@@ -424,6 +708,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
return
R
.
ok
(
"推送成功!!"
);
}
/**
* @param : isReHandle true:是重新办理
* @Description: 6每月6号推送实缴3张表查询
...
...
@@ -472,7 +757,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
// 实缴3张表之1:日常申报
List
<
SocialSoldierPaymentSelectOneVo
>
shenBaolist
=
baseMapper
.
getSoldierPaymentSelectOneList
();
log
.
info
(
"实缴3张表之1:日常申报list="
+
shenBaolist
);
log
.
info
(
"实缴3张表之1:日常申报list="
+
shenBaolist
);
String
sheetName
=
"日常申报导出"
;
if
(
shenBaolist
!=
null
&&
!
shenBaolist
.
isEmpty
())
{
MultipartFile
file
=
this
.
getFile
(
shenBaolist
,
SocialSoldierPaymentSelectOneVo
.
class
,
sheetName
);
...
...
@@ -487,7 +772,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
// 实缴3张表之2:人员缴费明细打印
List
<
SocialSoldierPaymentSelectTwoVo
>
shenBaoTwolist
=
baseMapper
.
getSoldierPaymentSelectTwoList
();
log
.
info
(
"实缴3张表之2:单位个人缴费信息查询list="
+
shenBaoTwolist
);
log
.
info
(
"实缴3张表之2:单位个人缴费信息查询list="
+
shenBaoTwolist
);
sheetName
=
"单位个人缴费信息查询"
;
if
(
shenBaoTwolist
!=
null
&&
!
shenBaoTwolist
.
isEmpty
())
{
MultipartFile
file
=
this
.
getFile
(
shenBaoTwolist
,
SocialSoldierPaymentSelectTwoVo
.
class
,
sheetName
);
...
...
@@ -502,7 +787,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
// 实缴3张表之3:单位缴费明细查询
List
<
SocialSoldierPaymentSelectThreeVo
>
shenBaoThreelist
=
baseMapper
.
getSoldierPaymentSelectThreeList
();
log
.
info
(
"实缴3张表之3:单位缴费明细查询list="
+
shenBaoThreelist
);
log
.
info
(
"实缴3张表之3:单位缴费明细查询list="
+
shenBaoThreelist
);
sheetName
=
"单位缴费明细查询"
;
if
(
shenBaoThreelist
!=
null
&&
!
shenBaoThreelist
.
isEmpty
())
{
MultipartFile
file
=
this
.
getFile
(
shenBaoThreelist
,
SocialSoldierPaymentSelectThreeVo
.
class
,
sheetName
);
...
...
@@ -517,7 +802,7 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
}
// 实缴3张表之3-2:单位缴费明细下载
List
<
SocialSoldierPaymentSelectThreeVo
>
shenBaoFourlist
=
baseMapper
.
getSoldierPaymentSelectThreeList
();
log
.
info
(
"实缴3张表之3-2:单位缴费明细下载list="
+
shenBaoFourlist
);
log
.
info
(
"实缴3张表之3-2:单位缴费明细下载list="
+
shenBaoFourlist
);
sheetName
=
"单位缴费明细下载"
;
if
(
shenBaoFourlist
!=
null
&&
!
shenBaoFourlist
.
isEmpty
())
{
MultipartFile
file
=
this
.
getFile
(
shenBaoFourlist
,
SocialSoldierPaymentSelectThreeVo
.
class
,
sheetName
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
View file @
ebd8017d
...
...
@@ -82,6 +82,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
private
final
TAutoPaymentInfoService
tAutoPaymentInfoService
;
private
final
TAutoPaymentDetailService
tAutoPaymentDetailService
;
private
final
TAutoPaymentErrorService
tAutoPaymentErrorService
;
private
final
TSocialSoldierLogService
tSocialSoldierLogService
;
private
final
OSSUtil
ossUtil
;
// 附件
...
...
@@ -1811,6 +1812,11 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
"1"
,
authorities
,
"1"
,
null
,
null
,
null
);
// 记录日志
List
<
TSocialSoldierLog
>
logList
=
new
ArrayList
<>();
TSocialSoldierLog
socialLog
;
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
excel
=
excelVOList
.
get
(
i
);
empIdCard
=
excel
.
getIdCard
();
...
...
@@ -1875,6 +1881,13 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
updateSocial
.
setYgsHandleStatus
(
ygsHandleStatus
);
updateSocialList
.
add
(
updateSocial
);
socialMap
.
put
(
updateSocial
.
getId
(),
updateSocial
);
// 拉取审核结果,加日志
if
(
Common
.
isNotNull
(
ygsHandleStatus
))
{
socialLog
=
tSocialSoldierLogService
.
getSocialSoldierLog
(
socialInfo
,
"审核"
,
"社保"
,
getStatusName
(
Integer
.
parseInt
(
ygsHandleStatus
)));
logList
.
add
(
socialLog
);
}
}
else
if
(!
typeFlag
&&
CommonConstants
.
SEVEN_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
()))
{
updateSocial
=
socialMap
.
get
(
socialInfo
.
getId
());
if
(
updateSocial
==
null
)
{
...
...
@@ -1927,6 +1940,13 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
updateSocial
.
setYsdHandleStatus
(
ysdHandleStatus
);
updateSocialList
.
add
(
updateSocial
);
socialMap
.
put
(
updateSocial
.
getId
(),
updateSocial
);
// 拉取审核结果,加日志
if
(
Common
.
isNotNull
(
ysdHandleStatus
))
{
socialLog
=
tSocialSoldierLogService
.
getSocialSoldierLog
(
socialInfo
,
"审核"
,
"医保"
,
getStatusName
(
Integer
.
parseInt
(
ysdHandleStatus
)));
logList
.
add
(
socialLog
);
}
}
// 处理社保办理成功或失败,
if
(!
updateSocialList
.
isEmpty
())
{
...
...
@@ -1957,6 +1977,9 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
}
}
if
(!
logList
.
isEmpty
())
{
tSocialSoldierLogService
.
saveBatch
(
logList
);
}
}
/**
...
...
@@ -2006,11 +2029,15 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
"1"
,
authorities
,
"1"
,
null
,
null
,
null
);
// 记录日志
List
<
TSocialSoldierLog
>
logList
=
new
ArrayList
<>();
TSocialSoldierLog
socialLog
;
for
(
int
i
=
0
;
i
<
excelVOList
.
size
();
i
++)
{
excel
=
excelVOList
.
get
(
i
);
if
(
"是"
.
equals
(
excel
.
getIsDoCompleted
()))
{
// 插入
log
.
info
(
excel
.
getErrorInfo
());
empIdCard
=
excel
.
getIdCard
();
if
(
Common
.
isEmpty
(
empIdCard
))
{
empIdCard
=
excel
.
getEmpIdCard
();
...
...
@@ -2028,6 +2055,7 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())
||
CommonConstants
.
THREE_STRING
.
equals
(
socialInfo
.
getYgsHandleStatus
())))
{
updateSocial
=
socialMap
.
get
(
socialInfo
.
getId
());
if
(
updateSocial
==
null
)
{
updateSocial
=
new
TSocialInfo
();
...
...
@@ -2126,6 +2154,13 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
updateSocial
.
setYgsHandleStatus
(
ygsHandleStatus
);
updateSocialList
.
add
(
updateSocial
);
socialMap
.
put
(
updateSocial
.
getId
(),
updateSocial
);
// 拉取提交结果,加日志
if
(
Common
.
isNotNull
(
ygsHandleStatus
))
{
socialLog
=
tSocialSoldierLogService
.
getSocialSoldierLog
(
socialInfo
,
"提交"
,
"社保"
,
getStatusName
(
Integer
.
parseInt
(
ygsHandleStatus
)));
logList
.
add
(
socialLog
);
}
}
else
if
(!
typeFlag
&&
(
CommonConstants
.
ONE_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
())
||
CommonConstants
.
TWO_STRING
.
equals
(
socialInfo
.
getYsdHandleStatus
())
...
...
@@ -2231,6 +2266,13 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
updateSocial
.
setYsdHandleStatus
(
ysdHandleStatus
);
updateSocialList
.
add
(
updateSocial
);
socialMap
.
put
(
updateSocial
.
getId
(),
updateSocial
);
// 拉取提交结果,加日志
if
(
Common
.
isNotNull
(
ysdHandleStatus
))
{
socialLog
=
tSocialSoldierLogService
.
getSocialSoldierLog
(
socialInfo
,
"提交"
,
"医保"
,
getStatusName
(
Integer
.
parseInt
(
ysdHandleStatus
)));
logList
.
add
(
socialLog
);
}
}
// 处理社保办理成功或失败,
...
...
@@ -2263,6 +2305,21 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
}
}
if
(!
logList
.
isEmpty
())
{
tSocialSoldierLogService
.
saveBatch
(
logList
);
}
}
/**
* @param status
* @Description: 返回对应文字
* @Author: hgw
* @Date: 2024/9/2 19:38
* @return: java.lang.String
**/
private
String
getStatusName
(
int
status
)
{
String
[]
arr
=
{
"空"
,
"待办理"
,
"自动办理中"
,
"继续办理"
,
"终止办理"
,
"人工处理"
,
"成功"
,
"提交成功"
};
return
arr
[
status
];
}
/**
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
View file @
ebd8017d
...
...
@@ -188,6 +188,8 @@
<select
id=
"getSocialSoldierYgsAuditVoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAuditVo"
>
SELECT
s.id as socialId,
a.EMP_NAME empName,
a.EMP_IDCARD empIdcard,
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','增员','减员') type,
DATE_FORMAT(a.AUDIT_TIME,'%Y%m%d') startDate,
...
...
@@ -204,6 +206,8 @@
<select
id=
"getSocialSoldierYsdAuditVoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAuditVo"
>
SELECT
s.id as socialId,
a.EMP_NAME empName,
a.EMP_IDCARD empIdcard,
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','参保人员增员申报','参保人员减员申报') type,
DATE_FORMAT(a.AUDIT_TIME,'%Y%m%d') startDate,
...
...
@@ -217,6 +221,37 @@
group by s.id
</select>
<!-- 社保士兵养工失审核结果查询的模板-->
<select
id=
"getSocialSoldierYgsAuditVoListByGroupBy"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAuditVo"
>
SELECT
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','增员','减员') type,
DATE_FORMAT(a.AUDIT_TIME,'%Y%m01') startDate,
DATE_FORMAT(now(),'%Y%m%d') endDate,
'' backInfo,'' backInfoOne,'' backInfoTwo
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
where a.DELETE_FLAG = '0' AND a.social_id is not null AND a.STATUS = "2" AND s.YGS_HANDLE_STATUS = '7'
and a.AUTO_FLAG = '0' and DATE_FORMAT(a.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
group by a.SOCIAL_HOUSEHOLD_NAME,a.TYPE
</select>
<!-- 社保士兵医生大审核结果【续保】查询的模板-->
<select
id=
"getSocialSoldierYsdAuditVoListByGroupBy"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAuditVo"
>
SELECT
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','参保人员增员申报','参保人员减员申报') type,
DATE_FORMAT(a.AUDIT_TIME,'%Y%m01') startDate,
DATE_FORMAT(now(),'%Y%m%d') endDate,
'' backInfo,'' backInfoOne,'' backInfoTwo
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
where a.DELETE_FLAG = '0' AND a.social_id is not null AND a.STATUS = "2" AND s.YSD_HANDLE_STATUS = '7'
and a.AUTO_FLAG = '0' and DATE_FORMAT(a.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and s.YSD_REMARK_OLD != "新增"
group by a.SOCIAL_HOUSEHOLD_NAME,a.TYPE
</select>
<!-- 社保士兵医生大审核结果【新增】查询的模板-->
<select
id=
"getSocialSoldierYsdAddAuditVoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAuditVo"
>
SELECT
...
...
@@ -234,6 +269,22 @@
group by s.id
</select>
<!-- 社保士兵医生大审核结果【新增】查询的模板-->
<select
id=
"getSocialSoldierYsdAddAuditVoListByGroupBy"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAuditVo"
>
SELECT
a.SOCIAL_HOUSEHOLD_NAME socialHouseholdName,
if(a.TYPE='0','职工新参保登记','参保人员减员申报') type,
DATE_FORMAT(a.AUDIT_TIME,'%Y%m01') startDate,
DATE_FORMAT(now(),'%Y%m%d') endDate,
'' backInfo,'' backInfoOne,'' backInfoTwo
FROM t_dispatch_info a
left join t_social_info s on a.SOCIAL_ID = s.id
where a.DELETE_FLAG = '0' AND a.social_id is not null AND a.STATUS = "2" AND s.YSD_HANDLE_STATUS = '7'
and a.AUTO_FLAG = '0' and DATE_FORMAT(a.AUDIT_TIME,'%Y%m') = DATE_FORMAT(now(),'%Y%m')
and s.YSD_REMARK_OLD = "新增"
group by a.SOCIAL_HOUSEHOLD_NAME,a.TYPE
</select>
<!-- 工资申报 -->
<select
id=
"getSoldierSalaryByShenBaoList"
resultType=
"com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierSalaryShenBaoVo"
>
select
...
...
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