Merge branch 'develop' into feature-zhaji

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

@@ -963,7 +963,28 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		List<TSalaryAccountItem> backList = new ArrayList<>();
 		if (itemList != null && !itemList.isEmpty()) {
 			for (TSalaryAccountItem item : itemList) {
-				if (("3".equals(item.getFormType()) || "4".equals(item.getFormType()))
+				if (("3".equals(item.getFormType()))
+						&& settleMonth.equals(item.getSettlementMonth())) {
+					backList.add(item);
+				}
+			}
+		}
+		return backList;
+	}
+
+	/**
+	 * @param itemList
+	 * @param settleMonth
+	 * @Description: 循环获取符合条件的报账
+	 * @Author: hgw
+	 * @Date: 2022/1/27 17:32
+	 * @return: java.util.List<com.yifu.cloud.v1.hrms.api.entity.TSalaryAccountItem>
+	 **/
+	private List<TSalaryAccountItem> getRemuAsList(List<TSalaryAccountItem> itemList, String settleMonth) {
+		List<TSalaryAccountItem> backList = new ArrayList<>();
+		if (itemList != null && !itemList.isEmpty()) {
+			for (TSalaryAccountItem item : itemList) {
+				if (("4".equals(item.getFormType()))
 						&& settleMonth.equals(item.getSettlementMonth())) {
 					backList.add(item);
 				}
@@ -1871,9 +1892,9 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				}
 
 				//累计扣税list
-				asList = this.getLaborAsList(itemMap.get(a.getEmpIdcard()), a.getSettlementMonth());
+				asList = this.getRemuAsList(itemMap.get(a.getEmpIdcard()), a.getSettlementMonth());
 
-				// 实发劳务费，按月累计扣税
+				// 实发稿酬，按月累计扣税
 				this.saveNewItems(sai, saiList, SalaryConstants.SALARY_TAX,
 						SalaryConstants.SALARY_TAX_JAVA,
 						calculationRemu(saiList, asList
@@ -1955,12 +1976,6 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 				actualSalarySumNow = actualSalarySumNow.add(item.getSalaryMoney());
 			}
 		}
-		// 历史实发、个税
-		for (TSalaryAccountItem item : itemHistoryList) {
-			if (SalaryConstants.SALARY_TAX_JAVA.equals(item.getJavaFiedName())) {
-				sumTax = sumTax.add(item.getSalaryMoney());
-			}
-		}
 		//个人税费
 		BigDecimal nowTaxT = BigDecimal.ZERO;
 		BigDecimal relaySalary;
@@ -1971,9 +1986,6 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 		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);
-		}
 		// 本次个人应发合计
 		TSalaryAccountItem sai = new TSalaryAccountItem();
 		sai.setCnName(SalaryConstants.RELAY_SALARY);