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,

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

@@ -771,202 +771,6 @@
 		where id = #{id}
 	</update>
 
-	<update id="updateBatchPreDispatchById" parameterType="com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo">
-		update t_pre_dispatch_info
-		<trim prefix="SET" suffixOverrides=",">
-			<if test="date != null ">date = #{date},</if>
-			<if test="company != null  and company != ''">company = #{company},</if>
-			<if test="payAddress != null  and payAddress != ''">pay_address = #{payAddress},</if>
-			<if test="customerName != null  and customerName != ''">customer_name = #{customerName},</if>
-			<if test="empName != null  and empName != ''">emp_name = #{empName},</if>
-			<if test="empIdcard != null  and empIdcard != ''">emp_idcard = #{empIdcard},</if>
-			<if test="telOne != null  and telOne != ''">tel_one = #{telOne},</if>
-			<if test="telTwo != null  and telTwo != ''">tel_two = #{telTwo},</if>
-			<if test="entryDate != null ">entry_date = #{entryDate},</if>
-			<if test="formalSalary != null and formalSalary != ''">formal_salary = #{formalSalary},</if>
-			<if test="dispatchStart != null  and dispatchStart != ''">dispatch_start = #{dispatchStart},</if>
-			<if test="dispatchEnd != null  and dispatchEnd != ''">dispatch_end = #{dispatchEnd},</if>
-			<if test="contractType != null  and contractType != ''">contract_type = #{contractType},</if>
-			<if test="contractStart != null  and contractStart != ''">contract_start = #{contractStart},</if>
-			<if test="contractEnd != null  and contractEnd != ''">contract_end = #{contractEnd},</if>
-			<if test="contractNameAdd != null  and contractNameAdd != ''">
-				contract_name_add = #{contractNameAdd},
-			</if>
-			<if test="contractTypeAdd != null  and contractTypeAdd != ''">
-				contract_type_add = #{contractTypeAdd},
-			</if>
-			<if test="contractStartAdd != null  and contractStartAdd != ''">
-				contract_start_add = #{contractStartAdd},
-			</if>
-			<if test="contractEndAdd != null  and contractEndAdd != ''">
-				contract_end_add = #{contractEndAdd},
-			</if>
-			<if test="contractTermAdd != null  and contractTermAdd != ''">
-				contract_term_add = #{contractTermAdd},
-			</if>
-
-			<if test="contractNameAdd == null  or contractNameAdd == ''">
-				contract_name_add = null,
-			</if>
-			<if test="contractTypeAdd == null  or contractTypeAdd == ''">
-				contract_type_add = null,
-			</if>
-			<if test="contractStartAdd == null  or contractStartAdd == ''">
-				contract_start_add = null,
-			</if>
-			<if test="contractEndAdd == null  or contractEndAdd == ''">
-				contract_end_add = null,
-			</if>
-			<if test="contractTermAdd == null  or contractTermAdd == ''">
-				contract_term_add = null,
-			</if>
-			<if test="trialStart != null  and trialStart != ''">trial_start = #{trialStart},</if>
-			<if test="trialEnd != null  and trialEnd != ''">trial_end = #{trialEnd},</if>
-			<if test="trialSalary != null and  trialSalary !='' ">trial_salary = #{trialSalary},</if>
-			<if test="workingSystem != null  and workingSystem != ''">working_system = #{workingSystem},</if>
-			<if test="contractVersion != null  and contractVersion != ''">contract_version = #{contractVersion},</if>
-			<if test="telNotice != null  and telNotice != ''">tel_notice = #{telNotice},</if>
-			<if test="workingAddress != null  and workingAddress != ''">working_address = #{workingAddress},</if>
-			<if test="remarkOne != null  and remarkOne != ''">remark_one = #{remarkOne},</if>
-			<if test="remarkTwo != null  and remarkTwo != ''">remark_two = #{remarkTwo},</if>
-			<if test='type == "0"'>
-				<if test="pensionAddress != null  and pensionAddress != ''">
-					pension_address = #{pensionAddress},
-					<if test="socialProvince != null  and socialProvince != ''">social_province = #{socialProvince},</if>
-					<if test="socialCity != null  and socialCity != ''">social_city = #{socialCity},</if>
-					<if test="socialTown != null  and socialTown != ''">social_town = #{socialTown},</if>
-				</if>
-				<if test='pensionAddress == null || pensionAddress == ""'>
-					pension_address = null,
-					social_province = null,
-					social_city = null,
-					social_town = null,
-				</if>
-				<if test="fundAddress != null  and fundAddress != ''">
-					fund_address = #{fundAddress},
-					<if test="fundProvince != null  and fundProvince != ''">
-						fund_province = #{fundProvince},
-						<if test="fundCity == null">fund_city = null,</if>
-						<if test="fundTown == null">fund_town = null,</if>
-					</if>
-					<if test="fundCity != null  and fundCity != ''">fund_city = #{fundCity},</if>
-					<if test="fundTown != null  and fundTown != ''">fund_town = #{fundTown},</if>
-				</if>
-				<if test='fundAddress == null || fundAddress == ""'>
-					fund_address = null,
-					fund_province = null,
-					fund_city = null,
-					fund_town = null,
-				</if>
-			</if>
-			<if test='type == "1"'>
-				<if test="pensionAddressReduce != null  and pensionAddressReduce != ''">
-					pension_address_reduce = #{pensionAddressReduce},
-					pension_address = #{pensionAddressReduce},
-					<if test="socialProvince != null  and socialProvince != ''">social_province = #{socialProvince},</if>
-					<if test="socialCity != null  and socialCity != ''">social_city = #{socialCity},</if>
-					<if test="socialTown != null  and socialTown != ''">social_town = #{socialTown},</if>
-				</if>
-				<if test='pensionAddressReduce == null || pensionAddressReduce ==""'>
-					pension_address_reduce = null,
-					pension_end_reduce = null,
-					pension_address = null,
-					social_province = null,
-					social_city = null,
-					social_town = null,
-				</if>
-				<if test="fundAddressReduce != null  and fundAddressReduce != ''">
-					fund_address_reduce = #{fundAddressReduce},
-					fund_address = #{fundAddressReduce},
-					<if test="fundProvince != null  and fundProvince != ''">
-						fund_province = #{fundProvince},
-						<if test="fundCity == null">fund_city = null,</if>
-						<if test="fundTown == null">fund_town = null,</if>
-					</if>
-					<if test="fundCity != null  and fundCity != ''">fund_city = #{fundCity},</if>
-					<if test="fundTown != null  and fundTown != ''">fund_town = #{fundTown},</if>
-
-				</if>
-
-				<if test='fundAddressReduce == null || fundAddressReduce == ""'>
-					fund_address_reduce = null,
-					fund_address = null,
-					fund_end_reduce = null,
-					fund_province = null,
-					fund_city = null,
-					fund_town = null,
-				</if>
-			</if>
-			<if test="pensionBase != null ">pension_base = #{pensionBase},</if>
-			<if test="pensionStart != null  and pensionStart != ''">pension_start = #{pensionStart},</if>
-			<if test="medicalAddress != null  and medicalAddress != ''">medical_address = #{medicalAddress},</if>
-			<if test="medicalBase != null ">medical_base = #{medicalBase},</if>
-			<if test="medicalStart != null  and medicalStart != ''">medical_start = #{medicalStart},</if>
-			<if test="injuryAddress != null  and injuryAddress != ''">injury_address = #{injuryAddress},</if>
-			<if test="injuryBase != null ">injury_base = #{injuryBase},</if>
-			<if test="injuryStart != null  and injuryStart != ''">injury_start = #{injuryStart},</if>
-			<if test="birthAddress != null  and birthAddress != ''">birth_address = #{birthAddress},</if>
-			<if test="birthBase != null ">birth_base = #{birthBase},</if>
-			<if test="birthStart != null  and birthStart != ''">birth_start = #{birthStart},</if>
-			<if test="unemploymentAddress != null  and unemploymentAddress != ''">unemployment_address = #{unemploymentAddress},</if>
-			<if test="unemploymentBase != null ">unemployment_base = #{unemploymentBase},</if>
-			<if test="unemploymentStart != null  and unemploymentStart != ''">unemployment_start = #{unemploymentStart},</if>
-			<if test="pensionBase == null ">pension_base = null,</if>
-			<if test="pensionStart == null">pension_start = null,</if>
-			<if test="medicalAddress == null  or medicalAddress == ''">medical_address = null,</if>
-			<if test="medicalBase == null ">medical_base = null,</if>
-			<if test="medicalStart == null">medical_start = null,</if>
-			<if test="injuryAddress == null or injuryAddress == ''">injury_address = null,</if>
-			<if test="injuryBase == null ">injury_base = null,</if>
-			<if test="injuryStart == null">injury_start = null,</if>
-			<if test="birthAddress == null or birthAddress == ''">birth_address = null,</if>
-			<if test="birthBase == null ">birth_base = null,</if>
-			<if test="birthStart == null">birth_start = null,</if>
-			<if test="unemploymentAddress == null or unemploymentAddress == ''">unemployment_address = null,</if>
-			<if test="unemploymentBase == null ">unemployment_base = null,</if>
-			<if test="unemploymentStart == null">unemployment_start = null,</if>
-			<if test="fundBase != null ">fund_base = #{fundBase},</if>
-			<if test="fundStart != null  and fundStart != ''">fund_start = #{fundStart},</if>
-			<if test="fundPersonalPer != null ">fund_personal_per = #{fundPersonalPer},</if>
-			<if test="fundCompanyPer != null ">fund_company_per = #{fundCompanyPer},</if>
-			<if test="fundBase == null ">fund_base = null,</if>
-			<if test="fundStart == null">fund_start = null,</if>
-			<if test="fundPersonalPer == null ">fund_personal_per = null,</if>
-			<if test="fundCompanyPer == null ">fund_company_per = null,</if>
-			<if test="dispatchCompany != null  and dispatchCompany != ''">dispatch_company = #{dispatchCompany},</if>
-			<if test="customerService != null  and customerService != ''">customer_service = #{customerService},</if>
-			<if test="contractMinorName != null  and contractMinorName != ''">contract_minor_name = #{contractMinorName},</if>
-			<if test="uniqueNumber != null  and uniqueNumber != ''">unique_number = #{uniqueNumber},</if>
-			<if test="customerNumber != null  and customerNumber != ''">customer_number = #{customerNumber},</if>
-			<if test="serviceType != null  and serviceType != ''">service_type = #{serviceType},</if>
-			<if test="pensionEndReduce != null  and pensionEndReduce != ''">pension_end_reduce = #{pensionEndReduce},</if>
-			<if test="medicalAddressReduce != null  and medicalAddressReduce != ''">medical_address_reduce = #{medicalAddressReduce},</if>
-			<if test="medicalEndReduce != null  and medicalEndReduce != ''">medical_end_reduce = #{medicalEndReduce},</if>
-			<if test="injuryAddressReduce != null  and injuryAddressReduce != ''">injury_address_reduce = #{injuryAddressReduce},</if>
-			<if test="injuryEndReduce != null  and injuryEndReduce != ''">injury_end_reduce = #{injuryEndReduce},</if>
-			<if test="birthAddressReduce != null  and birthAddressReduce != ''">birth_address_reduce = #{birthAddressReduce},</if>
-			<if test="birthEndReduce != null  and birthEndReduce != ''">birth_end_reduce = #{birthEndReduce},</if>
-			<if test="unemploymentAddressReduce != null  and unemploymentAddressReduce != ''">unemployment_address_reduce = #{unemploymentAddressReduce},</if>
-			<if test="unemploymentEndReduce != null  and unemploymentEndReduce != ''">unemployment_end_reduce = #{unemploymentEndReduce},</if>
-			<if test="fundEndReduce != null  and fundEndReduce != ''">fund_end_reduce = #{fundEndReduce},</if>
-			<if test="leaveDate != null ">leave_date = #{leaveDate},</if>
-			<if test="leaveReason != null  and leaveReason != ''">leave_reason = #{leaveReason},</if>
-			<if test="leaveReasonAdd != null  and leaveReasonAdd != ''">leave_reason_add = #{leaveReasonAdd},</if>
-			<if test="empTypeAdd != null  and empTypeAdd != ''">emp_type_add = #{empTypeAdd},</if>
-			<if test="unitIdAdd != null  and unitIdAdd != ''">unit_id_add = #{unitIdAdd},</if>
-			<if test="departIdAdd != null  and departIdAdd != ''">depart_id_add = #{departIdAdd},</if>
-			<if test="socialHouseAdd != null  and socialHouseAdd != ''">social_house_add = #{socialHouseAdd},</if>
-			<if test="fundHouseAdd != null  and fundHouseAdd != ''">fund_house_add = #{fundHouseAdd},</if>
-			<if test="preStatus != null  and preStatus != ''">pre_status = #{preStatus},</if>
-			<if test="status != null  and status != ''">status = #{status},</if>
-			<if test="exceptionContent != null">exception_content = #{exceptionContent},</if>
-			<if test="dataSubStatus != null  and dataSubStatus != ''">data_sub_status = #{dataSubStatus},</if>
-			<if test="remark != null  and remark != ''">remark = #{remark},</if>
-			<if test="dispatchFlag != null  and dispatchFlag != ''">dispatch_flag = #{dispatchFlag},</if>
-			<if test="cancelRemark != null  and cancelRemark != ''">cancel_remark = #{cancelRemark},</if>
-		</trim>
-		where id = #{id}
-	</update>
 	<!-- 批量更新资料提交状态-->
 	<update id="modifyDataSubmitStatus">
 		update t_pre_dispatch_info