Commit 6fd075da by zhangxingmin

push

parent d117e280
...@@ -20,4 +20,9 @@ public class ApiSalaryPageRequest extends PageDto { ...@@ -20,4 +20,9 @@ public class ApiSalaryPageRequest extends PageDto {
* 薪资单状态:1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消 * 薪资单状态:1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
*/ */
private String status; private String status;
/**
* 发放编号
*/
private String salaryNo;
} }
...@@ -20,4 +20,9 @@ public class ApiSalaryPushPageRequest extends PageDto { ...@@ -20,4 +20,9 @@ public class ApiSalaryPushPageRequest extends PageDto {
* 薪资单状态:1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消 * 薪资单状态:1-待提交 2-待核对 3-已核对 4-退回 5-已推送 6-已取消
*/ */
private String status; private String status;
/**
* 发放编号
*/
private String salaryNo;
} }
...@@ -14,6 +14,11 @@ public class ApiSalaryPushPageResponse { ...@@ -14,6 +14,11 @@ public class ApiSalaryPushPageResponse {
private String salaryBizId; private String salaryBizId;
/** /**
* 发放编号
*/
private String salaryNo;
/**
* 转介人名称 * 转介人名称
*/ */
private String brokerName; private String brokerName;
......
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
<if test="request.status != null and request.status != ''"> <if test="request.status != null and request.status != ''">
AND s.status = #{request.status} AND s.status = #{request.status}
</if> </if>
<if test="request.salaryNo != null and request.salaryNo != ''">
AND s.salary_no LIKE CONCAT('%', #{request.salaryNo}, '%')
</if>
AND s.is_deleted = 0 AND s.is_deleted = 0
</where> </where>
GROUP BY s.salary_biz_id GROUP BY s.salary_biz_id
...@@ -57,6 +60,9 @@ ...@@ -57,6 +60,9 @@
<if test="request.status != null and request.status != ''"> <if test="request.status != null and request.status != ''">
AND s.status = #{request.status} AND s.status = #{request.status}
</if> </if>
<if test="request.salaryNo != null and request.salaryNo != ''">
AND s.salary_no LIKE CONCAT('%', #{request.salaryNo}, '%')
</if>
AND s.is_deleted = 0 AND s.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