Merge remote-tracking branch 'origin/MVP1.5.3' into MVP1.5.3

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java

@@ -428,6 +428,10 @@ public interface ErrorCodes {
 	 * 派减异常： 本次派增已存在对应身份证号的派减记录
 	 */
 	String EMP_DISPATCH_REDUCE_EXISTS = "emp.dispatch.reduce.exists";
+	/**
+	 * 无可派单项，请确认后再次操作
+	 */
+	String EMP_DISPATCH_ITEM_EMPTY_EXISTS = "emp.dispatch.item.empty.exists";
 	/**
 	 * 当前社保导入队列不足或者数据量过大，请稍后重试！
 	 */

yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties

@@ -156,6 +156,8 @@ emp.dispatch.reduce.exists=\u6D3E\u51CF\u5F02\u5E38\uFF1A \u672C\u6B21\u6D3E\u58
 
 socialinfo.list.num.large=\u5F53\u524D\u793E\u4FDD\u5BFC\u5165\u961F\u5217\u4E0D\u8DB3\u6216\u8005\u6570\u636E\u91CF\u8FC7\u5927\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\uFF01
 
+emp.dispatch.item.empty.exists=\u65E0\u53EF\u6D3E\u5355\u9879\uFF0C\u8BF7\u786E\u8BA4\u540E\u518D\u6B21\u64CD\u4F5C
+
 emp.dispatch.social.diy.not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A \u793E\u4FDD\u201C\u7F34\u7EB3\u7C7B\u578B\u201D\u4E3A\u201C\u81EA\u5B9A\u4E49\u201D\uFF0C\u5404\u9669\u79CD\u57FA\u6570\u76F8\u540C\uFF0C\u8BF7\u586B\u5199\u201C\u517B\u8001\u57FA\u6570\u201D\uFF0C\u5982\u57FA\u6570\u4E0D\u540C\uFF0C\u5219\u6240\u6709\u9669\u79CD\u57FA\u6570\u90FD\u9700\u586B\u5199
 
 emp.dispatch.social.diy.medical_not.empty=\u6D3E\u589E\u5F02\u5E38\uFF1A  \u81EA\u5B9A\u4E49\u7F34\u7EB3\u517B\u8001\u57FA\u6570\u548C\u517B\u8001\u8D77\u7F34\u65E5\u671F\u4E0D\u53EF\u4E3A\u7A7A

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java

@@ -302,14 +302,14 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	**/
     IPage<TBusinessInsuranceVo> getInsuranceExpireWarnVoPage(Page<TBusinessInsuranceVo> page,
 															 @Param("param")InsuranceSearchVo param,
-															 @Param("domains")List<TSettleDomainSelectVo> domains);
+															 @Param("domains")List<String> domains);
 	List<TBusinessInsuranceVo> pageDiy(@Param("param")InsuranceSearchVo searchVo,
-									   @Param("domains")List<TSettleDomainSelectVo> domains);
+									   @Param("domains")List<String> idList);
 
 	List<InsuranceWarnExportVo> noPageDiy(@Param("param")InsuranceSearchVo searchVo,
-										  @Param("domains")List<TSettleDomainSelectVo> listSelectVO);
+										  @Param("domains")List<String> idList);
 
-	int noPageCountDiy(@Param("param")InsuranceSearchVo searchVo, @Param("domains")List<TSettleDomainSelectVo> listSelectVO);
+	int noPageCountDiy(@Param("param")InsuranceSearchVo searchVo, @Param("domains")List<String> idList);
 
 	void batchexpireIgnore(@Param("idList")List<String> idList);
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -7642,7 +7642,6 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			condition.setInsuranceCitys(citys);
 		}
 		IPage<TBusinessInsuranceVo> recordsPage = new Page<>();
-		recordsPage.setTotal(baseMapper.noPageCountDiy(condition,null));
 		int limitStart = (int)(page.getCurrent()-1)*(int)page.getSize();
 		int limitEnd = (int)page.getSize();
 		condition.setLimitStart(limitStart);
@@ -7651,9 +7650,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		recordsPage.setPages(page.getPages());
 		recordsPage.setSize(page.getSize());
 		recordsPage.setCurrent(page.getCurrent());
