薪资特殊值，过滤劳务费、稿酬类型

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

@@ -332,12 +332,14 @@ public class SalaryAccountUtil implements Serializable {
 									+ CommonConstants.DOWN_LINE_STRING + salaryType + CommonConstants.DOWN_LINE_STRING + relaySalary) != null) {
 								entity.setIsRepeat(CommonConstants.ONE_INT);
 							}
+							if (!CommonConstants.THREE_STRING.equals(salaryType) && !CommonConstants.FOUR_STRING.equals(salaryType)) {
 								relaySalarySum = BigDecimalUtils.safeAdd(relaySalary, specialMap.get(entity.getEmpIdcard()));
 								if (money3500.compareTo(relaySalarySum) == CommonConstants.ZERO_INT
 										|| money5000.compareTo(relaySalarySum) == CommonConstants.ZERO_INT) {
 									entity.setHaveSpecialFlag(CommonConstants.ONE_INT);
 								}
 							}
+						}
 						if (actualSalarySum != null) {
 							actualSalarySum = actualSalarySum.setScale(2, BigDecimal.ROUND_HALF_UP);
 							if (!checkMap.isEmpty() && checkMap.get(entity.getEmpIdcard() + CommonConstants.DOWN_LINE_STRING + DateUtil.addMonth(configSalary.getSalaryMonth())

yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

@@ -269,6 +269,7 @@
 		left join t_salary_standard s on a.SALARY_FORM_ID = s.id
 		left join t_salary_account_item relaySalary on relaySalary.SALARY_ACCOUNT_ID = a.id and relaySalary.JAVA_FIED_NAME='relaySalary'
 		where a.DELETE_FLAG = 0 and s.UNIT_ID = #{unitId} and a.SALARY_MONTH = #{salaryMonth} and a.INVOICE_TITLE = #{invoiceTitle}
+		and a.FORM_TYPE !='3' and a.FORM_TYPE !='4'
 		group by a.EMP_IDCARD
 	</select>