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
231d9a6c
Commit
231d9a6c
authored
4 years ago
by
ilal
Committed by
chenzg
3 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交
parent
cb92198d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletions
+6
-1
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXcjsgz.java
+4
-0
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
+0
-0
src/main/resources/mapping/xcgl/XcglAssoXcjsgzMapper.xml
+2
-1
No files found.
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXcjsgz.java
View file @
231d9a6c
...
@@ -63,5 +63,8 @@ public class XcglAssoXcjsgz extends Model<XcglAssoXcjsgz> {
...
@@ -63,5 +63,8 @@ public class XcglAssoXcjsgz extends Model<XcglAssoXcjsgz> {
private
String
degkText
;
private
String
degkText
;
@ApiModelProperty
(
value
=
""
,
example
=
""
)
@ApiModelProperty
(
value
=
""
,
example
=
""
)
private
Integer
rulestate
;
private
Integer
rulestate
;
@ApiModelProperty
(
value
=
""
,
example
=
""
)
private
Integer
defaulttype
;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
View file @
231d9a6c
This diff is collapsed.
Click to expand it.
src/main/resources/mapping/xcgl/XcglAssoXcjsgzMapper.xml
View file @
231d9a6c
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
<result
column=
"dygk_text"
property=
"dygkText"
/>
<result
column=
"dygk_text"
property=
"dygkText"
/>
<result
column=
"degk_text"
property=
"degkText"
/>
<result
column=
"degk_text"
property=
"degkText"
/>
<result
column=
"rulestate"
property=
"rulestate"
/>
<result
column=
"rulestate"
property=
"rulestate"
/>
<result
column=
"defaulttype"
property=
"defaulttype"
/>
</resultMap>
</resultMap>
<sql
id=
"Base_Column_List"
>
<sql
id=
"Base_Column_List"
>
...
@@ -38,7 +39,7 @@
...
@@ -38,7 +39,7 @@
<select
id=
"QuerySalaryRules"
resultMap=
"BaseResultMap"
>
<select
id=
"QuerySalaryRules"
resultMap=
"BaseResultMap"
>
select * from xcgl_asso_xcjsgz jsgz
select * from xcgl_asso_xcjsgz jsgz
where jsgz.formulaname = #{formulaname}
where jsgz.formulaname = #{formulaname}
ORDER BY jsgz.id ASC LIMIT
1
and jsgz.defaulttype =
1
</select>
</select>
<!--
<!--
...
...
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