-		if (Common.isNotNull(sdRes) && Common.isNotNull(sdRes.getData())) {
-			recordsPage.setRecords(baseMapper.pageDiy(condition, sdRes.getData().getListSelectVO()));
+		if (Common.isNotNull(sdRes) && Common.isNotNull(sdRes.getData()) && Common.isNotNull(sdRes.getData().getDeptIds())) {
+			recordsPage.setTotal(baseMapper.noPageCountDiy(condition,sdRes.getData().getDeptIds()));
+			recordsPage.setRecords(baseMapper.pageDiy(condition, sdRes.getData().getDeptIds()));
 		}else {
+			recordsPage.setTotal(baseMapper.noPageCountDiy(condition,null));
 			recordsPage.setRecords(baseMapper.pageDiy(condition, null));
 		}
 		return recordsPage;
@@ -7932,18 +7933,16 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 	}
 
 	private List<InsuranceWarnExportVo> noPageDiy(InsuranceSearchVo searchVo) {
-		List<TSettleDomainSelectVo> listSelectVO =null;
-		listSelectVO = getExportCondition(searchVo, listSelectVO);
-		return baseMapper.noPageDiy(searchVo,listSelectVO);
+		List<String> domainIds = getExportCondition(searchVo);
+		return baseMapper.noPageDiy(searchVo,domainIds);
 	}
 
 	private int noPageCountDiy(InsuranceSearchVo searchVo) {
-		List<TSettleDomainSelectVo> listSelectVO =null;
-		listSelectVO = getExportCondition(searchVo, listSelectVO);
-		return baseMapper.noPageCountDiy(searchVo,listSelectVO);
+		List<String> domainIds = getExportCondition(searchVo);
+		return baseMapper.noPageCountDiy(searchVo,domainIds);
 	}
 
-	private List<TSettleDomainSelectVo> getExportCondition(InsuranceSearchVo searchVo, List<TSettleDomainSelectVo> listSelectVO) {
+	private List<String> getExportCondition(InsuranceSearchVo searchVo) {
 		YifuUser user = SecurityUtils.getUser();
 		R<TSettleDomainListVo >  sdRes = archivesDaprUtil.getPermissionByUserId(user.getId());
 		List<TInsuranceAreaRes> areaRes = insuranceAreaResMapper.selectList(Wrappers.<TInsuranceAreaRes>query().lambda()
@@ -7963,15 +7962,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 		searchVo.setCreateBy(SecurityUtils.getUser().getId());
 		if (Common.isNotNull(sdRes) && Common.isNotNull(sdRes.getData())){
-			listSelectVO = sdRes.getData().getListSelectVO();
+			return  sdRes.getData().getDeptIds();
 		}
-		return listSelectVO;
+		return null;
 	}
 	@Override
 	public R<Integer> getExpireInsuranceWarn() {
 		InsuranceSearchVo searchVo = new InsuranceSearchVo();
-		List<TSettleDomainSelectVo> listSelectVO =null;
-		listSelectVO = getExportCondition(searchVo, listSelectVO);
-		return R.ok(baseMapper.noPageCountDiy(searchVo,listSelectVO));
+		List<String> domainIds =  getExportCondition(searchVo);
+		return R.ok(baseMapper.noPageCountDiy(searchVo,domainIds));
 	}
 }

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/SocialHandleExportVo.java

@@ -194,7 +194,7 @@ public class SocialHandleExportVo implements Serializable {
 	@Schema(description = "合同年限")
 	@HeadFontStyle(fontHeightInPoints = 11)
 	@ExcelProperty("合同年限" )
-	private Double contractTerm;
+	private String contractTerm;
 	/**
 	 * 合同起始时间
 	 */

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -575,7 +575,15 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			}
 			// 新增派单信息
 			excel.setOrderId(orderId);
-			initDispatchAddInfo(user, dispatchMap, empVo, socialSet, fundSet, excel,socialFund,injury);
+			if (initDispatchAddInfo(user, dispatchMap, empVo, socialSet, fundSet, excel,socialFund,injury)){
+				excelVOTemp.put(excel.getRowIndex().toString(),excel.getEmpIdcard());
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_ITEM_EMPTY_EXISTS)));
+				continue;
+			}
+			if (Common.isNotNull(dispatchMap.get(excel.getEmpIdcard())) && "公积金".equals(dispatchMap.get(excel.getEmpIdcard()).getDispatchItem())){
+				socialsMap.remove(excel.getEmpIdcard());
+				excel.setSocialHousehold(null);
+			}
 			// 变更社保公积金查询
 			initSocialFundAddInfo(socialFundAddMap, empVo, socialSet, fundSet, setInfoVo, socialFund, excel);
 		}
@@ -688,6 +696,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						if (Common.isNotNull(social)){
 							dispatch.setSocialId(social.getId());
 							dispatch.setSocialHouseholdName(social.getSocialHouseholdName());
+							dispatch.setFirstBuyMonthSocial(getFirstBuyMonthSocial(social));
 						}
 						if (Common.isNotNull(fund)){
 							dispatch.setFundId(fund.getId());
@@ -699,13 +708,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 						if (Common.isNotNull(project)){
 							dispatch.setEmpNo(project.getEmpNo());
 						}
-					}
-					dispatch.setFirstBuyMonthSocial(getFirstBuyMonthSocial(social));
 						insertDispatch(emp, dispatch);
 						// 新增派单申请提交记录
 						auditInfo = new TAuditInfo();
 						addAuditInfo(dispatch, auditInfo);
 					}
