项目基本信息推送

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

@@ -940,7 +940,8 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		List<TSalaryAccountItem> backList = new ArrayList<>();
 		if (itemList != null && !itemList.isEmpty()) {
 			for (TSalaryAccountItem item : itemList) {
-				if ("4".equals(item.getFormType()) && settleMonth.equals(item.getSettlementMonth())) {
+				if (("3".equals(item.getFormType()) || "4".equals(item.getFormType()))
+						&& settleMonth.equals(item.getSettlementMonth())) {
 					backList.add(item);
 				}
 			}
@@ -1701,10 +1702,12 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		BigDecimal salaryTax = BigDecimal.ZERO;
 		if (CommonConstants.ONE_STRING.equals(a.getIsPersonTax())) {
 			nowTaxT = getNowTax(actualSalarySumNow);
-			if (actualSalarySum != actualSalarySumNow) {
+			if (actualSalarySum.compareTo(actualSalarySumNow) != 0) {
 				actualSalarySumT = BigDecimalUtils.safeAdd(nowTaxT, sumTax, actualSalarySum).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
 				nowTaxY = getNowTaxNew(actualSalarySumT);
 				salaryTax = BigDecimalUtils.safeSubtract(nowTaxY, BigDecimalUtils.safeAdd(nowTaxT, sumTax));
+			} else {
+				nowTaxY = nowTaxT;
 			}
 			relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxT).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
 
@@ -1715,10 +1718,10 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 			nowTaxY = getNowTax(actualSalarySum);
 			relaySalary = BigDecimalUtils.safeAdd(actualSalarySumNow, nowTaxY).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
 			a.setActualSalary(actualSalarySumNow);
+			a.setSalaryTaxUnit(nowTaxY);
 			if (sumTax.compareTo(BigDecimal.ZERO) != 0) {
 				nowTaxY = BigDecimalUtils.safeSubtract(nowTaxY, sumTax).setScale(SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP);
 			}
-			a.setSalaryTaxUnit(nowTaxY);
 		}
 		a.setRelaySalaryUnit(relaySalary);
 		a.setRelaySalary(actualSalarySumNow);
@@ -1729,11 +1732,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		sai.setIsTax(CommonConstants.ZERO_INT);
 		sai.setSalaryMoney(relaySalary);
 		saiList.add(sai);
-		if (CommonConstants.ONE_STRING.equals(a.getIsPersonTax())) {
-			return nowTaxT;
-		}else {
-			return nowTaxY;
-		}
+		return nowTaxY;
 	}
 
 	public static BigDecimal getNowTax(BigDecimal actualSalarySum) {
@@ -1988,3 +1987,4 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		return nowTax;
 	}
 }
+

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

@@ -304,6 +304,12 @@ public class SalaryAccountUtil implements Serializable {
 						errorList.add(new ErrorMessage((i + 2), error));
 						continue;
 					}
+					if ("3".equals(salaryType) && Common.isEmpty(entity.getIsPersonTax())) {
+						errorFlag = false;
+						error = "第" + (i + 2) + "行：【是否个人承担部分税费】列_不可为空";
+						errorList.add(new ErrorMessage((i + 2), error));
+						continue;
+					}
 					if ("4".equals(salaryType) && actualSalarySum == null) {
 						errorFlag = false;
 						error = "第" + (i + 2) + "行：【稿酬】列_不可缺少";
@@ -496,7 +502,11 @@ public class SalaryAccountUtil implements Serializable {
 								}
 								emp = newEmp;
 							} else {
-								error = "第" + (i + 2) + "行：薪酬人员查询处中，该客户下无此员工，请添加<是否新员工（默认否）>列，并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码！！";
+								if ("3".equals(salaryType) || "4".equals(salaryType)) {
+									error = "第" + (i + 2) + "行：薪酬人员查询处中，该客户下无此员工，请添加<是否新员工（默认否）>列，并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、手机号码！";
+								}else {
+									error = "第" + (i + 2) + "行：薪酬人员查询处中，该客户下无此员工，请添加<是否新员工（默认否）>列，并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码！";
+								}
 								errorList.add(new ErrorMessage((i + 2), error));
 								continue;
 							}
@@ -638,7 +648,11 @@ public class SalaryAccountUtil implements Serializable {
 								saiList.add(sai);
 							}
 						} else {
-							error = "第" + (i + 2) + "行：薪酬人员查询处中，该客户下无此员工，请添加<是否新员工（默认否）>列，并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码！";
+							if ("3".equals(salaryType) || "4".equals(salaryType)) {
+								error = "第" + (i + 2) + "行：薪酬人员查询处中，该客户下无此员工，请添加<是否新员工（默认否）>列，并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、手机号码！";
+							}else {
+								error = "第" + (i + 2) + "行：薪酬人员查询处中，该客户下无此员工，请添加<是否新员工（默认否）>列，并录入身份证号、开户行总行、开户行省、开户行市、银行卡号、计税月份、手机号码！";
+							}
 							errorList.add(new ErrorMessage((i + 2), error));
 							continue;
 						}