Merge remote-tracking branch 'origin/master'

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

@@ -503,7 +503,9 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
 	 * @param minSalary 工资下限
 	 * @param maxAnualSalary 年终奖上限
 	 * @param wSalary   未发金额
+	 * @param ySalary    应发工资合计
 	 * @param sumTax    薪资扣税合计
+	 * @param twlSalaryTax 12月已发工资税费
 	 * @Description: 计算薪资扣税-个税
 	 * @Author: huyc
 	 * @Date: 2022/8/23

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

@@ -467,7 +467,7 @@
 			<if test="invoiceTitle != null and invoiceTitle.trim() != ''">
 				AND a.INVOICE_TITLE = #{invoiceTitle}
 			</if>
-			AND a.DELETE_FLAG = 0 and a.FORM_TYPE = 0
+			AND a.DELETE_FLAG = 0 and a.FORM_TYPE in ('0','1','2')
 		</where>
 	</select>
 	<select id="getSumByAccountId" resultType="java.util.Map">