+				}
 				//  插入或更新社保公积金查询信息  大病在封装社保的时候已经算了 大病技术和金额了
 				if (Common.isNotNull(socialFundAddMap)){
 					socialFund = socialFundAddMap.get(excel.getEmpIdcard());
@@ -1185,7 +1193,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		int num = 3 - nowNums.length();
 		return zeroArr[num] + nowNums;
 	}
-		private void initDispatchAddInfo(YifuUser user,
+		private boolean initDispatchAddInfo(YifuUser user,
 										 Map<String, TDispatchInfo> dispatchMap,
 										 DispatchEmpVo empVo,
 										 SysBaseSetInfo socialSet,
@@ -1197,6 +1205,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		// 初始化派单项
 		dispatch.setOrderId(excel.getOrderId());
 		initAddHandleItem(excel, socialFund,dispatch,socialSet,injury);
+		if (Common.isEmpty(dispatch.getDispatchItem())){
+			return true;
+		}
 		dispatch.setOrganName(user.getDeptName());
 		dispatch.setCreateBy(user.getId());
 		dispatch.setCreateTime(LocalDateTime.now());
@@ -1216,7 +1227,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		dispatch.setSettleDomainName(excel.getDepartName());
 		dispatch.setSettleDomainCode(excel.getSettleDomainCode());
 		dispatch.setSettleDomain(excel.getSettleDomainId());
-		if (Common.isNotNull(excel.getSocialHousehold())){
+		if (Common.isNotNull(excel.getSocialHousehold()) && !"公积金".equals(dispatch.getDispatchItem())){
 			dispatch.setSocialHandleStatus(CommonConstants.ZERO_STRING);
 		}
 		if (Common.isNotNull(excel.getProvidentHousehold())){
@@ -1288,6 +1299,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		dispatch.setApplyNo(getApplyCode());
 		dispatch.setPid(excel.getDispatchId());
 		dispatchMap.put(excel.getEmpIdcard(),dispatch);
+		return false;
 	}
 
 	private void initAddHandleItem(TDispatchImportVo excel, TSocialFundInfo socialFund, TDispatchInfo dispatch, SysBaseSetInfo socialSet, boolean injury) {
@@ -1964,6 +1976,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		contract.setSettleDomain(setInfoVo.getId());
 		contract.setDeptNo(setInfoVo.getDepartNo());
 		contract.setCustomerId(setInfoVo.getCustomerId());
+		contract.setUnitNo(setInfoVo.getCustomerCode());
 		contract.setSubjectUnit(setInfoVo.getCustomerName());
 		contract.setSubjectDepart(setInfoVo.getDepartName());
 		contract.setEmpNatrue(excel.getEmpType());
@@ -2728,6 +2741,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			excelVOTemp.put(excel.getRowIndex().toString(),excel.getEmpIdcard());
 			// 初始化派单 和 社保公积金查询信息
 			dispatch = getDispatchInfo(empVo, excel, socialFund,setInfoVo,user);
+			if (Common.isEmpty(dispatch.getDispatchItem())){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_ITEM_EMPTY_EXISTS)));
+				continue;
+			}
 			try {
 				dispatch.setOrderId(orderId);
 				dispatch.setApplyNo(getApplyCode());
@@ -4085,6 +4102,17 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 					|| CommonConstants.FOUR_STRING.equals(sf.getBigailmentHandle()))){
 				sf.setSocialStatus(CommonConstants.TWELVE_STRING);
 				sf.setSocialReduceStatus(CommonConstants.SIX_STRING);
+				sf.setSocialReduceDate(null);
+			}
+			if (CommonConstants.NINE_STRING.equals(sf.getSocialStatus()) &&
+					(CommonConstants.THREE_STRING.equals(sf.getPensionHandle())
+							|| CommonConstants.THREE_STRING.equals(sf.getMedicalHandle())
+							|| CommonConstants.THREE_STRING.equals(sf.getUnemployHandle())
+							|| CommonConstants.THREE_STRING.equals(sf.getWorkInjuryHandle())
+							|| CommonConstants.THREE_STRING.equals(sf.getBirthHandle())
+							|| CommonConstants.THREE_STRING.equals(sf.getBigailmentHandle()))){
+				sf.setSocialStatus(CommonConstants.TWELVE_STRING);
+				sf.setSocialReduceStatus(CommonConstants.SIX_STRING);
 			}
 		}
 		// 2.派增处理 socialType  社保拆分的每一项（1养老 2医疗 3失业 4工伤 5生育 6大病）