Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
86091ae6
Commit
86091ae6
authored
Dec 13, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.2:项目薪资 创建时间区间查询
parent
4800c3a1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+0
-4
TSalaryStandard.java
...ifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
+8
-0
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+5
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
86091ae6
...
...
@@ -376,9 +376,6 @@
<if
test=
"tEmployeeContractInfo.createName != null and tEmployeeContractInfo.createName.trim() != ''"
>
AND a.CREATE_NAME = #{tEmployeeContractInfo.createName}
</if>
<if
test=
"tEmployeeContractInfo.createTime != null"
>
AND a.CREATE_TIME = #{tEmployeeContractInfo.createTime}
</if>
<if
test=
"tEmployeeContractInfo.updateBy != null and tEmployeeContractInfo.updateBy.trim() != ''"
>
AND a.UPDATE_BY = #{tEmployeeContractInfo.updateBy}
</if>
...
...
@@ -386,7 +383,6 @@
AND a.UPDATE_TIME = #{tEmployeeContractInfo.updateTime}
</if>
<if
test=
"tEmployeeContractInfo.unitNo != null and tEmployeeContractInfo.unitNo.trim() != ''"
>
AND a.UNIT_NO = #{tEmployeeContractInfo.unitNo}
</if>
...
...
yifu-salary/yifu-salary-api/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/entity/TSalaryStandard.java
View file @
86091ae6
...
...
@@ -441,4 +441,12 @@ public class TSalaryStandard extends BaseEntity {
*/
@TableField
(
exist
=
false
)
private
String
salaryMonthEnd
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"创建时间起"
)
private
String
createTimeStart
;
@TableField
(
exist
=
false
)
@Schema
(
description
=
"创建时间止"
)
private
String
createTimeEnd
;
}
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
86091ae6
...
...
@@ -250,8 +250,11 @@
<if
test=
"tSalaryStandard.createName != null and tSalaryStandard.createName.trim() != ''"
>
AND a.CREATE_NAME = #{tSalaryStandard.createName}
</if>
<if
test=
"tSalaryStandard.createTime != null"
>
AND a.CREATE_TIME = #{tSalaryStandard.createTime}
<if
test=
"tDispatchInfo.createTimeStart != null"
>
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{tDispatchInfo.createTimeStart}
</if>
<if
test=
"tDispatchInfo.createTimeEnd != null"
>
AND a.CREATE_TIME
<![CDATA[ <= ]]>
#{tDispatchInfo.createTimeEnd}
</if>
<if
test=
"tSalaryStandard.updateBy != null and tSalaryStandard.updateBy.trim() != ''"
>
AND a.UPDATE_BY = #{tSalaryStandard.updateBy}
...
...
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