稿酬导入修改

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -1967,9 +1967,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 
 		nowTaxT = getNowTaxRemu(actualSalarySumNow);
 		relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxT).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
-		a.setSalaryTaxUnit(nowTaxT);
-		a.setActualSalary(actualSalarySumNow);
-		a.setRelaySalaryUnit(relaySalary);
+		a.setSalaryTax(nowTaxT);
+		a.setActualSalary(relaySalary);
+		a.setRelaySalaryUnit(actualSalarySumNow);
 		a.setRelaySalary(actualSalarySumNow);
 		if (sumTax.compareTo(BigDecimal.ZERO) != 0) {
 			nowTaxT = BigDecimalUtils.safeSubtract(nowTaxT, sumTax).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
@@ -1979,7 +1979,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		sai.setCnName(SalaryConstants.RELAY_SALARY);
 		sai.setJavaFiedName(SalaryConstants.RELAY_SALARY_JAVA);
 		sai.setIsTax(CommonConstants.ZERO_INT);
-		sai.setSalaryMoney(relaySalary);
+		sai.setSalaryMoney(actualSalarySumNow);
 		saiList.add(sai);
 		return nowTaxT;
 	}

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

@@ -200,8 +200,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 			return R.failed("已推送至结算平台禁止删除！");
 		}
 
-		if (CommonConstants.TWO_STRING.equals(paymentInfo.getSalaryFundFlag()) ||
-				CommonConstants.TWO_STRING.equals(paymentInfo.getSalarySocialFlag())) {
+		if (CommonConstants.ONE_STRING.equals(paymentInfo.getSalaryFundFlag()) ||
+				CommonConstants.ONE_STRING.equals(paymentInfo.getSalarySocialFlag())) {
 			return R.failed("该数据已与薪资结算，禁止删除");
 		}
 		baseMapper.deleteById(id);
@@ -225,8 +225,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
 						CommonConstants.ZERO_STRING.equals(paymentInfo.getPushStatus())) {
 					return R.failed("存在不符合条件的数据(已推送至结算平台或非本人创建),禁止删除！");
 				}
-				if (CommonConstants.TWO_STRING.equals(paymentInfo.getSalaryFundFlag()) ||
-						CommonConstants.TWO_STRING.equals(paymentInfo.getSalarySocialFlag())) {
+				if (CommonConstants.ONE_STRING.equals(paymentInfo.getSalaryFundFlag()) ||
+						CommonConstants.ONE_STRING.equals(paymentInfo.getSalarySocialFlag())) {
 					return R.failed("存在不符合条件的数据(已与薪资结算)，禁止删除");
 				}
 				baseMapper.deleteById(id);

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

@@ -2258,6 +2258,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		importVo.setWorkingHours(preInfo.getWorkingHoursAdd());
 		importVo.setEmpNational(CommonConstants.ONE_STRING);
 		importVo.setEducationName(CommonConstants.FIVE_STRING);
+		importVo.setTrustRemark("预派单");
 		if (null != preInfo.getPensionBase()){
 			importVo.setRecordBase(preInfo.getPensionBase());
 		}