Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yd-csf
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xingmin
yd-csf
Commits
6fd075da
Commit
6fd075da
authored
Jun 24, 2026
by
zhangxingmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
push
parent
d117e280
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
0 deletions
+21
-0
yd-csf-feign/src/main/java/com/yd/csf/feign/request/salary/ApiSalaryPageRequest.java
+5
-0
yd-csf-feign/src/main/java/com/yd/csf/feign/request/salary/ApiSalaryPushPageRequest.java
+5
-0
yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPushPageResponse.java
+5
-0
yd-csf-service/src/main/resources/mappers/SalaryMapper.xml
+6
-0
No files found.
yd-csf-feign/src/main/java/com/yd/csf/feign/request/salary/ApiSalaryPageRequest.java
View file @
6fd075da
...
@@ -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
;
}
}
yd-csf-feign/src/main/java/com/yd/csf/feign/request/salary/ApiSalaryPushPageRequest.java
View file @
6fd075da
...
@@ -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
;
}
}
yd-csf-feign/src/main/java/com/yd/csf/feign/response/salary/ApiSalaryPushPageResponse.java
View file @
6fd075da
...
@@ -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
;
...
...
yd-csf-service/src/main/resources/mappers/SalaryMapper.xml
View file @
6fd075da
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment