Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
entrance_api
Project
Project
Details
Activity
Releases
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
王琮
entrance_api
Commits
cb881cd9
Commit
cb881cd9
authored
Jan 14, 2023
by
罗可心
😕
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
小程序查找员工信息添加班次 修改查找考勤sql问题
parent
9fbd85ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
UserDto.java
src/main/java/org/rcisoft/tencent/dto/UserDto.java
+4
-0
AttendanceSyncMapper.xml
src/main/resources/mapper/AttendanceSyncMapper.xml
+7
-4
SysUserRepositorys.xml
src/main/resources/mapper/SysUserRepositorys.xml
+2
-0
No files found.
src/main/java/org/rcisoft/tencent/dto/UserDto.java
View file @
cb881cd9
...
...
@@ -16,4 +16,8 @@ public class UserDto extends SysUserRbac {
//黑名单状态(0不存在1存在)
@Transient
private
String
blacklistFlag
;
// 班次中文
@Transient
private
String
nltBzLabel
;
}
src/main/resources/mapper/AttendanceSyncMapper.xml
View file @
cb881cd9
...
...
@@ -34,6 +34,9 @@
left join sys_dept sd on su.dept_id = sd.business_id
where 1=1
and su.attendance_show = '0'
<if
test=
"entity.userId !=null and entity.userId != '' "
>
and attendance_sync.user_id = #{entity.userId}
</if>
<if
test=
"entity.delFlag !=null and entity.delFlag != '' "
>
and attendance_sync.del_flag = #{entity.delFlag}
</if>
...
...
@@ -52,15 +55,15 @@
<if
test=
"entity.name != null and entity.name != ''"
>
and attendance_sync.name like concat('%', #{entity.name}, '%' )
</if>
order by IF(ISNULL(sd.weight),1,0) , sd.weight, IF(ISNULL(su.sort),1,0) ,su.sort , attendance_sync.date_of_attendance desc
,
order by IF(ISNULL(sd.weight),1,0) , sd.weight, IF(ISNULL(su.sort),1,0) ,su.sort , attendance_sync.date_of_attendance desc
<if
test=
"entity.sort == '0'.toString()"
>
attendance_sync.work_hours desc
,
attendance_sync.work_hours desc
</if>
<if
test=
"entity.sort == '1'.toString()"
>
attendance_sync.off_hours desc
,
attendance_sync.off_hours desc
</if>
<if
test=
"entity.sort == '2'.toString()"
>
attendance_sync.time_on_job + 0
,
attendance_sync.time_on_job + 0
</if>
</select>
...
...
src/main/resources/mapper/SysUserRepositorys.xml
View file @
cb881cd9
...
...
@@ -110,6 +110,8 @@
<result
column=
"update_by"
jdbcType=
"VARCHAR"
property=
"updateBy"
/>
<result
column=
"update_date"
jdbcType=
"TIMESTAMP"
property=
"updateDate"
/>
<result
column=
"create_date"
jdbcType=
"TIMESTAMP"
property=
"createDate"
/>
<result
column=
"nlt_bz_label"
jdbcType=
"VARCHAR"
property=
"nltBzLabel"
/>
</resultMap>
<!--<cache type="${corePackag!}.util.RedisCache"/>-->
<select
id=
"querySysUsers"
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