Commit 5916f848 by zhangxingmin

push

parent b9cae7e0
...@@ -25,4 +25,9 @@ public class ApiSalarySplitSummaryPageRequest extends PageDto { ...@@ -25,4 +25,9 @@ public class ApiSalarySplitSummaryPageRequest extends PageDto {
* 出账月-结束月份 * 出账月-结束月份
*/ */
private Integer endMonth; private Integer endMonth;
/**
* 出账机构
*/
private String billOrg;
} }
...@@ -48,7 +48,9 @@ ...@@ -48,7 +48,9 @@
<if test="request.endMonth != null"> <if test="request.endMonth != null">
and fa.fortune_account_date &lt; DATE_ADD(STR_TO_DATE(CONCAT(#{request.endMonth}, '01'), '%Y%m%d'), INTERVAL 1 MONTH) and fa.fortune_account_date &lt; DATE_ADD(STR_TO_DATE(CONCAT(#{request.endMonth}, '01'), '%Y%m%d'), INTERVAL 1 MONTH)
</if> </if>
<if test="request.billOrg != null and request.billOrg != ''">
and ss.bill_org like concat('%', #{request.billOrg}, '%')
</if>
and ss.is_deleted = 0 and ss.is_deleted = 0
</where> </where>
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment