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

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

@@ -1776,12 +1776,16 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		} else {
 			// 2个人承担全部
-
-			// TODO-@胡 ：个人承担全部税费，实发要变为应发，推算出实发、个税
-
-			nowTaxY = BigDecimal.ZERO;
-			relaySalary = a.getActualSalary();
-
+			//个人承担全部税费，实发要变为应发，推算出实发、个税
+			nowTaxY = getNowTax(actualSalarySum);
+			if (sumOtherTax.compareTo(BigDecimal.ZERO) != 0) {
+				//历史应发税费
+				nowTaxY = BigDecimalUtils.safeSubtract(false,nowTaxY, sumOtherTax).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
+			}
+			//公司应发和个人实收
+			relaySalary = BigDecimalUtils.safeSubtract(false,actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
+			a.setActualSalary(relaySalary);
+			a.setSalaryTax(nowTaxY);
 		}
 		a.setRelaySalaryUnit(relaySalary);
 		a.setRelaySalary(actualSalarySumNow);

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -13,7 +13,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TConfigSalary;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryConfigStandard;
 import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryEmployee;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryStandardIssueRes;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryAccountService;
 import com.yifu.cloud.plus.v1.yifu.salary.service.TSalaryEmployeeService;
 import com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryUploadParamVo;
@@ -247,12 +246,6 @@ public class SalaryAccountUtil implements Serializable {
 								salaryGiveTimeFlag = false;
 								entity.setSalaryGiveTime(CommonConstants.ONE_STRING);
 							}
-							if (SalaryConstants.IS_PERSON.equals(cellValueStr)) {
-								errorFlag = false;
-								error = "第" + (i + 2) + "行：个人承担全部税费，正在开发中，下周见~";
-								errorList.add(new ErrorMessage((i + 2), error));
-								continue;
-							}
 							field = fieldsMap.get(scs.getJavaFiedName());
 							if (field == null) {
 								sai = new TSalaryAccountItemVo();