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
9d2be70b
Commit
9d2be70b
authored
Nov 11, 2021
by
284718418@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、修改BUG382对排班制考勤进行修改,修改成员后,在考勤排班页修改考勤月份,人员信息、班次信息显示的是修改前的内容
2、修改BUG106自定义共工号没有和其他模块关联
parent
b83c66fd
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
src/main/java/cn/timer/api/bean/yggl/YgglMainLzb.java
+1
-1
src/main/java/cn/timer/api/dto/yggl/LzbDto.java
+3
-0
src/main/resources/mapping/yggl/YgglMainLzbMapper.xml
+3
-2
No files found.
src/main/java/cn/timer/api/bean/yggl/YgglMainLzb.java
View file @
9d2be70b
...
@@ -162,7 +162,7 @@ public class YgglMainLzb extends Model<YgglMainLzb> {
...
@@ -162,7 +162,7 @@ public class YgglMainLzb extends Model<YgglMainLzb> {
private
Integer
isJrkq
;
private
Integer
isJrkq
;
@ApiModelProperty
(
value
=
"公司内部工号 就是公司内部自己设置的工号"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"公司内部工号 就是公司内部自己设置的工号"
,
example
=
"101"
)
private
Integer
jobNum
;
private
String
jobNum
;
@ApiModelProperty
(
value
=
"工作地点 "
,
example
=
"工作地点"
)
@ApiModelProperty
(
value
=
"工作地点 "
,
example
=
"工作地点"
)
private
String
workAddress
;
private
String
workAddress
;
...
...
src/main/java/cn/timer/api/dto/yggl/LzbDto.java
View file @
9d2be70b
...
@@ -59,4 +59,7 @@ public class LzbDto extends Page implements Serializable{
...
@@ -59,4 +59,7 @@ public class LzbDto extends Page implements Serializable{
@ApiModelProperty
(
value
=
"实际离职时间"
,
example
=
"离职备注"
)
@ApiModelProperty
(
value
=
"实际离职时间"
,
example
=
"离职备注"
)
private
Date
sjlz
;
private
Date
sjlz
;
@ApiModelProperty
(
value
=
"公司内部工号 就是公司内部自己设置的工号"
,
example
=
"101"
)
private
String
jobNum
;
}
}
src/main/resources/mapping/yggl/YgglMainLzbMapper.xml
View file @
9d2be70b
...
@@ -189,7 +189,8 @@
...
@@ -189,7 +189,8 @@
a.phone `phone`,
a.phone `phone`,
a.lzbz `bz`,
a.lzbz `bz`,
a.lzyy lzyy,
a.lzyy lzyy,
a.sjlz_time sjlz
a.sjlz_time sjlz,
a.job_num
FROM
FROM
yggl_main_lzb a
yggl_main_lzb a
LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
...
@@ -202,7 +203,7 @@
...
@@ -202,7 +203,7 @@
</if>
</if>
<if
test =
"null != q.query and q.query !=''"
>
<if
test =
"null != q.query and q.query !=''"
>
AND
AND
(a.name like CONCAT('%',#{q.query},'%') OR a.emp_num like CONCAT('%',#{q.query},'%'))
(a.name like CONCAT('%',#{q.query},'%') OR a.emp_num like CONCAT('%',#{q.query},'%')
OR a.job_num like CONCAT('%',#{q.query},'%')
)
</if>
</if>
ORDER BY a.job_status ASC
ORDER BY a.job_status ASC
</select>
</select>
...
...
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