Commit a2146a39 authored by fangxinjiang's avatar fangxinjiang

商险&社保户批增调整-fxj

parent cdb5f4c2
...@@ -3192,105 +3192,87 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3192,105 +3192,87 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
**/ **/
private boolean checkIsExit(List<InsuranceAddParam> listResult, InsuranceAddParam param, List<TInsurancePreDetail> listInsured) { private boolean checkIsExit(List<InsuranceAddParam> listResult, InsuranceAddParam param, List<TInsurancePreDetail> listInsured) {
if (Common.isNotNull(listInsured) && !listInsured.isEmpty()) { if (Common.isNotNull(listInsured) && !listInsured.isEmpty()) {
List<TInsurancePreDetail> insured1 = new ArrayList<>(); boolean flag = false;
List<TInsurancePreDetail> insured2 = new ArrayList<>();
for (TInsurancePreDetail detail: listInsured){ for (TInsurancePreDetail detail: listInsured){
//如果保单生效日期为空就不需校验,按原逻辑处理 提示存在在途或在保数据 //如果保单生效日期为空就不需校验,按原逻辑处理 提示存在在途或在保数据
if (Common.isEmpty(detail.getPolicyEffect())) { if (Common.isEmpty(detail.getPolicyEffect())) {
insured1.add(detail); flag = true;
continue; break;
} }
//保单生效日期及保单结束时间与新增数据的保单开始时间及保单结束时间重叠判断,重叠给提示,不重叠允许新增不走原逻辑 //保单生效日期及保单结束时间与新增数据的保单开始时间及保单结束时间重叠判断,重叠给提示,不重叠允许新增不走原逻辑
if (LocalDateUtil.hasOverlap(detail.getPolicyEffect(), detail.getPolicyEnd(), if (LocalDateUtil.hasOverlap(detail.getPolicyEffect(), detail.getPolicyEnd(),
DateUtil.stringToDate(param.getPolicyStart(), LocalDateUtil.NORM_DATE_PATTERN), DateUtil.stringToDate(param.getPolicyStart(), LocalDateUtil.NORM_DATE_PATTERN),
DateUtil.stringToDate(param.getPolicyEnd(), LocalDateUtil.NORM_DATE_PATTERN))) { DateUtil.stringToDate(param.getPolicyEnd(), LocalDateUtil.NORM_DATE_PATTERN))) {
insured2.add(detail); flag = true;
continue; break;
} }
} }
if (!insured1.isEmpty()) { if (flag){
param.setIsExit(CommonConstants.ONE_STRING); if (!listInsured.isEmpty()) {
param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_EXIST); param.setIsExit(CommonConstants.ONE_STRING);
param.setInProgressList(insured1); param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_EXIST);
listResult.add(param); param.setInProgressList(listInsured);
return true; listResult.add(param);
} return true;
if (!insured2.isEmpty()){ }
param.setIsExit(CommonConstants.ONE_STRING);
param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_REPEAT);
param.setInProgressList(insured2);
listResult.add(param);
return true;
} }
} }
return false; return false;
} }
private boolean checkReplaceIsExit(List<InsuranceReplaceParam> listResult, InsuranceReplaceParam param, List<TInsurancePreDetail> listInsured) { private boolean checkReplaceIsExit(List<InsuranceReplaceParam> listResult, InsuranceReplaceParam param, List<TInsurancePreDetail> listInsured) {
if (Common.isNotNull(listInsured) && !listInsured.isEmpty()) { if (Common.isNotNull(listInsured) && !listInsured.isEmpty()) {
List<TInsurancePreDetail> insured1 = new ArrayList<>(); boolean flag = false;
List<TInsurancePreDetail> insured2 = new ArrayList<>();
for (TInsurancePreDetail detail: listInsured){ for (TInsurancePreDetail detail: listInsured){
//如果保单生效日期为空就不需校验,按原逻辑处理 提示存在在途或在保数据 //如果保单生效日期为空就不需校验,按原逻辑处理 提示存在在途或在保数据
if (Common.isEmpty(detail.getPolicyEffect())) { if (Common.isEmpty(detail.getPolicyEffect())) {
insured1.add(detail); flag = true;
continue; break;
} }
//保单生效日期及保单结束时间与新增数据的保单开始时间及保单结束时间重叠判断,重叠给提示,不重叠允许新增不走原逻辑 //保单生效日期及保单结束时间与新增数据的保单开始时间及保单结束时间重叠判断,重叠给提示,不重叠允许新增不走原逻辑
if (LocalDateUtil.hasOverlap(detail.getPolicyEffect(), detail.getPolicyEnd(), if (LocalDateUtil.hasOverlap(detail.getPolicyEffect(), detail.getPolicyEnd(),
DateUtil.stringToDate(param.getPolicyStart(), LocalDateUtil.NORM_DATE_PATTERN), DateUtil.stringToDate(param.getPolicyStart(), LocalDateUtil.NORM_DATE_PATTERN),
DateUtil.stringToDate(param.getPolicyEnd(), LocalDateUtil.NORM_DATE_PATTERN))) { DateUtil.stringToDate(param.getPolicyEnd(), LocalDateUtil.NORM_DATE_PATTERN))) {
insured2.add(detail); flag = true;
continue; break;
} }
} }
if (!insured1.isEmpty()) { if (flag){
param.setIsExit(CommonConstants.ONE_STRING); if (!listInsured.isEmpty()) {
param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_EXIST); param.setIsExit(CommonConstants.ONE_STRING);
param.setInProgressList(insured1); param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_EXIST);
listResult.add(param); param.setInProgressList(listInsured);
return true; listResult.add(param);
} return true;
if (!insured2.isEmpty()){ }
param.setIsExit(CommonConstants.ONE_STRING);
param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_REPEAT);
param.setInProgressList(insured2);
listResult.add(param);
return true;
} }
} }
return false; return false;
} }
private boolean checkBatchIsExit(List<InsuranceBatchParam> listResult, InsuranceBatchParam param, List<TInsurancePreDetail> listInsured) { private boolean checkBatchIsExit(List<InsuranceBatchParam> listResult, InsuranceBatchParam param, List<TInsurancePreDetail> listInsured) {
if (Common.isNotNull(listInsured) && !listInsured.isEmpty()) { if (Common.isNotNull(listInsured) && !listInsured.isEmpty()) {
List<TInsurancePreDetail> insured1 = new ArrayList<>(); boolean flag = false;
List<TInsurancePreDetail> insured2 = new ArrayList<>();
for (TInsurancePreDetail detail: listInsured){ for (TInsurancePreDetail detail: listInsured){
//如果保单生效日期为空就不需校验,按原逻辑处理 提示存在在途或在保数据 //如果保单生效日期为空就不需校验,按原逻辑处理 提示存在在途或在保数据
if (Common.isEmpty(detail.getPolicyEffect())) { if (Common.isEmpty(detail.getPolicyEffect())) {
insured1.add(detail); flag = true;
continue; break;
} }
//保单生效日期及保单结束时间与新增数据的保单开始时间及保单结束时间重叠判断,重叠给提示,不重叠允许新增不走原逻辑 //保单生效日期及保单结束时间与新增数据的保单开始时间及保单结束时间重叠判断,重叠给提示,不重叠允许新增不走原逻辑
if (LocalDateUtil.hasOverlap(detail.getPolicyEffect(), detail.getPolicyEnd(), if (LocalDateUtil.hasOverlap(detail.getPolicyEffect(), detail.getPolicyEnd(),
DateUtil.convertToDateByLocalDate(param.getPolicyStart()), DateUtil.convertToDateByLocalDate(param.getPolicyStart()),
DateUtil.convertToDateByLocalDate(param.getPolicyEnd()))) { DateUtil.convertToDateByLocalDate(param.getPolicyEnd()))) {
insured2.add(detail); flag = true;
continue; break;
} }
} }
if (!insured1.isEmpty()) { if (flag){
param.setIsExit(CommonConstants.ONE_STRING); if (!listInsured.isEmpty()) {
param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_EXIST); param.setIsExit(CommonConstants.ONE_STRING);
param.setInProgressList(insured1); param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_EXIST);
listResult.add(param); param.setInProgressList(listInsured);
return true; listResult.add(param);
} return true;
if (!insured2.isEmpty()){ }
param.setIsExit(CommonConstants.ONE_STRING);
param.setErrorMessage(InsurancesConstants.DIS_PERSON_DATA_IS_REPEAT);
param.setInProgressList(insured2);
listResult.add(param);
return true;
} }
} }
return false; return false;
......
...@@ -209,6 +209,7 @@ public class SysBaseSetInfoController { ...@@ -209,6 +209,7 @@ public class SysBaseSetInfoController {
@Operation(description = "批量新增社保基数设置表") @Operation(description = "批量新增社保基数设置表")
@SysLog("批量新增社保基数设置表") @SysLog("批量新增社保基数设置表")
@PostMapping("/importListAddSocial") @PostMapping("/importListAddSocial")
@PreAuthorize("@pms.hasPermission('social_sysbasesetinfo_batch_add')")
public R<List<ErrorMessage>> importListAddSocial(@RequestBody MultipartFile file){ public R<List<ErrorMessage>> importListAddSocial(@RequestBody MultipartFile file){
return sysBaseSetInfoService.importSocialDiy(file.getInputStream()); return sysBaseSetInfoService.importSocialDiy(file.getInputStream());
} }
...@@ -220,6 +221,7 @@ public class SysBaseSetInfoController { ...@@ -220,6 +221,7 @@ public class SysBaseSetInfoController {
**/ **/
@Operation(description = "导出社保基数设置表") @Operation(description = "导出社保基数设置表")
@PostMapping("/exportSocial") @PostMapping("/exportSocial")
@PreAuthorize("@pms.hasPermission('social_sysbasesetinfo_export')")
public void exportSocial(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) { public void exportSocial(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) {
sysBaseSetInfoService.listSocialExport(response,searchVo); sysBaseSetInfoService.listSocialExport(response,searchVo);
} }
...@@ -234,6 +236,7 @@ public class SysBaseSetInfoController { ...@@ -234,6 +236,7 @@ public class SysBaseSetInfoController {
@Operation(description = "批量新增公积金基数设置表") @Operation(description = "批量新增公积金基数设置表")
@SysLog("批量新增公积金基数设置表") @SysLog("批量新增公积金基数设置表")
@PostMapping("/importListAddFund") @PostMapping("/importListAddFund")
@PreAuthorize("@pms.hasPermission('fund_sysbasesetinfo_batch_add')")
public R<List<ErrorMessage>> importListAddFund(@RequestBody MultipartFile file){ public R<List<ErrorMessage>> importListAddFund(@RequestBody MultipartFile file){
return sysBaseSetInfoService.importFundDiy(file.getInputStream()); return sysBaseSetInfoService.importFundDiy(file.getInputStream());
} }
...@@ -245,6 +248,7 @@ public class SysBaseSetInfoController { ...@@ -245,6 +248,7 @@ public class SysBaseSetInfoController {
**/ **/
@Operation(description = "导出公积金基数设置表") @Operation(description = "导出公积金基数设置表")
@PostMapping("/exportFund") @PostMapping("/exportFund")
@PreAuthorize("@pms.hasPermission('fund_sysbasesetinfo_export')")
public void exportFund(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) { public void exportFund(HttpServletResponse response, @RequestBody SysBaseSetInfo searchVo) {
sysBaseSetInfoService.listFundExport(response,searchVo); sysBaseSetInfoService.listFundExport(response,searchVo);
} }
......
...@@ -616,6 +616,12 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -616,6 +616,12 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
} }
} }
private void importSysBaseSetSocial(List<SysBaseSetSocialInsertVo> excelVOList, List<ErrorMessage> errorMessageList) { private void importSysBaseSetSocial(List<SysBaseSetSocialInsertVo> excelVOList, List<ErrorMessage> errorMessageList) {
ErrorMessage errorMsg;
if (Common.isEmpty(excelVOList)){
errorMsg = new ErrorMessage(-1,"文档数据不可为空!",null);
errorMessageList.add(errorMsg);
return;
}
// 区域数据初始化 // 区域数据初始化
HashMap<String, String> areaMap = new HashMap<>(); HashMap<String, String> areaMap = new HashMap<>();
HashMap<String, Integer> areaMap2 = new HashMap<>(); HashMap<String, Integer> areaMap2 = new HashMap<>();
...@@ -631,8 +637,6 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -631,8 +637,6 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
} }
} }
} }
// 个性化校验逻辑
ErrorMessage errorMsg;
//获取已有数据有效使用周期含当前时间的数据 //获取已有数据有效使用周期含当前时间的数据
Map<String, SysBaseSetInfo> socialSetInfoMap = this.getSysBaseSetInfoMap(CommonConstants.ZERO_STRING); Map<String, SysBaseSetInfo> socialSetInfoMap = this.getSysBaseSetInfoMap(CommonConstants.ZERO_STRING);
//获取已有数据有效状态的户配置 //获取已有数据有效状态的户配置
...@@ -1095,6 +1099,13 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -1095,6 +1099,13 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
private void importSysBaseSetFund(List<SysBaseSetFundInsertVo> excelVOList, List<ErrorMessage> errorMessageList) { private void importSysBaseSetFund(List<SysBaseSetFundInsertVo> excelVOList, List<ErrorMessage> errorMessageList) {
// 个性化校验逻辑
ErrorMessage errorMsg;
if (Common.isEmpty(excelVOList)){
errorMsg = new ErrorMessage(-1,"文档数据不可为空!",null);
errorMessageList.add(errorMsg);
return;
}
// 区域数据初始化 // 区域数据初始化
HashMap<String, String> areaMap = new HashMap<>(); HashMap<String, String> areaMap = new HashMap<>();
HashMap<String, Integer> areaMap2 = new HashMap<>(); HashMap<String, Integer> areaMap2 = new HashMap<>();
...@@ -1110,8 +1121,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper, ...@@ -1110,8 +1121,7 @@ public class SysBaseSetInfoServiceImpl extends ServiceImpl<SysBaseSetInfoMapper,
} }
} }
} }
// 个性化校验逻辑
ErrorMessage errorMsg;
//获取已有数据有效使用周期含当前时间的数据 //获取已有数据有效使用周期含当前时间的数据
Map<String, SysBaseSetInfo> fundSetInfoMap = this.getSysBaseSetInfoMap(CommonConstants.ONE_STRING); Map<String, SysBaseSetInfo> fundSetInfoMap = this.getSysBaseSetInfoMap(CommonConstants.ONE_STRING);
//获取已有数据有效状态的户配置 //获取已有数据有效状态的户配置
......
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