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
89130970
Commit
89130970
authored
Apr 28, 2020
by
东州 翁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改查询员工列表接口,添加了头像url一列
parent
b3156281
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
+1
-1
src/main/java/cn/timer/api/controller/yggl/YgglController.java
+5
-0
src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java
+3
-0
src/main/resources/mapping/yggl/YgglMainEmpMapper.xml
+3
-2
No files found.
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
View file @
89130970
...
...
@@ -130,7 +130,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
@ApiModelProperty
(
value
=
"工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘"
,
example
=
"101"
)
private
Integer
jobType
;
@ApiModelProperty
(
value
=
"员工状态
1试用、2正式、3离职中、4
已离职"
,
example
=
"101"
)
@ApiModelProperty
(
value
=
"员工状态
0试用、1正式、2离职中、3
已离职"
,
example
=
"101"
)
private
Integer
jobStatus
;
@ApiModelProperty
(
value
=
"入职日期 "
,
example
=
"客户注册后的时间为入职时间"
)
...
...
src/main/java/cn/timer/api/controller/yggl/YgglController.java
View file @
89130970
...
...
@@ -1756,6 +1756,11 @@ public class YgglController {
@ApiOperationSupport
(
order
=
62
)
public
Result
<
List
<
YgQueryDto
>>
queryEmpMessage
(
@CurrentUser
UserBean
userBean
)
{
List
<
YgQueryDto
>
ygQueryDto
=
ygglMainEmpMapper
.
queryEmpMessage
(
userBean
);
for
(
YgQueryDto
yg
:
ygQueryDto
)
{
if
(
StringUtil
.
isEmpty
(
yg
.
getHeadUrl
()))
{
yg
.
setHeadUrl
(
""
);
}
}
return
ResultUtil
.
data
(
ygQueryDto
,
"查询成功"
);
}
...
...
src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java
View file @
89130970
...
...
@@ -66,4 +66,7 @@ public class YgQueryDto extends Page implements Serializable{
@ApiModelProperty
(
value
=
"离职原因"
,
example
=
"123"
)
private
String
lzyy
;
@ApiModelProperty
(
value
=
"头像url"
,
example
=
"url"
)
private
String
headUrl
;
}
src/main/resources/mapping/yggl/YgglMainEmpMapper.xml
View file @
89130970
...
...
@@ -199,14 +199,15 @@
a.rz_time rzTime,
a.job_type jobType,
a.phone phone,
a.job_status jobStatus
a.job_status jobStatus,
a.head_url headUrl
FROM
yggl_main_emp a
LEFT JOIN zzgl_bmgw_m b ON a.bmgw_id = b.id
WHERE
a.org_code = #{orgCode}
AND
a.job_status
!= 4
a.job_status
in (0,1,2)
ORDER BY
emp_num DESC
</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