Commit 4e62d3f8 authored by fangxinjiang's avatar fangxinjiang

户拆分任务:批量导入、批量更新、导出、新增、编辑-fxj

parent af9bcf6a
...@@ -760,6 +760,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -760,6 +760,10 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TEN,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TEN,excel));
continue; continue;
} }
}
//社保是否自动生成花名册为是时 社保仅生成花名册为是时必填校验
if (CommonConstants.IS_TRUE.equals(excel.getRosterAutoFlagYgs())){
if (Common.isEmpty(excel.getDataFlagYgs())) { if (Common.isEmpty(excel.getDataFlagYgs())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_SIXTEEN,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_SIXTEEN,excel));
continue; continue;
...@@ -780,10 +784,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -780,10 +784,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_EIGHTEEN,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_EIGHTEEN,excel));
continue; continue;
} }
if (Common.isEmpty(excel.getDataFlagYsd())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_NINETEEN,excel));
continue;
}
//判断推送类型是否准确 //判断推送类型是否准确
if (!CommonConstants.ZERO_STRING.equals(excel.getIsSingleYsd()) && !CommonConstants.ONE_STRING.equals(excel.getIsSingleYsd())) { if (!CommonConstants.ZERO_STRING.equals(excel.getIsSingleYsd()) && !CommonConstants.ONE_STRING.equals(excel.getIsSingleYsd())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_NINE_TWO,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_NINE_TWO,excel));
...@@ -794,6 +794,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -794,6 +794,14 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_THIRTEEN,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_THIRTEEN,excel));
continue; continue;
} }
}
//医保自动化为是时医保仅补缴生成材料必填校验
if (CommonConstants.IS_TRUE.equals(excel.getRosterAutoFlagYsd())){
if (Common.isEmpty(excel.getDataFlagYsd())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_NINETEEN,excel));
continue;
}
//判断是否仅补缴生成材料 //判断是否仅补缴生成材料
if (!CommonConstants.IS_TRUE.equals(excel.getDataFlagYsd()) && !CommonConstants.IS_FALSE.equals(excel.getDataFlagYsd())) { if (!CommonConstants.IS_TRUE.equals(excel.getDataFlagYsd()) && !CommonConstants.IS_FALSE.equals(excel.getDataFlagYsd())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_ELVEN_TWO,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_ELVEN_TWO,excel));
...@@ -1042,20 +1050,36 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1042,20 +1050,36 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_THIRTEEN,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_THIRTEEN,excel));
continue; continue;
} }
//判断是否仅补缴生成材料 //社保是否自动生成花名册为是时 社保仅补缴生成材料必填
if (Common.isNotNull(excel.getDataFlagYgs()) if (CommonConstants.IS_TRUE.equals(excel.getRosterAutoFlagYgs())){
&& !CommonConstants.IS_TRUE.equals(excel.getDataFlagYgs()) if (Common.isEmpty(excel.getDataFlagYgs())) {
&& !CommonConstants.IS_FALSE.equals(excel.getDataFlagYgs())) { errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_SIXTEEN,excel));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_ELVEN,excel)); continue;
continue; }
//判断是否仅补缴生成材料是否准确
if (Common.isNotNull(excel.getDataFlagYgs())
&& !CommonConstants.IS_TRUE.equals(excel.getDataFlagYgs())
&& !CommonConstants.IS_FALSE.equals(excel.getDataFlagYgs())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_ELVEN,excel));
continue;
}
} }
if (Common.isNotNull(excel.getDataFlagYsd()) //医保是否自动生成花名册为是时 医保仅补缴生成材料必填
&& !CommonConstants.IS_TRUE.equals(excel.getDataFlagYsd()) if (CommonConstants.IS_TRUE.equals(excel.getRosterAutoFlagYsd())){
&& !CommonConstants.IS_FALSE.equals(excel.getDataFlagYsd())) { if (Common.isEmpty(excel.getDataFlagYsd())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_ELVEN_TWO,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_NINETEEN,excel));
continue; continue;
}
//判断是否仅补缴生成材料是否准确
if (Common.isNotNull(excel.getDataFlagYsd())
&& !CommonConstants.IS_TRUE.equals(excel.getDataFlagYsd())
&& !CommonConstants.IS_FALSE.equals(excel.getDataFlagYsd())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_ELVEN_TWO,excel));
continue;
}
} }
//是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功 --》MVP1.7.15 社保自动化,选择否时,医保信息必须填写,否则导入不成功 //是否自动办理,选择是时,社保和医保信息必须填写其中一个,否则导入不成功 --》MVP1.7.15 社保自动化,选择否时,医保信息必须填写,否则导入不成功
//选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段 //选择否时,不做限制要求,可填可不填,导入时正常导入填写的字段
// MVP1.7.15 医保自动化,选择是时,医保信息必须填写,否则导入不成功 // MVP1.7.15 医保自动化,选择是时,医保信息必须填写,否则导入不成功
...@@ -1063,7 +1087,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1063,7 +1087,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
CommonConstants.IS_TRUE.equals(excel.getAutoStatus()) CommonConstants.IS_TRUE.equals(excel.getAutoStatus())
&& (Common.isEmpty(excel.getSocialAccount()) && (Common.isEmpty(excel.getSocialAccount())
|| Common.isEmpty(excel.getIsSingle()) || Common.isEmpty(excel.getIsSingle())
|| Common.isEmpty(excel.getDataFlagYgs())
|| Common.isEmpty(excel.getRosterAutoFlagYgs()))){ || Common.isEmpty(excel.getRosterAutoFlagYgs()))){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TWO,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TWO,excel));
continue; continue;
...@@ -1072,7 +1095,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap ...@@ -1072,7 +1095,6 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
CommonConstants.IS_TRUE.equals(excel.getAutoStatusYsd()) CommonConstants.IS_TRUE.equals(excel.getAutoStatusYsd())
&& (Common.isEmpty(excel.getMediclAccount()) && (Common.isEmpty(excel.getMediclAccount())
|| Common.isEmpty(excel.getIsSingleYsd()) || Common.isEmpty(excel.getIsSingleYsd())
|| Common.isEmpty(excel.getDataFlagYsd())
|| Common.isEmpty(excel.getRosterAutoFlagYsd()))) { || Common.isEmpty(excel.getRosterAutoFlagYsd()))) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TWO_TWO,excel)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), HouseConfigConstants.ERROR_TEMPLATE_TWO_TWO,excel));
continue; continue;
......
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