员工报账查询&批量导出&审核人导出最终版-fxj

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

@@ -77,7 +77,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
 	 */
 	@Override
 	public R<Boolean> saveInfo(SysHouseHoldInfo sysHouseHoldInfo) {
-
+		//户名称去空格
+		sysHouseHoldInfo.setName(sysHouseHoldInfo.getName().replace(" ",""));
 		SysHouseHoldInfo info = this.getOne(Wrappers.<SysHouseHoldInfo>query().lambda()
 					.eq(SysHouseHoldInfo::getType,sysHouseHoldInfo.getType())
 					.eq(SysHouseHoldInfo::getName,sysHouseHoldInfo.getName())
@@ -131,6 +132,8 @@ public class SysHouseHoldInfoServiceImpl extends ServiceImpl<SysHouseHoldInfoMap
 	**/
 	@Override
 	public R<Boolean> updateByIdAsso(SysHouseHoldInfo hold) {
+		//户名称去空格
+		hold.setName(hold.getName().replace(" ",""));
 		if (Common.isEmpty(hold.getId())){
 			return  R.failed(CommonConstants.PARAM_INFO_ERROR);
 		}

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

@@ -3249,6 +3249,22 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_REDUCE_SOCIAL_STATUS_ERROR)));
 				return true;
 			}
+			//派减部分办理失败需要额外判断是否有办理成功的项可供派减;明细项办理状态：0待办理1办理成功2办理失败3已派减4派减失败5派减待办理
+			if (!CommonConstants.ONE_STRING.equals(socialFund.getPensionHandle())
+					&&!CommonConstants.FOUR_STRING.equals(socialFund.getPensionHandle())
+					&&!CommonConstants.ONE_STRING.equals(socialFund.getMedicalHandle())
+					&&!CommonConstants.FOUR_STRING.equals(socialFund.getMedicalHandle())
+					&&!CommonConstants.ONE_STRING.equals(socialFund.getWorkInjuryHandle())
+					&&!CommonConstants.FOUR_STRING.equals(socialFund.getWorkInjuryHandle())
+					&&!CommonConstants.ONE_STRING.equals(socialFund.getBirthHandle())
+					&&!CommonConstants.FOUR_STRING.equals(socialFund.getBirthHandle())
+					&&!CommonConstants.ONE_STRING.equals(socialFund.getBigailmentHandle())
+					&&!CommonConstants.FOUR_STRING.equals(socialFund.getBigailmentHandle())
+					&&!CommonConstants.ONE_STRING.equals(socialFund.getUnemployHandle())
+					&&!CommonConstants.FOUR_STRING.equals(socialFund.getUnemployHandle())){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_REDUCE_SOCIAL_STATUS_ERROR)));
+				return true;
+			}
 			if (!excel.getDepartNo().equals(socialFund.getSettleDomainCode())){
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_REDUCE_SOCIAL_DEPARTNO_ERROR)));
 				return true;