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
5358e61b
Commit
5358e61b
authored
Oct 28, 2020
by
ilal
Committed by
chenzg
Jul 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
fb031b9f
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
79 additions
and
14 deletions
+79
-14
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+78
-10
src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
+1
-4
No files found.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
5358e61b
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoXzdazdyMapper.xml
View file @
5358e61b
...
...
@@ -64,10 +64,7 @@
<select
id=
"selectxcglassoxzdazdy"
resultMap=
"BaseResultMap"
>
select * from xcgl_asso_xzdazdy xzzdy
where xzzdy.qyid = #{qyid}
and xzzdy.zdmc = '基本工资'
or xzzdy.zdmc = '绩效工资'
or xzzdy.zdmc = '岗位津贴'
or xzzdy.zdmc = '加班工资'
and xzzdy.zdmc in ('底薪','岗位津贴')
</select>
<select
id=
"SalaryFixedWages"
resultMap=
"BaseResultMap"
>
...
...
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