代扣，只能金额

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

@@ -1686,7 +1686,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		BigDecimal nowTaxY;
 		BigDecimal relaySalary;
 		BigDecimal salaryTax = BigDecimal.ZERO;
-		if (SalaryConstants.IS_PERSON_TAX_ARR[0].equals(a.getIsPersonTax())) {
+		// 1个人承担部分
+		if (SalaryConstants.IS_PERSON_TAX_ARR[1].equals(a.getIsPersonTax())) {
 			nowTaxT = getNowTax(actualSalarySumNow);
 			if (actualSalarySum.compareTo(actualSalarySumNow) != 0) {
 				//计算历史税费
@@ -1708,7 +1709,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			a.setSalaryTax(salaryTax);
 			a.setSalaryTaxUnit(nowTaxT);
 			a.setActualSalary(BigDecimalUtils.safeSubtract(actualSalarySumNow, salaryTax));
-		} else if (SalaryConstants.IS_PERSON_TAX_ARR[1].equals(a.getIsPersonTax())) {
+		} else if (SalaryConstants.IS_PERSON_TAX_ARR[0].equals(a.getIsPersonTax())) {
+			// 0公司承担全部
 			nowTaxY = getNowTax(actualSalarySum);
 			a.setActualSalary(actualSalarySumNow);
 			if (sumSalaryTax.compareTo(BigDecimal.ZERO) != 0) {
@@ -1719,6 +1721,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			a.setSalaryTaxUnit(nowTaxY);
 			relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, RoundingMode.HALF_UP);
 		} else {
+			// 2个人承担全部
 
 			// TODO-@胡 ：个人承担全部税费，实发要变为应发，推算出实发、个税
 

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

@@ -237,6 +237,12 @@ 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();

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

@@ -142,8 +142,6 @@ public class SalaryConstants {
      public static final String ACTUAL_SALARY_SUM = "个人实发合计";
      //个人实发合计
      public static final String ACTUAL_SALARY_SUM_JAVA = "actualSalarySum";
-	 // 是否个人承担部分税费
-     public static final String IS_PERSON_TAX = "isPersonTax";
 	 // 是否个人承担部分税费数组
 	 public static final String IS_PERSON_TAX_ARR[] = {"0","1","2"};
 	 // 公司承担全部税费0