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
988c0d8d
Commit
988c0d8d
authored
May 14, 2024
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.6.4-换模板
parent
d33fcb27
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
211 additions
and
337 deletions
+211
-337
SocialSoldierYgsAddVo.java
...u/cloud/plus/v1/yifu/social/vo/SocialSoldierYgsAddVo.java
+98
-64
SocialSoldierYgsReduceVo.java
...loud/plus/v1/yifu/social/vo/SocialSoldierYgsReduceVo.java
+0
-41
SocialSoldierYsdAddVo.java
...u/cloud/plus/v1/yifu/social/vo/SocialSoldierYsdAddVo.java
+0
-72
SocialSoldierYsdReduceVo.java
...loud/plus/v1/yifu/social/vo/SocialSoldierYsdReduceVo.java
+0
-41
TSocialSoldierMapper.java
...loud/plus/v1/yifu/social/mapper/TSocialSoldierMapper.java
+3
-3
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+1
-0
TSocialSoldierPushServiceImpl.java
...fu/social/service/impl/TSocialSoldierPushServiceImpl.java
+12
-16
TSocialSoldierServiceImpl.java
...1/yifu/social/service/impl/TSocialSoldierServiceImpl.java
+4
-0
TSocialSoldierMapper.xml
...al-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
+93
-100
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierYgsAddVo.java
View file @
988c0d8d
...
@@ -5,6 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
...
@@ -5,6 +5,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
import
lombok.Data
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
/**
/**
* @Author hgw
* @Author hgw
...
@@ -18,77 +20,109 @@ public class SocialSoldierYgsAddVo implements Serializable {
...
@@ -18,77 +20,109 @@ public class SocialSoldierYgsAddVo implements Serializable {
@ExcelIgnore
@ExcelIgnore
private
String
socialId
;
private
String
socialId
;
//企业名称 证件类型 身份证号码 姓名 国籍 个人身份 民族 参加工作日期 工资
@ExcelProperty
(
"派单类型"
)
// 文化程度 户口性质 增员年月 户口所在地 用工形式 手机号码 通讯地址 就业登记时间 单位就业起始时间 合同期限类型
private
String
type
;
//合同起始时间 合同终止日期 录用工种代码 合同签订类别 工作时间制度 养老参保日期 工伤参保日期 失业参保日期
@ExcelProperty
(
"社保办理状态"
)
// 户口所在地行政区划代码 居住所在地行政区划代码 当前经办行政区划代码 补缴原因 回传信息 回传信息1 回传信息2
private
String
socialHandleStatus
;
@ExcelProperty
(
"企业名称"
)
@ExcelProperty
(
"养老状态"
)
private
String
socialHouseholdName
;
private
String
pensionHandle
;
@ExcelProperty
(
"证件类型"
)
@ExcelProperty
(
"医疗状态"
)
private
String
idCardType
;
private
String
medicalHandle
;
@ExcelProperty
(
"身份证号码"
)
@ExcelProperty
(
"失业状态"
)
private
String
empIdCard
;
private
String
unemployHandle
;
@ExcelProperty
(
"姓名"
)
@ExcelProperty
(
"工伤状态"
)
private
String
workInjuryHandle
;
@ExcelProperty
(
"生育状态"
)
private
String
birthHandle
;
@ExcelProperty
(
"大病状态"
)
private
String
bigailmentHandle
;
@ExcelProperty
(
"员工姓名"
)
private
String
empName
;
private
String
empName
;
@ExcelProperty
(
"国籍"
)
@ExcelProperty
(
"员工身份证"
)
private
String
country
;
private
String
empIdcard
;
@ExcelProperty
(
"个人身份"
)
@ExcelProperty
(
"学历"
)
private
String
personType
;
@ExcelProperty
(
"民族"
)
private
String
nation
;
@ExcelProperty
(
"参加工作日期"
)
private
String
workDate
;
@ExcelProperty
(
"工资"
)
private
String
recordBase
;
@ExcelProperty
(
"文化程度"
)
private
String
educationName
;
private
String
educationName
;
@ExcelProperty
(
"
户口性质
"
)
@ExcelProperty
(
"
客户名称
"
)
private
String
regisType
;
private
String
belongUnit
;
@ExcelProperty
(
"
增员年月
"
)
@ExcelProperty
(
"
项目名称
"
)
private
String
addDate
;
private
String
settleDomain
;
@ExcelProperty
(
"
户口所在地
"
)
@ExcelProperty
(
"
员工类型
"
)
private
String
fileAddr
;
private
String
empType
;
@ExcelProperty
(
"
用工形式
"
)
@ExcelProperty
(
"
岗位
"
)
private
String
contractName
;
private
String
post
;
@ExcelProperty
(
"手机号码"
)
@ExcelProperty
(
"手机号码"
)
private
String
empMobile
;
private
String
empMobile
;
@ExcelProperty
(
"通讯地址"
)
@ExcelProperty
(
"身份证所在地"
)
private
String
mobileAddr
;
private
String
idCardAddress
;
@ExcelProperty
(
"就业登记时间"
)
@ExcelProperty
(
"通信地址"
)
private
String
dispatchDate
;
private
String
contactAddress
;
@ExcelProperty
(
"单位就业起始时间"
)
@ExcelProperty
(
"户口性质"
)
private
String
workStartDate
;
private
String
empRegisType
;
@ExcelProperty
(
"合同期限类型"
)
@ExcelProperty
(
"民族"
)
private
String
contractDateType
;
private
String
empNational
;
@ExcelProperty
(
"工时制"
)
private
String
workingHours
;
@ExcelProperty
(
"合同年限"
)
private
String
contractTerm
;
@ExcelProperty
(
"合同起始时间"
)
@ExcelProperty
(
"合同起始时间"
)
private
String
contractStart
;
private
String
contractStart
;
@ExcelProperty
(
"合同
终止日期
"
)
@ExcelProperty
(
"合同
到期时间
"
)
private
String
contractEnd
;
private
String
contractEnd
;
@ExcelProperty
(
"录用工种代码"
)
@ExcelProperty
(
"申请人"
)
private
String
workCode
;
private
String
createUserName
;
@ExcelProperty
(
"合同签订类别"
)
@ExcelProperty
(
"备案基数"
)
private
String
contractType
;
private
String
recordBase
;
@ExcelProperty
(
"工作时间制度"
)
@ExcelProperty
(
"缴纳类型"
)
private
String
workingHours
;
private
String
paymentType
;
// 养老参保日期 工伤参保日期 失业参保日期
@ExcelProperty
(
"社保户"
)
@ExcelProperty
(
"养老参保日期"
)
private
String
socialHouseholdName
;
@ExcelProperty
(
"社保缴纳地-省"
)
private
String
socialProvince
;
@ExcelProperty
(
"社保缴纳地-市"
)
private
String
socialCity
;
@ExcelProperty
(
"社保缴纳地-县"
)
private
String
socialTown
;
@ExcelProperty
(
"养老起缴日期"
)
private
String
pensionStart
;
private
String
pensionStart
;
@ExcelProperty
(
"工伤参保日期"
)
;
private
String
workInjuryStart
;
@ExcelProperty
(
"养老基数"
)
@ExcelProperty
(
"失业参保日期"
)
private
BigDecimal
unitPensionCardinal
;
@ExcelProperty
(
"医疗起缴日期"
)
private
String
medicalStart
;
@ExcelProperty
(
"医疗基数"
)
private
BigDecimal
unitMedicalCardinal
;
@ExcelProperty
(
"失业起缴日期"
)
private
String
unemployStart
;
private
String
unemployStart
;
@ExcelProperty
(
"户口所在地行政区划代码"
)
@ExcelProperty
(
"失业基数"
)
private
String
huAddr
;
private
BigDecimal
unitUnemploymentCardinal
;
@ExcelProperty
(
"居住所在地行政区划代码"
)
@ExcelProperty
(
"工伤起缴日期"
)
private
String
zhuAddr
;
private
String
workInjuryStart
;
@ExcelProperty
(
"当前经办行政区划代码"
)
@ExcelProperty
(
"工伤基数"
)
private
String
banAddr
;
private
BigDecimal
unitWorkInjuryCardinal
;
@ExcelProperty
(
"补缴原因"
)
@ExcelProperty
(
"生育起缴日期"
)
private
String
buRemark
;
private
String
birthStart
;
@ExcelProperty
(
"回传信息"
)
@ExcelProperty
(
"生育基数"
)
private
String
huiRemark
;
private
BigDecimal
unitBirthCardinal
;
@ExcelProperty
(
"回传信息1"
)
@ExcelProperty
(
"大病起缴日期"
)
private
String
huiRemark1
;
private
String
bigailmentStart
;
@ExcelProperty
(
"回传信息2"
)
@ExcelProperty
(
"大病缴纳基数"
)
private
String
huiRemark2
;
private
BigDecimal
unitBigailmentCardinal
;
@ExcelProperty
(
"单位大病金额"
)
private
BigDecimal
unitBigailmentMoney
;
@ExcelProperty
(
"个人大病金额"
)
private
BigDecimal
personalBigailmentMoney
;
@ExcelProperty
(
"委托备注"
)
private
String
socailTrustRemark
;
@ExcelProperty
(
"减少原因"
)
private
String
reduceReason
;
@ExcelProperty
(
"是否已导出"
)
private
String
exportSocialFlag
;
@ExcelProperty
(
value
=
"学校"
)
private
String
schoolName
;
@ExcelProperty
(
value
=
"专业"
)
private
String
major
;
@ExcelProperty
(
"毕业时间"
)
private
Date
graduationTime
;
@ExcelProperty
(
value
=
"首次至缴纳地时间"
)
private
Date
firstPayTime
;
}
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierYgsReduceVo.java
deleted
100644 → 0
View file @
d33fcb27
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author hgw
* @Description 社保士兵养工失减少模板
* @Date 2024-5-10 21:05:29
**/
@Data
public
class
SocialSoldierYgsReduceVo
implements
Serializable
{
// 社保id,用于回写
@ExcelIgnore
private
String
socialId
;
//企业名称 姓名 身份证号码 减员原因 备案解除二级原因 备案解除三级原因 回传信息 回传信息1 回传信息2
@ExcelProperty
(
"企业名称"
)
private
String
socialHouseholdName
;
@ExcelProperty
(
"姓名"
)
private
String
empName
;
@ExcelProperty
(
"身份证号码"
)
private
String
empIdCard
;
@ExcelProperty
(
"减员原因"
)
private
String
reduceReason
;
@ExcelProperty
(
"备案解除二级原因"
)
private
String
twoRemark
;
@ExcelProperty
(
"备案解除三级原因"
)
private
String
threeRemark
;
@ExcelProperty
(
"回传信息"
)
private
String
huiRemark
;
@ExcelProperty
(
"回传信息1"
)
private
String
huiRemark1
;
@ExcelProperty
(
"回传信息2"
)
private
String
huiRemark2
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierYsdAddVo.java
deleted
100644 → 0
View file @
d33fcb27
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
/**
* @Author hgw
* @Description 社保士兵医生大增加模板
* @Date 2024-5-11 10:28:45
**/
@Data
public
class
SocialSoldierYsdAddVo
implements
Serializable
{
// 社保id,用于回写
@ExcelIgnore
private
String
socialId
;
//企业名称 证件类型 证件号码 姓名 民族 学历 手机号码 人员类型 申报工资
//用工形式 编制类型 参保日期 合同起止日期 原参保日期
// 基本医疗保险 大额医疗费用补助 生育保险
// 回传信息 回传信息1 回传信息2
@ExcelProperty
(
"企业名称"
)
private
String
socialHouseholdName
;
@ExcelProperty
(
"证件类型"
)
private
String
idCardType
;
@ExcelProperty
(
"证件号码"
)
private
String
empIdCard
;
@ExcelProperty
(
"姓名"
)
private
String
empName
;
@ExcelProperty
(
"民族"
)
private
String
nation
;
@ExcelProperty
(
"学历"
)
private
String
educationName
;
@ExcelProperty
(
"手机号码"
)
private
String
empMobile
;
// 人员类型:职工在职
@ExcelProperty
(
"人员类型"
)
private
String
empType
;
@ExcelProperty
(
"申报工资"
)
private
String
recordBase
;
@ExcelProperty
(
"用工形式"
)
private
String
contractName
;
// 编制类型:非在编
@ExcelProperty
(
"编制类型"
)
private
String
bianType
;
@ExcelProperty
(
"参保日期"
)
private
String
socialDate
;
// 合同起止日期:空
@ExcelProperty
(
"合同起止日期"
)
private
String
contractDate
;
// 原参保日期
@ExcelProperty
(
"原参保日期"
)
private
String
socialDateOld
;
// 基本医疗保险 大额医疗费用补助 生育保险
@ExcelProperty
(
"基本医疗保险"
)
private
BigDecimal
unitMedicalMoney
;
@ExcelProperty
(
"大额医疗费用补助"
)
private
BigDecimal
unitBigailmentMoney
;
@ExcelProperty
(
"生育保险"
)
private
BigDecimal
unitBirthMoney
;
@ExcelProperty
(
"回传信息"
)
private
String
huiRemark
;
@ExcelProperty
(
"回传信息1"
)
private
String
huiRemark1
;
@ExcelProperty
(
"回传信息2"
)
private
String
huiRemark2
;
}
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialSoldierYsdReduceVo.java
deleted
100644 → 0
View file @
d33fcb27
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
import
com.alibaba.excel.annotation.ExcelIgnore
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
/**
* @Author hgw
* @Description 社保士兵医生大减少模板
* @Date 2024-5-11 10:28:36
**/
@Data
public
class
SocialSoldierYsdReduceVo
implements
Serializable
{
// 社保id,用于回写
@ExcelIgnore
private
String
socialId
;
//企业名称 证件类型 证件号码 姓名 中断原因 中断时间 回传信息 回传信息1 回传信息2
@ExcelProperty
(
"企业名称"
)
private
String
socialHouseholdName
;
@ExcelProperty
(
"证件类型"
)
private
String
idCardType
;
@ExcelProperty
(
"证件号码"
)
private
String
empIdCard
;
@ExcelProperty
(
"姓名"
)
private
String
empName
;
@ExcelProperty
(
"中断原因"
)
private
String
reduceReason
;
@ExcelProperty
(
"中断时间"
)
private
String
reduceDate
;
@ExcelProperty
(
"回传信息"
)
private
String
huiRemark
;
@ExcelProperty
(
"回传信息1"
)
private
String
huiRemark1
;
@ExcelProperty
(
"回传信息2"
)
private
String
huiRemark2
;
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialSoldierMapper.java
View file @
988c0d8d
...
@@ -46,17 +46,17 @@ public interface TSocialSoldierMapper extends BaseMapper<TSocialInfo> {
...
@@ -46,17 +46,17 @@ public interface TSocialSoldierMapper extends BaseMapper<TSocialInfo> {
* @Author hgw
* @Author hgw
* @Date 2024-5-10 21:16:41
* @Date 2024-5-10 21:16:41
**/
**/
List
<
SocialSoldierYgs
Reduce
Vo
>
getSocialSoldierYgsReduceVoList
(
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
List
<
SocialSoldierYgs
Add
Vo
>
getSocialSoldierYgsReduceVoList
(
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
/**
/**
* 社保士兵养工失增加模板
* 社保士兵养工失增加模板
* @Author hgw
* @Author hgw
* @Date 2024-5-10 21:16:41
* @Date 2024-5-10 21:16:41
**/
**/
List
<
SocialSoldierY
sd
AddVo
>
getSocialSoldierYsdAddVoList
(
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
List
<
SocialSoldierY
gs
AddVo
>
getSocialSoldierYsdAddVoList
(
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
/**
/**
* 社保士兵养工失增加模板
* 社保士兵养工失增加模板
* @Author hgw
* @Author hgw
* @Date 2024-5-10 21:16:41
* @Date 2024-5-10 21:16:41
**/
**/
List
<
SocialSoldierY
sdReduce
Vo
>
getSocialSoldierYsdReduceVoList
(
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
List
<
SocialSoldierY
gsAdd
Vo
>
getSocialSoldierYsdReduceVoList
(
@Param
(
"idsStr"
)
List
<
String
>
idsStr
);
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
988c0d8d
...
@@ -3607,6 +3607,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
...
@@ -3607,6 +3607,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if
(
CommonConstants
.
THREE_STRING
.
equals
(
auditStatus
)){
if
(
CommonConstants
.
THREE_STRING
.
equals
(
auditStatus
)){
// 自动化处理
// 自动化处理
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
autoFlag
)){
if
(
CommonConstants
.
ZERO_STRING
.
equals
(
autoFlag
)){
dis
.
setSocialHandleStatus
(
CommonConstants
.
FOUR_STRING
);
dis
.
setAutoFlag
(
CommonConstants
.
ZERO_STRING
);
dis
.
setAutoFlag
(
CommonConstants
.
ZERO_STRING
);
socialTask
.
pushSoldier
(
dis
.
getId
());
socialTask
.
pushSoldier
(
dis
.
getId
());
}
else
{
}
else
{
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialSoldierPushServiceImpl.java
View file @
988c0d8d
...
@@ -28,9 +28,6 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper;
...
@@ -28,9 +28,6 @@ import com.yifu.cloud.plus.v1.yifu.social.mapper.TSocialSoldierMapper;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialInfoService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierPushService
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TSocialSoldierPushService
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsAddVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYgsReduceVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdAddVo
;
import
com.yifu.cloud.plus.v1.yifu.social.vo.SocialSoldierYsdReduceVo
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
import
org.apache.commons.compress.utils.IOUtils
;
import
org.apache.commons.compress.utils.IOUtils
;
...
@@ -44,7 +41,6 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
...
@@ -44,7 +41,6 @@ import org.springframework.web.multipart.commons.CommonsMultipartFile;
import
java.io.*
;
import
java.io.*
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Collection
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -101,11 +97,11 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -101,11 +97,11 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
return
R
.
ok
(
"推送成功!"
);
return
R
.
ok
(
"推送成功!"
);
}
}
public
MultipartFile
getFile
(
Collection
<?>
list
,
Class
head
)
{
public
MultipartFile
getFile
(
List
<
SocialSoldierYgsAddVo
>
list
)
{
File
file
=
null
;
File
file
=
null
;
if
(
list
!=
null
)
{
if
(
list
!=
null
)
{
String
filePath
=
"socialFile"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
String
filePath
=
"socialFile"
+
DateUtil
.
getThisTime
()
+
CommonConstants
.
XLSX
;
EasyExcelFactory
.
write
(
filePath
,
head
).
sheet
(
"社保明细"
).
doWrite
(
list
);
EasyExcelFactory
.
write
(
filePath
,
SocialSoldierYgsAddVo
.
class
).
sheet
(
"社保明细"
).
doWrite
(
list
);
file
=
new
File
(
filePath
);
file
=
new
File
(
filePath
);
}
}
if
(
file
!=
null
)
{
if
(
file
!=
null
)
{
...
@@ -151,52 +147,52 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
...
@@ -151,52 +147,52 @@ public class TSocialSoldierPushServiceImpl extends ServiceImpl<TSocialSoldierMap
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
socialIdList
.
add
(
socialInfo
);
}
}
MultipartFile
file
=
this
.
getFile
(
ygsAddlist
,
SocialSoldierYgsAddVo
.
class
);
MultipartFile
file
=
this
.
getFile
(
ygsAddlist
);
if
(
Common
.
isNotNull
(
file
))
{
if
(
Common
.
isNotNull
(
file
))
{
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"社保增员"
);
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"社保增员"
);
}
}
}
}
// 养工失减少列表
// 养工失减少列表
List
<
SocialSoldierYgs
Reduce
Vo
>
ygsReducelist
=
baseMapper
.
getSocialSoldierYgsReduceVoList
(
dispatchIdList
);
List
<
SocialSoldierYgs
Add
Vo
>
ygsReducelist
=
baseMapper
.
getSocialSoldierYgsReduceVoList
(
dispatchIdList
);
if
(
ygsReducelist
!=
null
&&
!
ygsReducelist
.
isEmpty
())
{
if
(
ygsReducelist
!=
null
&&
!
ygsReducelist
.
isEmpty
())
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
TSocialInfo
socialInfo
;
TSocialInfo
socialInfo
;
for
(
SocialSoldierYgs
Reduce
Vo
vo
:
ygsReducelist
)
{
for
(
SocialSoldierYgs
Add
Vo
vo
:
ygsReducelist
)
{
socialInfo
=
new
TSocialInfo
();
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
socialIdList
.
add
(
socialInfo
);
}
}
MultipartFile
file
=
this
.
getFile
(
ygsReducelist
,
SocialSoldierYgsReduceVo
.
class
);
MultipartFile
file
=
this
.
getFile
(
ygsReducelist
);
if
(
Common
.
isNotNull
(
file
))
{
if
(
Common
.
isNotNull
(
file
))
{
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"社保减员"
);
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"社保减员"
);
}
}
}
}
// 医生大新增列表
// 医生大新增列表
List
<
SocialSoldierY
sd
AddVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddVoList
(
dispatchIdList
);
List
<
SocialSoldierY
gs
AddVo
>
ysdAddlist
=
baseMapper
.
getSocialSoldierYsdAddVoList
(
dispatchIdList
);
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
if
(
ysdAddlist
!=
null
&&
!
ysdAddlist
.
isEmpty
())
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
TSocialInfo
socialInfo
;
TSocialInfo
socialInfo
;
for
(
SocialSoldierY
sd
AddVo
vo
:
ysdAddlist
)
{
for
(
SocialSoldierY
gs
AddVo
vo
:
ysdAddlist
)
{
socialInfo
=
new
TSocialInfo
();
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
socialIdList
.
add
(
socialInfo
);
}
}
MultipartFile
file
=
this
.
getFile
(
ysdAddlist
,
SocialSoldierYsdAddVo
.
class
);
MultipartFile
file
=
this
.
getFile
(
ysdAddlist
);
if
(
Common
.
isNotNull
(
file
))
{
if
(
Common
.
isNotNull
(
file
))
{
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"医保增员"
);
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"医保增员"
);
}
}
}
}
// 医生大减少列表
// 医生大减少列表
List
<
SocialSoldierY
sdReduce
Vo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
List
<
SocialSoldierY
gsAdd
Vo
>
ysdReducelist
=
baseMapper
.
getSocialSoldierYsdReduceVoList
(
dispatchIdList
);
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
if
(
ysdReducelist
!=
null
&&
!
ysdReducelist
.
isEmpty
())
{
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
List
<
TSocialInfo
>
socialIdList
=
new
ArrayList
<>();
TSocialInfo
socialInfo
;
TSocialInfo
socialInfo
;
for
(
SocialSoldierY
sdReduce
Vo
vo
:
ysdReducelist
)
{
for
(
SocialSoldierY
gsAdd
Vo
vo
:
ysdReducelist
)
{
socialInfo
=
new
TSocialInfo
();
socialInfo
=
new
TSocialInfo
();
socialInfo
.
setId
(
vo
.
getSocialId
());
socialInfo
.
setId
(
vo
.
getSocialId
());
socialIdList
.
add
(
socialInfo
);
socialIdList
.
add
(
socialInfo
);
}
}
MultipartFile
file
=
this
.
getFile
(
ysdReducelist
,
SocialSoldierYsdReduceVo
.
class
);
MultipartFile
file
=
this
.
getFile
(
ysdReducelist
);
if
(
Common
.
isNotNull
(
file
))
{
if
(
Common
.
isNotNull
(
file
))
{
this
.
getOneAppGetModuleDetail
(
socialIdList
,
file
,
"医保减员"
);
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 @
988c0d8d
...
@@ -449,6 +449,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -449,6 +449,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
failConfig
.
getReplay
()))
{
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
failConfig
.
getReplay
()))
{
ygsHandleStatus
=
CommonConstants
.
FIVE_STRING
;
ygsHandleStatus
=
CommonConstants
.
FIVE_STRING
;
}
}
}
else
{
ygsHandleStatus
=
CommonConstants
.
FIVE_STRING
;
}
}
}
}
}
}
...
@@ -485,6 +487,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
...
@@ -485,6 +487,8 @@ public class TSocialSoldierServiceImpl extends ServiceImpl<TSocialSoldierMapper,
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
failConfig
.
getReplay
()))
{
}
else
if
(
CommonConstants
.
THREE_STRING
.
equals
(
failConfig
.
getReplay
()))
{
ysdHandleStatus
=
CommonConstants
.
FIVE_STRING
;
ysdHandleStatus
=
CommonConstants
.
FIVE_STRING
;
}
}
}
else
{
ysdHandleStatus
=
CommonConstants
.
FIVE_STRING
;
}
}
}
}
}
}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialSoldierMapper.xml
View file @
988c0d8d
This diff is collapsed.
Click to expand it.
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