Commit 77a8b7a0 authored by hongguangwu's avatar hongguangwu

MVP1.7.15-税友拆分社保、医保

parent 7cde9687
......@@ -208,6 +208,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
List<TSocialFriendBackLog> backLogList = new ArrayList<>();
R<String> urlR;
List<SociaFriendYgsAddVo> listVo = new ArrayList<>();
// 花名册需要的list
List<SociaFriendYgsAddVo> huaListVo = new ArrayList<>();
List<TSocialSoldierLog> logTemp = new ArrayList<>();
List<TSocialInfo> socialInfoTemp = new ArrayList<>();
List<TSocialInfo> socialInfoUpdate = new ArrayList<>();
......@@ -222,6 +224,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
boolean isSingle;
// 是否为生成解除劳动合同书 且是 派减
boolean isAutoLeaveDoc;
// 社保是否自动生成花名册
boolean rosterAutoFlagYgs;
// 社保仅补缴生成材料 0否1是
boolean dataFlagYgs;
int nowMonth = Integer.parseInt(DateUtil.getThisMonth());
for (int index = 0 ; index < ygsAddlist.size(); index++) {
vo = ygsAddlist.get(index);
// 派减离职原因转化:
......@@ -252,6 +259,24 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId());
listVo.add(vo);
// 仅补缴生成材料
dataFlagYgs = Common.isNotNull(vo.getDataFlagYgs())
&& CommonConstants.ONE_STRING.equals(vo.getDataFlagYgs())
&& Common.isNotNull(vo.getSocialStartMonth());
if (dataFlagYgs) {
// 仅补缴生成材料
try {
if (nowMonth >= Integer.parseInt(vo.getSocialStartMonth())) {
huaListVo.add(vo);
}
} catch (Exception e) {
huaListVo.add(vo);
}
} else {
huaListVo.add(vo);
}
socialInfoTemp.add(socialInfo);
socialLog = tSocialSoldierLogService.getFriendLog(vo, typeStr, dispatchItem, remark);
if (socialLog != null) {
......@@ -267,11 +292,16 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
&& CommonConstants.ONE_STRING.equals(vo.getIsAutoLeaveDoc());
if (isAutoLeaveDoc || isSingle || nextFlag || i % 10 == 0 || index >= ygsAddlist.size()-1) {
urlR = doExportRosterNew(vo, type, listVo, zhangMap, templateSrcMap);
// 房工接口,获取 企业职工社会保险增员花名册 url
// urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode(), listVo)
if (urlR != null && urlR.getCode() == 200 && Common.isNotNull(urlR.getData())) {
vo.setQyzgshbxzyhmc(urlR.getData());
rosterAutoFlagYgs = Common.isEmpty(vo.getRosterAutoFlagYgs()) || CommonConstants.ONE_STRING.equals(vo.getRosterAutoFlagYgs());
if (rosterAutoFlagYgs && !huaListVo.isEmpty()) {
urlR = doExportRosterNew(vo, type, huaListVo, zhangMap, templateSrcMap);
// 房工接口,获取 企业职工基本医疗保险参保登记表 url
//urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode(), listVo)
if (urlR != null && urlR.getCode() == 200 && Common.isNotNull(urlR.getData())) {
vo.setQyzgshbxzyhmc(urlR.getData());
}
}
if (isSingle && Common.isNotNull(vo.getDispatchId())) {
......@@ -304,6 +334,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
}
// 重置
listVo = new ArrayList<>();
huaListVo = new ArrayList<>();
socialInfoTemp = new ArrayList<>();
logTemp = new ArrayList<>();
}
......@@ -465,6 +496,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
R<String> urlR;
List<SociaFriendYgsAddVo> listVo = new ArrayList<>();
// 花名册需要的list
List<SociaFriendYgsAddVo> huaListVo = new ArrayList<>();
List<TSocialSoldierLog> logTemp = new ArrayList<>();
List<TSocialInfo> socialInfoTemp = new ArrayList<>();
List<TSocialInfo> socialInfoUpdate = new ArrayList<>();
......@@ -479,6 +512,11 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
boolean isAutoLeaveDoc;
// 是否为单个推送(派单审核时定性的)
boolean isSingle;
// 社保是否自动生成花名册
boolean rosterAutoFlagYsd;
// 社保仅补缴生成材料 0否1是
boolean dataFlagYsd;
int nowMonth = Integer.parseInt(DateUtil.getThisMonth());
for (int index = 0 ; index < ysdAddlist.size(); index++) {
vo = ysdAddlist.get(index);
......@@ -506,7 +544,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
remark = "超出医保离职原因的配置,转人工!配置为:"+vo.getTbyy();
socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId());
socialInfo.setYgsHandleStatus(CommonConstants.FIVE_STRING);
socialInfo.setYsdHandleStatus(CommonConstants.FIVE_STRING);
renGongList.add(socialInfo);
socialLog = tSocialSoldierLogService.getFriendLog(vo, typeStr, dispatchItem, remark);
if (socialLog != null) {
......@@ -521,6 +559,22 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId());
listVo.add(vo);
// 仅补缴生成材料
dataFlagYsd = Common.isNotNull(vo.getDataFlagYsd())
&& CommonConstants.ONE_STRING.equals(vo.getDataFlagYsd())
&& Common.isNotNull(vo.getSocialStartMonth());
if (dataFlagYsd) {
// 仅补缴生成材料
try {
if (nowMonth >= Integer.parseInt(vo.getSocialStartMonth())) {
huaListVo.add(vo);
}
} catch (Exception e) {
huaListVo.add(vo);
}
} else {
huaListVo.add(vo);
}
socialInfo = new TSocialInfo();
socialInfo.setId(vo.getSocialId());
socialInfoTemp.add(socialInfo);
......@@ -533,17 +587,22 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
&& !vo.getSocialHouseholdName().equals(ysdAddlist.get(index+1).getSocialHouseholdName())) {
nextFlag = true;
}
isSingle = Common.isNotNull(vo.getIsSingle()) && CommonConstants.ONE_STRING.equals(vo.getIsSingle());
isSingle = Common.isNotNull(vo.getIsSingleYsd()) && CommonConstants.ONE_STRING.equals(vo.getIsSingleYsd());
isAutoLeaveDoc = templateUrl != null && type == 4 && Common.isNotNull(vo.getIsAutoLeaveDoc())
&& CommonConstants.ONE_STRING.equals(vo.getIsAutoLeaveDoc());
if (isAutoLeaveDoc || isSingle || nextFlag || i % 10 == 0 || index >= ysdAddlist.size()-1) {
urlR = doExportRosterNew(vo, type, listVo, zhangMap, templateSrcMap);
rosterAutoFlagYsd = Common.isEmpty(vo.getRosterAutoFlagYsd()) || CommonConstants.ONE_STRING.equals(vo.getRosterAutoFlagYsd());
if (rosterAutoFlagYsd && !huaListVo.isEmpty()) {
// 房工接口,获取 企业职工基本医疗保险参保登记表 url
//urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode(), listVo);
if (urlR != null && urlR.getCode() == 200 && Common.isNotNull(urlR.getData())) {
vo.setQyzgjbylbxcbdjb(urlR.getData());
urlR = doExportRosterNew(vo, type, huaListVo, zhangMap, templateSrcMap);
// 房工接口,获取 企业职工基本医疗保险参保登记表 url
//urlR = doExportRoster(vo.getSocialId(), String.valueOf(type), vo.getUnitCreditCode(), listVo)
if (urlR != null && urlR.getCode() == 200 && Common.isNotNull(urlR.getData())) {
vo.setQyzgjbylbxcbdjb(urlR.getData());
}
}
// 派减且是要自动生成离职证明:
if (isAutoLeaveDoc) {
......@@ -574,6 +633,7 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
}
// 重置
listVo = new ArrayList<>();
huaListVo = new ArrayList<>();
socialInfoTemp = new ArrayList<>();
logTemp = new ArrayList<>();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment