Merge branch 'develop' into feature-zhaji

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

@@ -720,10 +720,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				}
 			}
 			if (Common.isNotNull(excel.getProvidentHousehold())){
-				socialFund.setSettleDomain(setInfoVo.getId());
-				socialFund.setSettleDomainName(setInfoVo.getDepartName());
-				socialFund.setSettleDomainCode(setInfoVo.getDepartNo());
-				socialFund.setUnitName(setInfoVo.getCustomerName());
+				socialFund.setSettleDomainFund(setInfoVo.getId());
+				socialFund.setSettleDomainNameFund(setInfoVo.getDepartName());
+				socialFund.setSettleDomainCodeFund(setInfoVo.getDepartNo());
+				socialFund.setUnitNameFund(setInfoVo.getCustomerName());
 				socialFund.setUnitIdFund(setInfoVo.getCustomerId());
 				socialFund.setFundStatus(CommonConstants.ZERO_STRING);
 				socialFund.setProvidentStart(excel.getProvidentStart());
@@ -1410,11 +1410,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		签订期限：无固定期限    合同到期时间、合同期限非必填，合同开始时间必填；
 		签订期限：固定期限、已完成一定工作任务为期限    合同期限非必填，合同开始时间、合同到期时间都必填*/
 		if (Common.isNotNull(empVo)){
-			if (CommonConstants.ONE_STRING.equals(empVo.getProjectStatus())){
+			if (Common.isNotNull(empVo.getProjectStatus()) && empVo.getProjectStatus().intValue() == CommonConstants.ONE_INT){
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_PROJECT_NOT_USED)));
 				return true;
 			}
-			if (CommonConstants.ONE_STRING.equals(empVo.getFileStatus())){
+			if (Common.isNotNull(empVo.getFileStatus()) && empVo.getFileStatus().intValue() == CommonConstants.ONE_INT){
 				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_NOT_USED)));
 				return true;
 			}

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

@@ -1125,12 +1125,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		if (Common.isEmpty(tPreDispatchInfo.getPensionAddress())
 				&& Common.isEmpty(tPreDispatchInfo.getFundAddress())
 				&& CommonConstants.ZERO_STRING.equals(tPreDispatchInfo.getType())) {
-			return "派增的社保缴纳地与公积金缴纳地不可同时为空！";
+			return "派增的养老数据和公积金数据不能同时为空,请完善！";
 		}
 		if (Common.isEmpty(tPreDispatchInfo.getPensionAddressReduce())
 				&& Common.isEmpty(tPreDispatchInfo.getFundAddressReduce())
 				&& CommonConstants.ONE_STRING.equals(tPreDispatchInfo.getType())) {
-			return "派减的社保缴纳地与公积金缴纳地不可同时为空！";
+			return "派减的养老数据和公积金数据不能同时为空,请完善！";
 		}
 		return null;
 	}

yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml

@@ -118,8 +118,6 @@
                 a.SOCIAL_CREATE_MONTH,
                 a.LOCK_STATUS,
                 a.PUSH_STATUS,
-                a.SOCIAL_SETTLEMENT_FLAG,
-                a.FUND_SETTLEMENT_FLAG,
                 a.SUM_ALL,
                 a.PROVIDENT_PAY_MONTH,
                 a.PROVIDENT_CREATE_MONTH,
@@ -139,8 +137,6 @@
                 a.PROVIDENT_SUM,
                 a.SOCIAL_SETTLEMENT_ID,
                 a.FUND_SETTLEMENT_ID,
-                a.SALARY_SOCIAL_FLAG,
-                a.SALARY_FUND_FLAG,
                 a.INAUGURAL_TEAM,
                 a.TELECOM_NUMBER,
                 a.SORT_TIME,
@@ -225,8 +221,6 @@
         a.PROVIDENT_SUM,
         a.INAUGURAL_TEAM,
         a.TELECOM_NUMBER,
-        a.SALARY_SOCIAL_FLAG,
-        a.SALARY_FUND_FLAG,
 
         a.COMPANY_ACCRUAL,
         a.PERSONAL_ACCRUAL,