Commit 088a8e29 authored by fangxinjiang's avatar fangxinjiang

社保自动化户拆分-医保自动化-fxj

parent 379199d7
......@@ -933,6 +933,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
household.setHouseType(excel.getHouseType().equals(HouseConfigConstants.HOUSE_TYPE_ONE) ? "1" : "0");
household.setAuditUser(null == auditUser.getUserId() ? "" : auditUser.getUserId());
household.setHandleUser(null == handlerUser.getUserId() ? "" :handlerUser.getUserId());
//如果社保自动化为是时,才更新 推送类型、是否生成花名册、是否仅补缴生成材料、
if (CommonConstants.ZERO_STRING.equals(household.getAutoStatus())){
if (Common.isNotNull(excel.getRosterAutoFlagYgs())){
household.setRosterAutoFlagYgs(excel.getRosterAutoFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
......@@ -942,6 +944,9 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getIsSingle())){
household.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
}
//如果医保自动化为是时,才更新 推送类型、是否生成花名册、是否仅补缴生成材料、
if (CommonConstants.ZERO_STRING.equals(household.getAutoStatusYsd())){
if (Common.isNotNull(excel.getRosterAutoFlagYsd())){
household.setRosterAutoFlagYsd(excel.getRosterAutoFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
......@@ -951,6 +956,7 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getIsSingleYsd())){
household.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
}
household.setOrganId(dicMap.get(household.getOrganName()));
baseMapper.insert(household);
......@@ -1231,6 +1237,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
updateHouseInfo(excel,info,userMap);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.UPDATE_SUCCESS,excel));
}
// 把errorMessageList 按 rowIndex 升序
errorMessageList.sort(Comparator.comparingInt(ErrorMessage::getLineNum));
}
/**
......@@ -1271,24 +1279,29 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
if (Common.isNotNull(excel.getAutoStatusYsd())) {
info.setAutoStatusYsd(excel.getAutoStatusYsd().equals(CommonConstants.IS_TRUE) ? "0" : "1");
}
if (CommonConstants.ZERO_STRING.equals(info.getAutoStatus())){
if (Common.isNotNull(excel.getIsSingle())) {
info.setIsSingle(excel.getIsSingle().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
if (Common.isNotNull(excel.getIsSingleYsd())) {
info.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
if (Common.isNotNull(excel.getDataFlagYgs())) {
info.setDataFlagYgs(excel.getDataFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
if (Common.isNotNull(excel.getRosterAutoFlagYgs())) {
info.setRosterAutoFlagYgs(excel.getRosterAutoFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
}
if (CommonConstants.ZERO_STRING.equals(info.getAutoStatusYsd())){
if (Common.isNotNull(excel.getRosterAutoFlagYsd())) {
info.setRosterAutoFlagYsd(excel.getRosterAutoFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
if (Common.isNotNull(excel.getDataFlagYgs())) {
info.setDataFlagYgs(excel.getDataFlagYgs().equals(CommonConstants.IS_TRUE) ? "1" : "0");
if (Common.isNotNull(excel.getIsSingleYsd())) {
info.setIsSingleYsd(excel.getIsSingleYsd().equals(HouseConfigConstants.IS_SINGLE_NO) ? "0" : "1");
}
if (Common.isNotNull(excel.getDataFlagYsd())) {
info.setDataFlagYsd(excel.getDataFlagYsd().equals(CommonConstants.IS_TRUE) ? "1" : "0");
}
}
if (Common.isNotNull(excel.getOrganName())) {
info.setOrganName(excel.getOrganName());
}
......
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