Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
8
8timerapiv200
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
8timerv2
8timerapiv200
Commits
8c8e2c62
Commit
8c8e2c62
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
e0bde6b1
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
4 deletions
+2
-4
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXzb.java
+1
-1
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+0
-0
src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml
+1
-3
No files found.
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXzb.java
View file @
8c8e2c62
...
...
@@ -49,7 +49,7 @@ public class XcglAssoXzb extends Model<XcglAssoXzb> {
private
Integer
xzxid
;
@ApiModelProperty
(
value
=
"薪资项结果 "
,
example
=
"薪资项结果"
)
private
String
xzxjg
;
private
Double
xzxjg
;
@ApiModelProperty
(
value
=
"企业id "
,
example
=
"企业id"
)
private
Integer
qyid
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
8c8e2c62
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoXzbMapper.xml
View file @
8c8e2c62
...
...
@@ -74,9 +74,7 @@
left join zzgl_bmgw_m um on um.id = m.up_id
) as bmgw on bmgw.mid = emp.bmgw_id
where emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
and (xzbs.xzyf = #{xzyf} or xzbs.xzyf = '')
and emp.emp_num in (select xzury.userid from xcgl_asso_xzury xzury where xzury.xzzid = #{paygroupid})
<if
test=
"text != ''"
>
<if
test=
"text != null and text != ''"
>
and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
</if>
) as aa
...
...
This diff is collapsed.
Click to expand it.
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