Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zhengyuan-danger-chemistry-manage
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
耿迪迪
zhengyuan-danger-chemistry-manage
Commits
be4c07e4
Commit
be4c07e4
authored
Feb 28, 2023
by
zhangjianqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
隐患详情回显
parent
d41b4c34
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
4 deletions
+29
-4
TStaffController.java
...ong/web/controller/safetyManagement/TStaffController.java
+7
-0
TStaffMapper.java
.../src/main/java/com/zehong/system/mapper/TStaffMapper.java
+2
-0
ITStaffService.java
...c/main/java/com/zehong/system/service/ITStaffService.java
+2
-0
TStaffServiceImpl.java
...ava/com/zehong/system/service/impl/TStaffServiceImpl.java
+5
-0
TStaffMapper.xml
...-system/src/main/resources/mapper/system/TStaffMapper.xml
+3
-1
staff.js
danger-manage-web/src/api/safetyManagement/staff.js
+8
-1
index.vue
danger-manage-web/src/views/system/book/index.vue
+2
-2
No files found.
danger-manage-admin/src/main/java/com/zehong/web/controller/safetyManagement/TStaffController.java
View file @
be4c07e4
...
...
@@ -63,6 +63,13 @@ public class TStaffController extends BaseController
return
getDataTable
(
list
);
}
@GetMapping
(
"/allList"
)
public
TableDataInfo
allList
(
TStaffForm
tStaff
)
{
startPage
();
List
<
TStaffVo
>
list
=
tStaffService
.
allList
(
tStaff
);
return
getDataTable
(
list
);
}
/**
* 无分页查询
* @param tStaff
...
...
danger-manage-system/src/main/java/com/zehong/system/mapper/TStaffMapper.java
View file @
be4c07e4
...
...
@@ -35,6 +35,8 @@ public interface TStaffMapper
* @return 员工信息管理集合
*/
public
List
<
TStaffVo
>
selectTStaffList
(
TStaffForm
tStaff
);
public
List
<
TStaffVo
>
allList
(
TStaffForm
tStaff
);
/**
* 新增员工信息管理
...
...
danger-manage-system/src/main/java/com/zehong/system/service/ITStaffService.java
View file @
be4c07e4
...
...
@@ -28,6 +28,8 @@ public interface ITStaffService
* @return 员工信息管理集合
*/
public
List
<
TStaffVo
>
selectTStaffList
(
TStaffForm
tStaff
);
public
List
<
TStaffVo
>
allList
(
TStaffForm
tStaff
);
/**
* 新增员工信息管理
...
...
danger-manage-system/src/main/java/com/zehong/system/service/impl/TStaffServiceImpl.java
View file @
be4c07e4
...
...
@@ -55,6 +55,11 @@ public class TStaffServiceImpl implements ITStaffService
{
return
tStaffMapper
.
selectTStaffList
(
tStaff
);
}
@Override
public
List
<
TStaffVo
>
allList
(
TStaffForm
tStaff
)
{
return
tStaffMapper
.
allList
(
tStaff
);
}
/**
* 新增员工信息管理
...
...
danger-manage-system/src/main/resources/mapper/system/TStaffMapper.xml
View file @
be4c07e4
...
...
@@ -65,7 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
group by t.user_id desc
</select>
<select
id=
"allList"
parameterType=
"TStaffForm"
resultMap=
"TStaffResult"
>
SELECT *,user_id as staff_id FROM sys_user WHERE is_del = '0'
</select>
<select
id=
"selectTStaffById"
parameterType=
"Long"
resultMap=
"TStaffResult"
>
<include
refid=
"selectTStaffVo"
/>
where t.user_id = #{staffId}
...
...
danger-manage-web/src/api/safetyManagement/staff.js
View file @
be4c07e4
...
...
@@ -9,7 +9,14 @@ export function listStaff(query) {
params
:
query
})
}
// 查询员工信息管理列表
export
function
listAllStaff
(
query
)
{
return
request
({
url
:
'/safetyManagement/staff/allList'
,
method
:
'get'
,
params
:
query
})
}
// 查询员工用户课程列表 无分页
export
function
TStaffLisst
(
query
)
{
return
request
({
...
...
danger-manage-web/src/views/system/book/index.vue
View file @
be4c07e4
...
...
@@ -851,7 +851,7 @@
import
FileUpload
from
'@/components/FileUpload'
;
import
{
listBook
,
getBook
,
delBook
,
addBook
,
updateBook
,
exportBook
}
from
"@/api/system/book"
;
import
{
listDept
}
from
"@/api/system/dept"
;
import
{
listStaff
}
from
"@/api/safetyManagement/staff"
;
import
{
list
All
Staff
}
from
"@/api/safetyManagement/staff"
;
import
{
getUserProfile
}
from
"@/api/system/user"
;
let
uploadfile
=
require
(
"@/assets/uploadfile.png"
);
export
default
{
...
...
@@ -992,7 +992,7 @@ export default {
/** 查询员工列表 */
getStaffList
()
{
this
.
loading
=
true
;
listStaff
(
this
.
queryParams2
).
then
(
response
=>
{
list
All
Staff
(
this
.
queryParams2
).
then
(
response
=>
{
this
.
staffList
=
response
.
rows
;
this
.
staffList2
=
response
.
rows
;
this
.
loading
=
false
;
...
...
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