Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dd_school
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
wangqi
dd_school
Commits
b84b3d0a
Commit
b84b3d0a
authored
Dec 28, 2023
by
xuwenhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
12.28修改教师电子档案查看权限
parent
b5932690
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
589 additions
and
478 deletions
+589
-478
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAnnualAssessment/SchoolAnnualAssessmentController.java
+0
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentController.java
+0
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAworkloadController.java
+64
-57
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolGkAchievementController.java
+44
-38
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
+43
-49
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java
+54
-46
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java
+55
-47
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java
+55
-47
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXprojectResearchController.java
+56
-47
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java
+55
-47
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteachingAchievementsController.java
+64
-49
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteamAwardController.java
+46
-38
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationMapper.java
+8
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.java
+2
-2
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
+9
-0
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteachingAchievementsServiceImpl.java
+3
-3
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteachingAchievementsService.java
+2
-2
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationService.java
+8
-0
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationMapper.xml
+19
-4
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.xml
+2
-2
No files found.
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolAnnualAssessment/SchoolAnnualAssessmentController.java
View file @
b84b3d0a
This diff is collapsed.
Click to expand it.
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAclassTeacherAssessmentController.java
View file @
b84b3d0a
This diff is collapsed.
Click to expand it.
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolAworkloadController.java
View file @
b84b3d0a
...
...
@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import
java.io.*
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.servlet.http.HttpServletResponse
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
...
...
@@ -32,6 +33,7 @@ import org.springframework.web.multipart.MultipartFile;
import
yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.*
;
import
yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolAworkloadService
;
import
yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.ISchoolXteachingAchievementsService
;
import
yangtz.cs.liu.campus.service.schoolNewTeacherDzdn.SchoolTeacherBasichlnformationService
;
/**
* 工作量信息Controller
...
...
@@ -50,6 +52,8 @@ public class SchoolAworkloadController extends BaseController
private
ISchoolXteachingAchievementsService
schoolXteachingAchievementsService
;
@Autowired
private
ISysDeptService
sysDeptService
;
@Autowired
private
SchoolTeacherBasichlnformationService
basichlnformationService
;
/**
* 查询工作量信息列表
...
...
@@ -67,25 +71,29 @@ public class SchoolAworkloadController extends BaseController
List
<
SchoolAworkloadVo
>
list
=
schoolAworkloadService
.
selectSchoolAworkloadList
(
schoolAworkloadVo
);
return
getDataTable
(
list
);
}
for
(
SysRole
role
:
roles
)
{
//教师电子档案超级管理员和工作量信息管理员可以看全部数据
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"gzl_admin"
)){
startPage
();
List
<
SchoolAworkloadVo
>
list
=
schoolAworkloadService
.
selectSchoolAworkloadList
(
schoolAworkloadVo
);
return
getDataTable
(
list
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//获取当前登陆人部门下所有人的身份证号
List
<
String
>
deptUserIdCards
=
schoolXteachingAchievementsService
.
getUserIdCardsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIdCards
.
size
()
>
0
){
schoolAworkloadVo
.
setIdCards
(
deptUserIdCards
);
}
startPage
();
List
<
SchoolAworkloadVo
>
list
=
schoolAworkloadService
.
selectSchoolAworkloadList
(
schoolAworkloadVo
);
return
getDataTable
(
list
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"gzl_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
startPage
();
List
<
SchoolAworkloadVo
>
list
=
schoolAworkloadService
.
selectSchoolAworkloadList
(
schoolAworkloadVo
);
return
getDataTable
(
list
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//获取当前登陆人部门下所有人的手机号
List
<
String
>
userPhones
=
schoolXteachingAchievementsService
.
getUserPhonesByDeptId
(
sysDept
.
getDeptId
());
//根据用户手机号查询用户身份证信息
List
<
String
>
userIdCards
=
basichlnformationService
.
selectIdCardsByDdPhone
(
userPhones
);
if
(
userIdCards
.
size
()
>
0
){
schoolAworkloadVo
.
setIdCards
(
userIdCards
);
}
startPage
();
List
<
SchoolAworkloadVo
>
list
=
schoolAworkloadService
.
selectSchoolAworkloadList
(
schoolAworkloadVo
);
return
getDataTable
(
list
);
}
return
getDataTable
(
new
ArrayList
<>());
}
...
...
@@ -199,47 +207,46 @@ public class SchoolAworkloadController extends BaseController
ExcelUtil
<
SchoolAworkloadDc
>
util
=
new
ExcelUtil
<>(
SchoolAworkloadDc
.
class
);
util
.
exportExcel
(
response
,
list
,
"工作量内容"
);
}
else
{
for
(
SysRole
role
:
roles
)
{
//教师电子档案超级管理员和教师基础信息管理员可以看全部数据
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"gzl_admin"
)){
List
<
SchoolAworkloadExport
>
schoolAworkloadVos
=
schoolAworkloadService
.
selectAworkloadList
(
schoolAworkloadVo
);
List
<
SchoolAworkloadDc
>
list
=
new
ArrayList
<>();
for
(
SchoolAworkloadExport
aworkloadVo
:
schoolAworkloadVos
)
{
SchoolAworkloadDc
schoolAworkloadDc
=
new
SchoolAworkloadDc
();
BeanUtils
.
copyProperties
(
aworkloadVo
,
schoolAworkloadDc
);
list
.
add
(
schoolAworkloadDc
);
}
ExcelUtil
<
SchoolAworkloadDc
>
util
=
new
ExcelUtil
<>(
SchoolAworkloadDc
.
class
);
util
.
exportExcel
(
response
,
list
,
"工作量内容"
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//获取当前登陆人部门下所有人的身份证号
List
<
String
>
deptUserIdCards
=
schoolXteachingAchievementsService
.
getUserIdCardsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIdCards
.
size
()
>
0
){
schoolAworkloadVo
.
setIdCards
(
deptUserIdCards
);
}
List
<
SchoolAworkloadExport
>
schoolAworkloadVos
=
schoolAworkloadService
.
selectAworkloadList
(
schoolAworkloadVo
);
List
<
SchoolAworkloadDc
>
list
=
new
ArrayList
<>();
for
(
SchoolAworkloadExport
aworkloadVo
:
schoolAworkloadVos
)
{
SchoolAworkloadDc
schoolAworkloadDc
=
new
SchoolAworkloadDc
();
BeanUtils
.
copyProperties
(
aworkloadVo
,
schoolAworkloadDc
);
list
.
add
(
schoolAworkloadDc
);
}
ExcelUtil
<
SchoolAworkloadDc
>
util
=
new
ExcelUtil
<>(
SchoolAworkloadDc
.
class
);
util
.
exportExcel
(
response
,
list
,
"工作量内容"
);
}
else
{
ExcelUtil
<
SchoolAworkloadDc
>
util
=
new
ExcelUtil
<>(
SchoolAworkloadDc
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"工作量内容"
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"gzl_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
List
<
SchoolAworkloadExport
>
schoolAworkloadVos
=
schoolAworkloadService
.
selectAworkloadList
(
schoolAworkloadVo
);
List
<
SchoolAworkloadDc
>
list
=
new
ArrayList
<>();
for
(
SchoolAworkloadExport
aworkloadVo
:
schoolAworkloadVos
)
{
SchoolAworkloadDc
schoolAworkloadDc
=
new
SchoolAworkloadDc
();
BeanUtils
.
copyProperties
(
aworkloadVo
,
schoolAworkloadDc
);
list
.
add
(
schoolAworkloadDc
);
}
ExcelUtil
<
SchoolAworkloadDc
>
util
=
new
ExcelUtil
<>(
SchoolAworkloadDc
.
class
);
util
.
exportExcel
(
response
,
list
,
"工作量内容"
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//获取当前登陆人部门下所有人的手机号
List
<
String
>
userPhones
=
schoolXteachingAchievementsService
.
getUserPhonesByDeptId
(
sysDept
.
getDeptId
());
//根据用户手机号查询用户身份证信息
List
<
String
>
userIdCards
=
basichlnformationService
.
selectIdCardsByDdPhone
(
userPhones
);
if
(
userIdCards
.
size
()
>
0
){
schoolAworkloadVo
.
setIdCards
(
userIdCards
);
}
List
<
SchoolAworkloadExport
>
schoolAworkloadVos
=
schoolAworkloadService
.
selectAworkloadList
(
schoolAworkloadVo
);
List
<
SchoolAworkloadDc
>
list
=
new
ArrayList
<>();
for
(
SchoolAworkloadExport
aworkloadVo
:
schoolAworkloadVos
)
{
SchoolAworkloadDc
schoolAworkloadDc
=
new
SchoolAworkloadDc
();
BeanUtils
.
copyProperties
(
aworkloadVo
,
schoolAworkloadDc
);
list
.
add
(
schoolAworkloadDc
);
}
ExcelUtil
<
SchoolAworkloadDc
>
util
=
new
ExcelUtil
<>(
SchoolAworkloadDc
.
class
);
util
.
exportExcel
(
response
,
list
,
"工作量内容"
);
}
else
{
ExcelUtil
<
SchoolAworkloadDc
>
util
=
new
ExcelUtil
<>(
SchoolAworkloadDc
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"工作量内容"
);
}
}
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolGkAchievementController.java
View file @
b84b3d0a
...
...
@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.servlet.http.HttpServletResponse
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
...
...
@@ -65,24 +66,27 @@ public class SchoolGkAchievementController extends BaseController
List
<
SchoolGkAchievementVo
>
list
=
schoolGkAchievementService
.
selectSchoolGkAchievementVoList
(
schoolGkAchievementVo
);
return
getDataTable
(
list
);
}
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"gkcj_admin"
)){
startPage
();
List
<
SchoolGkAchievementVo
>
list
=
schoolGkAchievementService
.
selectSchoolGkAchievementVoList
(
schoolGkAchievementVo
);
return
getDataTable
(
list
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolGkAchievementVo
.
setUserIds
(
deptUserIds
);
}
startPage
(
);
List
<
SchoolGkAchievementVo
>
list
=
schoolGkAchievementService
.
selectSchoolGkAchievementVoList
(
schoolGkAchievementVo
);
return
getDataTable
(
list
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"gkcj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
startPage
(
);
List
<
SchoolGkAchievementVo
>
list
=
schoolGkAchievementService
.
selectSchoolGkAchievementVoList
(
schoolGkAchievementVo
);
return
getDataTable
(
list
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
()
);
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
()
);
if
(
deptUserIds
.
size
()
>
0
){
schoolGkAchievementVo
.
setUserIds
(
deptUserIds
);
}
startPage
();
List
<
SchoolGkAchievementVo
>
list
=
schoolGkAchievementService
.
selectSchoolGkAchievementVoList
(
schoolGkAchievementVo
);
return
getDataTable
(
list
);
}
return
getDataTable
(
new
ArrayList
<>());
}
...
...
@@ -157,29 +161,31 @@ public class SchoolGkAchievementController extends BaseController
ExcelUtil
<
SchoolGkAchievement
>
util
=
new
ExcelUtil
<
SchoolGkAchievement
>(
SchoolGkAchievement
.
class
);
util
.
exportExcel
(
response
,
list
,
"高考成绩数据"
);
}
else
{
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"gkcj_admin"
)){
List
<
SchoolGkAchievement
>
list
=
schoolGkAchievementService
.
selectSchoolGkAchievementList
(
schoolGkAchievementVo
);
ExcelUtil
<
SchoolGkAchievement
>
util
=
new
ExcelUtil
<
SchoolGkAchievement
>(
SchoolGkAchievement
.
class
);
util
.
exportExcel
(
response
,
list
,
"高考成绩数据"
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolGkAchievementVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolGkAchievement
>
list
=
schoolGkAchievementService
.
selectSchoolGkAchievementList
(
schoolGkAchievementVo
);
ExcelUtil
<
SchoolGkAchievement
>
util
=
new
ExcelUtil
<
SchoolGkAchievement
>(
SchoolGkAchievement
.
class
);
util
.
exportExcel
(
response
,
list
,
"高考成绩数据"
);
}
else
{
ExcelUtil
<
SchoolGkAchievement
>
util
=
new
ExcelUtil
<
SchoolGkAchievement
>(
SchoolGkAchievement
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"高考成绩数据"
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"gkcj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
List
<
SchoolGkAchievement
>
list
=
schoolGkAchievementService
.
selectSchoolGkAchievementList
(
schoolGkAchievementVo
);
ExcelUtil
<
SchoolGkAchievement
>
util
=
new
ExcelUtil
<
SchoolGkAchievement
>(
SchoolGkAchievement
.
class
);
util
.
exportExcel
(
response
,
list
,
"高考成绩数据"
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolGkAchievementVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolGkAchievement
>
list
=
schoolGkAchievementService
.
selectSchoolGkAchievementList
(
schoolGkAchievementVo
);
ExcelUtil
<
SchoolGkAchievement
>
util
=
new
ExcelUtil
<
SchoolGkAchievement
>(
SchoolGkAchievement
.
class
);
util
.
exportExcel
(
response
,
list
,
"高考成绩数据"
);
}
else
{
ExcelUtil
<
SchoolGkAchievement
>
util
=
new
ExcelUtil
<
SchoolGkAchievement
>(
SchoolGkAchievement
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"高考成绩数据"
);
}
}
}
}
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationController.java
View file @
b84b3d0a
...
...
@@ -39,6 +39,7 @@ import java.io.*;
import
java.text.SimpleDateFormat
;
import
java.util.*
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@RestController
@RequestMapping
(
"/teacher/basiclnformation"
)
...
...
@@ -73,25 +74,28 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
List
<
SchoolTeacherBasicInformationVo
>
list
=
basichlnformationService
.
list
(
information
);
return
getDataTable
(
list
);
}
for
(
SysRole
role
:
roles
)
{
//教师电子档案超级管理员和教师基础信息管理员可以看全部数据
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jsjcxj_admin"
)){
startPage
();
List
<
SchoolTeacherBasicInformationVo
>
list
=
basichlnformationService
.
list
(
information
);
return
getDataTable
(
list
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//获取当前登陆人部门下所有人的身份证号
List
<
String
>
deptUserIdCards
=
schoolXteachingAchievementsService
.
getUserIdCardsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIdCards
.
size
()
>
0
){
information
.
setIdCards
(
deptUserIdCards
);
}
startPage
(
);
List
<
SchoolTeacherBasicInformationVo
>
list
=
basichlnformationService
.
list
(
information
);
return
getDataTable
(
list
);
List
<
SysRole
>
sysRoles
=
roles
.
stream
().
filter
(
item
->
item
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
item
.
getRoleKey
().
equals
(
"jsjcxj_admin"
)).
collect
(
Collectors
.
toList
());
//全部权限
if
(
sysRoles
.
size
()>
0
){
startPage
(
);
List
<
SchoolTeacherBasicInformationVo
>
list
=
basichlnformationService
.
list
(
information
);
return
getDataTable
(
list
);
}
//部分权限
List
<
SysRole
>
sysRoles2
=
roles
.
stream
().
filter
(
item
->
item
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)
).
collect
(
Collectors
.
toList
());
if
(
sysRoles2
.
size
()>
0
){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
()
);
//获取当前登陆人部门下所有人的手机号
List
<
String
>
userPhones
=
schoolXteachingAchievementsService
.
getUserPhonesByDeptId
(
sysDept
.
getDeptId
()
);
if
(
userPhones
.
size
()
>
0
){
information
.
setUserPhones
(
userPhones
);
}
startPage
();
List
<
SchoolTeacherBasicInformationVo
>
list
=
basichlnformationService
.
list
(
information
);
return
getDataTable
(
list
);
}
return
getDataTable
(
new
ArrayList
<>());
}
...
...
@@ -215,40 +219,30 @@ public class SchoolTeacherBasiclnformationController extends BaseController {
ExcelUtil
<
SchoolTeacherBasicInformationVo
>
util
=
new
ExcelUtil
<>(
SchoolTeacherBasicInformationVo
.
class
);
util
.
exportExcel
(
response
,
list1
,
"教师基本信息"
);
}
else
{
for
(
SysRole
role
:
roles
)
{
//教师电子档案超级管理员和教师基础信息管理员可以看全部数据
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jsjcxj_admin"
)){
List
<
SchoolTeacherBasicInformationVo
>
list1
=
basichlnformationService
.
list
(
export
);
ExcelUtil
<
SchoolTeacherBasicInformationVo
>
util
=
new
ExcelUtil
<>(
SchoolTeacherBasicInformationVo
.
class
);
util
.
exportExcel
(
response
,
list1
,
"教师基本信息"
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//获取当前登陆人部门下所有人的身份证号
List
<
String
>
deptUserIdCards
=
schoolXteachingAchievementsService
.
getUserIdCardsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIdCards
.
size
()
>
0
){
export
.
setIdCards
(
deptUserIdCards
);
}
List
<
SchoolTeacherBasicInformationVo
>
list1
=
basichlnformationService
.
list
(
export
);
ExcelUtil
<
SchoolTeacherBasicInformationVo
>
util
=
new
ExcelUtil
<>(
SchoolTeacherBasicInformationVo
.
class
);
util
.
exportExcel
(
response
,
list1
,
"教师基本信息"
);
}
else
{
List
<
SchoolTeacherBasicInformationVo
>
list1
=
basichlnformationService
.
list
(
export
);
ExcelUtil
<
SchoolTeacherBasicInformationVo
>
util
=
new
ExcelUtil
<>(
SchoolTeacherBasicInformationVo
.
class
);
util
.
exportExcel
(
response
,
list1
,
"教师基本信息"
);
List
<
SysRole
>
sysRoles
=
roles
.
stream
().
filter
(
item
->
item
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
item
.
getRoleKey
().
equals
(
"jsjcxj_admin"
)).
collect
(
Collectors
.
toList
());
//全部权限
if
(
sysRoles
.
size
()>
0
){
List
<
SchoolTeacherBasicInformationVo
>
list1
=
basichlnformationService
.
list
(
export
);
ExcelUtil
<
SchoolTeacherBasicInformationVo
>
util
=
new
ExcelUtil
<>(
SchoolTeacherBasicInformationVo
.
class
);
util
.
exportExcel
(
response
,
list1
,
"教师基本信息"
);
}
//部分权限
List
<
SysRole
>
sysRoles2
=
roles
.
stream
().
filter
(
item
->
item
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)
).
collect
(
Collectors
.
toList
());
if
(
sysRoles2
.
size
()>
0
){
//教师电子档案中级管理员只能看本部门及以下的数据
//获取当前登陆人的部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//获取当前登陆人部门下所有人的身份证号
List
<
String
>
userPhones
=
schoolXteachingAchievementsService
.
getUserPhonesByDeptId
(
sysDept
.
getDeptId
());
if
(
userPhones
.
size
()
>
0
){
export
.
setUserPhones
(
userPhones
);
}
List
<
SchoolTeacherBasicInformationVo
>
list1
=
basichlnformationService
.
list
(
export
);
ExcelUtil
<
SchoolTeacherBasicInformationVo
>
util
=
new
ExcelUtil
<>(
SchoolTeacherBasicInformationVo
.
class
);
util
.
exportExcel
(
response
,
list1
,
"教师基本信息"
);
}
}
// ExcelUtil<SchoolTeacherBasicInformationVo> util = new ExcelUtil<>(SchoolTeacherBasicInformationVo.class);
//// //查询出来结果复制
// List<SchoolTeacherBasicInformationVo> list1 = basichlnformationService.list(export);
//// list1.forEach(date->{
//// SchoolTeacherBasiclnExport schoolTeacherBasiclnExport = new SchoolTeacherBasiclnExport();
//// BeanUtils.copyProperties(date,schoolTeacherBasiclnExport);
//// exportList.add(schoolTeacherBasiclnExport);
//// });
// util.exportExcel(response, list1, "教师基本信息");
}
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXacademicWorksController.java
View file @
b84b3d0a
...
...
@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.servlet.http.HttpServletResponse
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
...
...
@@ -68,23 +69,26 @@ public class SchoolXacademicWorksController extends BaseController
List
<
SchoolXacademicWorksVo
>
list
=
schoolXacademicWorksService
.
selectSchoolXacademicWorksList
(
schoolXacademicWorksVo
);
return
getDataTable
(
list
);
}
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"lwlz_admin"
)){
startPage
();
List
<
SchoolXacademicWorksVo
>
list
=
schoolXacademicWorksService
.
selectSchoolXacademicWorksList
(
schoolXacademicWorksVo
);
return
getDataTable
(
list
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXacademicWorksVo
.
setUserIds
(
deptUserIds
);
}
startPage
(
);
List
<
SchoolXacademicWorksVo
>
list
=
schoolXacademicWorksService
.
selectSchoolXacademicWorksList
(
schoolXacademicWorksVo
);
return
getDataTable
(
list
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"lwlz_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
startPage
(
);
List
<
SchoolXacademicWorksVo
>
list
=
schoolXacademicWorksService
.
selectSchoolXacademicWorksList
(
schoolXacademicWorksVo
);
return
getDataTable
(
list
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
()
);
if
(
deptUserIds
.
size
()
>
0
){
schoolXacademicWorksVo
.
setUserIds
(
deptUserIds
);
}
startPage
();
List
<
SchoolXacademicWorksVo
>
list
=
schoolXacademicWorksService
.
selectSchoolXacademicWorksList
(
schoolXacademicWorksVo
);
return
getDataTable
(
list
);
}
return
getDataTable
(
new
ArrayList
<>());
}
...
...
@@ -148,37 +152,41 @@ public class SchoolXacademicWorksController extends BaseController
ExcelUtil
<
SchoolXacademicWorksVo
>
util
=
new
ExcelUtil
<
SchoolXacademicWorksVo
>(
SchoolXacademicWorksVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"论文著作数据"
);
}
else
{
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"lwlz_admin"
)){
List
<
SchoolXacademicWorksVo
>
list
=
schoolXacademicWorksService
.
selectSchoolXacademicWorksList
(
schoolXacademicWorksVo
);
for
(
SchoolXacademicWorksVo
xacademicWorksVo
:
list
)
{
i
++;
xacademicWorksVo
.
setXh
(
i
);
xacademicWorksVo
.
setGrowthType
(
"论文论著"
);
}
ExcelUtil
<
SchoolXacademicWorksVo
>
util
=
new
ExcelUtil
<
SchoolXacademicWorksVo
>(
SchoolXacademicWorksVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"论文著作数据"
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXacademicWorksVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXacademicWorksVo
>
list
=
schoolXacademicWorksService
.
selectSchoolXacademicWorksList
(
schoolXacademicWorksVo
);
for
(
SchoolXacademicWorksVo
xacademicWorksVo
:
list
)
{
i
++;
xacademicWorksVo
.
setXh
(
i
);
xacademicWorksVo
.
setGrowthType
(
"论文论著"
);
}
ExcelUtil
<
SchoolXacademicWorksVo
>
util
=
new
ExcelUtil
<
SchoolXacademicWorksVo
>(
SchoolXacademicWorksVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"论文著作数据"
);
}
else
{
ExcelUtil
<
SchoolXacademicWorksVo
>
util
=
new
ExcelUtil
<
SchoolXacademicWorksVo
>(
SchoolXacademicWorksVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"论文著作数据"
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"lwlz_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
List
<
SchoolXacademicWorksVo
>
list
=
schoolXacademicWorksService
.
selectSchoolXacademicWorksList
(
schoolXacademicWorksVo
);
for
(
SchoolXacademicWorksVo
xacademicWorksVo
:
list
)
{
i
++;
xacademicWorksVo
.
setXh
(
i
);
xacademicWorksVo
.
setGrowthType
(
"论文论著"
);
}
ExcelUtil
<
SchoolXacademicWorksVo
>
util
=
new
ExcelUtil
<
SchoolXacademicWorksVo
>(
SchoolXacademicWorksVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"论文著作数据"
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXacademicWorksVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXacademicWorksVo
>
list
=
schoolXacademicWorksService
.
selectSchoolXacademicWorksList
(
schoolXacademicWorksVo
);
for
(
SchoolXacademicWorksVo
xacademicWorksVo
:
list
)
{
i
++;
xacademicWorksVo
.
setXh
(
i
);
xacademicWorksVo
.
setGrowthType
(
"论文论著"
);
}
ExcelUtil
<
SchoolXacademicWorksVo
>
util
=
new
ExcelUtil
<
SchoolXacademicWorksVo
>(
SchoolXacademicWorksVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"论文著作数据"
);
}
else
{
ExcelUtil
<
SchoolXacademicWorksVo
>
util
=
new
ExcelUtil
<
SchoolXacademicWorksVo
>(
SchoolXacademicWorksVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"论文著作数据"
);
}
}
}
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXcomprehensiveHonorsController.java
View file @
b84b3d0a
...
...
@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.servlet.http.HttpServletResponse
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
...
...
@@ -66,24 +67,27 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
List
<
SchoolXcomprehensiveHonorsVo
>
list
=
schoolXcomprehensiveHonorsService
.
selectSchoolXcomprehensiveHonorsList
(
schoolXcomprehensiveHonorsVo
);
return
getDataTable
(
list
);
}
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"zhry_admin"
)){
startPage
();
List
<
SchoolXcomprehensiveHonorsVo
>
list
=
schoolXcomprehensiveHonorsService
.
selectSchoolXcomprehensiveHonorsList
(
schoolXcomprehensiveHonorsVo
);
return
getDataTable
(
list
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXcomprehensiveHonorsVo
.
setUserIds
(
deptUserIds
);
}
startPage
(
);
List
<
SchoolXcomprehensiveHonorsVo
>
list
=
schoolXcomprehensiveHonorsService
.
selectSchoolXcomprehensiveHonorsList
(
schoolXcomprehensiveHonorsVo
);
return
getDataTable
(
list
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"zhry_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
startPage
(
);
List
<
SchoolXcomprehensiveHonorsVo
>
list
=
schoolXcomprehensiveHonorsService
.
selectSchoolXcomprehensiveHonorsList
(
schoolXcomprehensiveHonorsVo
);
return
getDataTable
(
list
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
()
);
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
()
);
if
(
deptUserIds
.
size
()
>
0
){
schoolXcomprehensiveHonorsVo
.
setUserIds
(
deptUserIds
);
}
startPage
();
List
<
SchoolXcomprehensiveHonorsVo
>
list
=
schoolXcomprehensiveHonorsService
.
selectSchoolXcomprehensiveHonorsList
(
schoolXcomprehensiveHonorsVo
);
return
getDataTable
(
list
);
}
return
getDataTable
(
new
ArrayList
<>());
}
...
...
@@ -147,37 +151,41 @@ public class SchoolXcomprehensiveHonorsController extends BaseController
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>
util
=
new
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>(
SchoolXcomprehensiveHonorsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"综合荣誉数据"
);
}
else
{
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"zhry_admin"
)){
List
<
SchoolXcomprehensiveHonorsVo
>
list
=
schoolXcomprehensiveHonorsService
.
selectSchoolXcomprehensiveHonorsList
(
schoolXcomprehensiveHonorsVo
);
for
(
SchoolXcomprehensiveHonorsVo
xcomprehensiveHonorsVo
:
list
)
{
i
++;
xcomprehensiveHonorsVo
.
setXh
(
i
);
xcomprehensiveHonorsVo
.
setGrowthType
(
"综合荣誉"
);
}
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>
util
=
new
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>(
SchoolXcomprehensiveHonorsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"综合荣誉数据"
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXcomprehensiveHonorsVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXcomprehensiveHonorsVo
>
list
=
schoolXcomprehensiveHonorsService
.
selectSchoolXcomprehensiveHonorsList
(
schoolXcomprehensiveHonorsVo
);
for
(
SchoolXcomprehensiveHonorsVo
xcomprehensiveHonorsVo
:
list
)
{
i
++;
xcomprehensiveHonorsVo
.
setXh
(
i
);
xcomprehensiveHonorsVo
.
setGrowthType
(
"综合荣誉"
);
}
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>
util
=
new
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>(
SchoolXcomprehensiveHonorsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"综合荣誉数据"
);
}
else
{
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>
util
=
new
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>(
SchoolXcomprehensiveHonorsVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"综合荣誉数据"
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"zhry_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
List
<
SchoolXcomprehensiveHonorsVo
>
list
=
schoolXcomprehensiveHonorsService
.
selectSchoolXcomprehensiveHonorsList
(
schoolXcomprehensiveHonorsVo
);
for
(
SchoolXcomprehensiveHonorsVo
xcomprehensiveHonorsVo
:
list
)
{
i
++;
xcomprehensiveHonorsVo
.
setXh
(
i
);
xcomprehensiveHonorsVo
.
setGrowthType
(
"综合荣誉"
);
}
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>
util
=
new
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>(
SchoolXcomprehensiveHonorsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"综合荣誉数据"
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXcomprehensiveHonorsVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXcomprehensiveHonorsVo
>
list
=
schoolXcomprehensiveHonorsService
.
selectSchoolXcomprehensiveHonorsList
(
schoolXcomprehensiveHonorsVo
);
for
(
SchoolXcomprehensiveHonorsVo
xcomprehensiveHonorsVo
:
list
)
{
i
++;
xcomprehensiveHonorsVo
.
setXh
(
i
);
xcomprehensiveHonorsVo
.
setGrowthType
(
"综合荣誉"
);
}
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>
util
=
new
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>(
SchoolXcomprehensiveHonorsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"综合荣誉数据"
);
}
else
{
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>
util
=
new
ExcelUtil
<
SchoolXcomprehensiveHonorsVo
>(
SchoolXcomprehensiveHonorsVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"综合荣誉数据"
);
}
}
}
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXlectureAwardsController.java
View file @
b84b3d0a
...
...
@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.servlet.http.HttpServletResponse
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
...
...
@@ -67,24 +68,27 @@ public class SchoolXlectureAwardsController extends BaseController
List
<
SchoolXlectureAwardsVo
>
list
=
schoolXlectureAwardsService
.
selectSchoolXlectureAwardsList
(
schoolXlectureAwardsVo
);
return
getDataTable
(
list
);
}
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jkhj_admin"
)){
startPage
();
List
<
SchoolXlectureAwardsVo
>
list
=
schoolXlectureAwardsService
.
selectSchoolXlectureAwardsList
(
schoolXlectureAwardsVo
);
return
getDataTable
(
list
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXlectureAwardsVo
.
setUserIds
(
deptUserIds
);
}
startPage
(
);
List
<
SchoolXlectureAwardsVo
>
list
=
schoolXlectureAwardsService
.
selectSchoolXlectureAwardsList
(
schoolXlectureAwardsVo
);
return
getDataTable
(
list
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jkhj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
startPage
(
);
List
<
SchoolXlectureAwardsVo
>
list
=
schoolXlectureAwardsService
.
selectSchoolXlectureAwardsList
(
schoolXlectureAwardsVo
);
return
getDataTable
(
list
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
()
);
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
()
);
if
(
deptUserIds
.
size
()
>
0
){
schoolXlectureAwardsVo
.
setUserIds
(
deptUserIds
);
}
startPage
();
List
<
SchoolXlectureAwardsVo
>
list
=
schoolXlectureAwardsService
.
selectSchoolXlectureAwardsList
(
schoolXlectureAwardsVo
);
return
getDataTable
(
list
);
}
return
getDataTable
(
new
ArrayList
<>());
}
...
...
@@ -148,37 +152,41 @@ public class SchoolXlectureAwardsController extends BaseController
ExcelUtil
<
SchoolXlectureAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXlectureAwardsVo
>(
SchoolXlectureAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"讲课获奖数据"
);
}
else
{
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jkhj_admin"
)){
List
<
SchoolXlectureAwardsVo
>
list
=
schoolXlectureAwardsService
.
selectSchoolXlectureAwardsList
(
schoolXlectureAwardsVo
);
for
(
SchoolXlectureAwardsVo
xlectureAwardsVo
:
list
)
{
i
++;
xlectureAwardsVo
.
setXh
(
i
);
xlectureAwardsVo
.
setGrowthType
(
"讲课获奖"
);
}
ExcelUtil
<
SchoolXlectureAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXlectureAwardsVo
>(
SchoolXlectureAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"讲课获奖数据"
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXlectureAwardsVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXlectureAwardsVo
>
list
=
schoolXlectureAwardsService
.
selectSchoolXlectureAwardsList
(
schoolXlectureAwardsVo
);
for
(
SchoolXlectureAwardsVo
xlectureAwardsVo
:
list
)
{
i
++;
xlectureAwardsVo
.
setXh
(
i
);
xlectureAwardsVo
.
setGrowthType
(
"讲课获奖"
);
}
ExcelUtil
<
SchoolXlectureAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXlectureAwardsVo
>(
SchoolXlectureAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"讲课获奖数据"
);
}
else
{
ExcelUtil
<
SchoolXlectureAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXlectureAwardsVo
>(
SchoolXlectureAwardsVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"讲课获奖数据"
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jkhj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
List
<
SchoolXlectureAwardsVo
>
list
=
schoolXlectureAwardsService
.
selectSchoolXlectureAwardsList
(
schoolXlectureAwardsVo
);
for
(
SchoolXlectureAwardsVo
xlectureAwardsVo
:
list
)
{
i
++;
xlectureAwardsVo
.
setXh
(
i
);
xlectureAwardsVo
.
setGrowthType
(
"讲课获奖"
);
}
ExcelUtil
<
SchoolXlectureAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXlectureAwardsVo
>(
SchoolXlectureAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"讲课获奖数据"
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXlectureAwardsVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXlectureAwardsVo
>
list
=
schoolXlectureAwardsService
.
selectSchoolXlectureAwardsList
(
schoolXlectureAwardsVo
);
for
(
SchoolXlectureAwardsVo
xlectureAwardsVo
:
list
)
{
i
++;
xlectureAwardsVo
.
setXh
(
i
);
xlectureAwardsVo
.
setGrowthType
(
"讲课获奖"
);
}
ExcelUtil
<
SchoolXlectureAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXlectureAwardsVo
>(
SchoolXlectureAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"讲课获奖数据"
);
}
else
{
ExcelUtil
<
SchoolXlectureAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXlectureAwardsVo
>(
SchoolXlectureAwardsVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"讲课获奖数据"
);
}
}
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXprojectResearchController.java
View file @
b84b3d0a
...
...
@@ -25,6 +25,7 @@ import yangtz.cs.liu.campus.vo.schoolNewTeacherDzdn.SchoolXprojectResearchVo;
import
javax.servlet.http.HttpServletResponse
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
/**
* 课题研究Controller
...
...
@@ -62,24 +63,28 @@ public class SchoolXprojectResearchController extends BaseController {
List
<
SchoolXprojectResearchVo
>
list
=
schoolXprojectResearchService
.
selectSchoolXprojectResearchList
(
schoolXprojectResearchVo
);
return
getDataTable
(
list
);
}
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"ktyj_admin"
)){
startPage
();
List
<
SchoolXprojectResearchVo
>
list
=
schoolXprojectResearchService
.
selectSchoolXprojectResearchList
(
schoolXprojectResearchVo
);
return
getDataTable
(
list
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXprojectResearchVo
.
setUserIds
(
deptUserIds
);
}
startPage
();
List
<
SchoolXprojectResearchVo
>
list
=
schoolXprojectResearchService
.
selectSchoolXprojectResearchList
(
schoolXprojectResearchVo
);
return
getDataTable
(
list
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"ktyj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
startPage
();
List
<
SchoolXprojectResearchVo
>
list
=
schoolXprojectResearchService
.
selectSchoolXprojectResearchList
(
schoolXprojectResearchVo
);
return
getDataTable
(
list
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXprojectResearchVo
.
setUserIds
(
deptUserIds
);
}
startPage
();
List
<
SchoolXprojectResearchVo
>
list
=
schoolXprojectResearchService
.
selectSchoolXprojectResearchList
(
schoolXprojectResearchVo
);
return
getDataTable
(
list
);
}
return
getDataTable
(
new
ArrayList
<>());
}
...
...
@@ -143,37 +148,41 @@ public class SchoolXprojectResearchController extends BaseController {
ExcelUtil
<
SchoolXprojectResearchVo
>
util
=
new
ExcelUtil
<
SchoolXprojectResearchVo
>(
SchoolXprojectResearchVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"课题研究数据"
);
}
else
{
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"ktyj_admin"
)){
List
<
SchoolXprojectResearchVo
>
list
=
schoolXprojectResearchService
.
selectSchoolXprojectResearchList
(
schoolXprojectResearchVo
);
for
(
SchoolXprojectResearchVo
xprojectResearchVo
:
list
)
{
i
++;
xprojectResearchVo
.
setXh
(
i
);
xprojectResearchVo
.
setGrowthType
(
"课题研究"
);
}
ExcelUtil
<
SchoolXprojectResearchVo
>
util
=
new
ExcelUtil
<
SchoolXprojectResearchVo
>(
SchoolXprojectResearchVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"课题研究数据"
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXprojectResearchVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXprojectResearchVo
>
list
=
schoolXprojectResearchService
.
selectSchoolXprojectResearchList
(
schoolXprojectResearchVo
);
for
(
SchoolXprojectResearchVo
xprojectResearchVo
:
list
)
{
i
++;
xprojectResearchVo
.
setXh
(
i
);
xprojectResearchVo
.
setGrowthType
(
"课题研究"
);
}
ExcelUtil
<
SchoolXprojectResearchVo
>
util
=
new
ExcelUtil
<
SchoolXprojectResearchVo
>(
SchoolXprojectResearchVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"课题研究数据"
);
}
else
{
ExcelUtil
<
SchoolXprojectResearchVo
>
util
=
new
ExcelUtil
<
SchoolXprojectResearchVo
>(
SchoolXprojectResearchVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"课题研究数据"
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"ktyj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
List
<
SchoolXprojectResearchVo
>
list
=
schoolXprojectResearchService
.
selectSchoolXprojectResearchList
(
schoolXprojectResearchVo
);
for
(
SchoolXprojectResearchVo
xprojectResearchVo
:
list
)
{
i
++;
xprojectResearchVo
.
setXh
(
i
);
xprojectResearchVo
.
setGrowthType
(
"课题研究"
);
}
ExcelUtil
<
SchoolXprojectResearchVo
>
util
=
new
ExcelUtil
<
SchoolXprojectResearchVo
>(
SchoolXprojectResearchVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"课题研究数据"
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXprojectResearchVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXprojectResearchVo
>
list
=
schoolXprojectResearchService
.
selectSchoolXprojectResearchList
(
schoolXprojectResearchVo
);
for
(
SchoolXprojectResearchVo
xprojectResearchVo
:
list
)
{
i
++;
xprojectResearchVo
.
setXh
(
i
);
xprojectResearchVo
.
setGrowthType
(
"课题研究"
);
}
ExcelUtil
<
SchoolXprojectResearchVo
>
util
=
new
ExcelUtil
<
SchoolXprojectResearchVo
>(
SchoolXprojectResearchVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"课题研究数据"
);
}
else
{
ExcelUtil
<
SchoolXprojectResearchVo
>
util
=
new
ExcelUtil
<
SchoolXprojectResearchVo
>(
SchoolXprojectResearchVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"课题研究数据"
);
}
}
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteacherAwardsController.java
View file @
b84b3d0a
...
...
@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.servlet.http.HttpServletResponse
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
...
...
@@ -67,24 +68,27 @@ public class SchoolXteacherAwardsController extends BaseController
List
<
SchoolXteacherAwardsVo
>
list
=
schoolXteacherAwardsService
.
selectSchoolXteacherAwardsList
(
schoolXteacherAwardsVo
);
return
getDataTable
(
list
);
}
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jshj_admin"
)){
startPage
();
List
<
SchoolXteacherAwardsVo
>
list
=
schoolXteacherAwardsService
.
selectSchoolXteacherAwardsList
(
schoolXteacherAwardsVo
);
return
getDataTable
(
list
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXteacherAwardsVo
.
setUserIds
(
deptUserIds
);
}
startPage
(
);
List
<
SchoolXteacherAwardsVo
>
list
=
schoolXteacherAwardsService
.
selectSchoolXteacherAwardsList
(
schoolXteacherAwardsVo
);
return
getDataTable
(
list
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jshj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
startPage
(
);
List
<
SchoolXteacherAwardsVo
>
list
=
schoolXteacherAwardsService
.
selectSchoolXteacherAwardsList
(
schoolXteacherAwardsVo
);
return
getDataTable
(
list
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
()
);
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
()
);
if
(
deptUserIds
.
size
()
>
0
){
schoolXteacherAwardsVo
.
setUserIds
(
deptUserIds
);
}
startPage
();
List
<
SchoolXteacherAwardsVo
>
list
=
schoolXteacherAwardsService
.
selectSchoolXteacherAwardsList
(
schoolXteacherAwardsVo
);
return
getDataTable
(
list
);
}
return
getDataTable
(
new
ArrayList
<>());
}
...
...
@@ -148,37 +152,41 @@ public class SchoolXteacherAwardsController extends BaseController
ExcelUtil
<
SchoolXteacherAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXteacherAwardsVo
>(
SchoolXteacherAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"教师获奖数据"
);
}
else
{
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jshj_admin"
)){
List
<
SchoolXteacherAwardsVo
>
list
=
schoolXteacherAwardsService
.
selectSchoolXteacherAwardsList
(
schoolXteacherAwardsVo
);
for
(
SchoolXteacherAwardsVo
xteacherAwardsVo
:
list
)
{
i
++;
xteacherAwardsVo
.
setXh
(
i
);
xteacherAwardsVo
.
setGrowthType
(
"教学获奖"
);
}
ExcelUtil
<
SchoolXteacherAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXteacherAwardsVo
>(
SchoolXteacherAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"教师获奖数据"
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXteacherAwardsVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXteacherAwardsVo
>
list
=
schoolXteacherAwardsService
.
selectSchoolXteacherAwardsList
(
schoolXteacherAwardsVo
);
for
(
SchoolXteacherAwardsVo
xteacherAwardsVo
:
list
)
{
i
++;
xteacherAwardsVo
.
setXh
(
i
);
xteacherAwardsVo
.
setGrowthType
(
"教学获奖"
);
}
ExcelUtil
<
SchoolXteacherAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXteacherAwardsVo
>(
SchoolXteacherAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"教师获奖数据"
);
}
else
{
ExcelUtil
<
SchoolXteacherAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXteacherAwardsVo
>(
SchoolXteacherAwardsVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"教师获奖数据"
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"jshj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
List
<
SchoolXteacherAwardsVo
>
list
=
schoolXteacherAwardsService
.
selectSchoolXteacherAwardsList
(
schoolXteacherAwardsVo
);
for
(
SchoolXteacherAwardsVo
xteacherAwardsVo
:
list
)
{
i
++;
xteacherAwardsVo
.
setXh
(
i
);
xteacherAwardsVo
.
setGrowthType
(
"教学获奖"
);
}
ExcelUtil
<
SchoolXteacherAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXteacherAwardsVo
>(
SchoolXteacherAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"教师获奖数据"
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXteacherAwardsVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXteacherAwardsVo
>
list
=
schoolXteacherAwardsService
.
selectSchoolXteacherAwardsList
(
schoolXteacherAwardsVo
);
for
(
SchoolXteacherAwardsVo
xteacherAwardsVo
:
list
)
{
i
++;
xteacherAwardsVo
.
setXh
(
i
);
xteacherAwardsVo
.
setGrowthType
(
"教学获奖"
);
}
ExcelUtil
<
SchoolXteacherAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXteacherAwardsVo
>(
SchoolXteacherAwardsVo
.
class
);
util
.
exportExcel
(
response
,
list
,
"教师获奖数据"
);
}
else
{
ExcelUtil
<
SchoolXteacherAwardsVo
>
util
=
new
ExcelUtil
<
SchoolXteacherAwardsVo
>(
SchoolXteacherAwardsVo
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"教师获奖数据"
);
}
}
}
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteachingAchievementsController.java
View file @
b84b3d0a
This diff is collapsed.
Click to expand it.
smart-campus/src/main/java/yangtz/cs/liu/campus/controller/schoolNewTeacherDzdn/SchoolXteamAwardController.java
View file @
b84b3d0a
...
...
@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.controller.schoolNewTeacherDzdn;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.servlet.http.HttpServletResponse
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
...
...
@@ -64,24 +65,28 @@ public class SchoolXteamAwardController extends BaseController
List
<
SchoolXteamAwardVo
>
list
=
schoolXteamAwardService
.
selectSchoolXteamAwardVoList
(
schoolXteamAwardVo
);
return
getDataTable
(
list
);
}
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"tdhj_admin"
)){
startPage
();
List
<
SchoolXteamAwardVo
>
list
=
schoolXteamAwardService
.
selectSchoolXteamAwardVoList
(
schoolXteamAwardVo
);
return
getDataTable
(
list
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXteamAwardVo
.
setUserIds
(
deptUserIds
);
}
startPage
();
List
<
SchoolXteamAwardVo
>
list
=
schoolXteamAwardService
.
selectSchoolXteamAwardVoList
(
schoolXteamAwardVo
);
return
getDataTable
(
list
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"tdhj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
startPage
();
List
<
SchoolXteamAwardVo
>
list
=
schoolXteamAwardService
.
selectSchoolXteamAwardVoList
(
schoolXteamAwardVo
);
return
getDataTable
(
list
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXteamAwardVo
.
setUserIds
(
deptUserIds
);
}
startPage
();
List
<
SchoolXteamAwardVo
>
list
=
schoolXteamAwardService
.
selectSchoolXteamAwardVoList
(
schoolXteamAwardVo
);
return
getDataTable
(
list
);
}
return
getDataTable
(
new
ArrayList
<>());
}
...
...
@@ -117,30 +122,33 @@ public class SchoolXteamAwardController extends BaseController
ExcelUtil
<
SchoolXteamAward
>
util
=
new
ExcelUtil
<
SchoolXteamAward
>(
SchoolXteamAward
.
class
);
util
.
exportExcel
(
response
,
list
,
"团队获奖数据"
);
}
else
{
for
(
SysRole
role
:
roles
)
{
if
(
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"tdhj_admin"
)){
List
<
SchoolXteamAward
>
list
=
schoolXteamAwardService
.
selectSchoolXteamAwardList
(
schoolXteamAwardVo
);
ExcelUtil
<
SchoolXteamAward
>
util
=
new
ExcelUtil
<
SchoolXteamAward
>(
SchoolXteamAward
.
class
);
util
.
exportExcel
(
response
,
list
,
"团队获奖数据"
);
}
else
if
(
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXteamAwardVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXteamAward
>
list
=
schoolXteamAwardService
.
selectSchoolXteamAwardList
(
schoolXteamAwardVo
);
ExcelUtil
<
SchoolXteamAward
>
util
=
new
ExcelUtil
<
SchoolXteamAward
>(
SchoolXteamAward
.
class
);
util
.
exportExcel
(
response
,
list
,
"团队获奖数据"
);
}
else
{
ExcelUtil
<
SchoolXteamAward
>
util
=
new
ExcelUtil
<
SchoolXteamAward
>(
SchoolXteamAward
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"团队获奖数据"
);
//全部权限
List
<
SysRole
>
roleList
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdzdncj_admin"
)
||
role
.
getRoleKey
().
equals
(
"tdhj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList
.
size
()
>
0
){
List
<
SchoolXteamAward
>
list
=
schoolXteamAwardService
.
selectSchoolXteamAwardList
(
schoolXteamAwardVo
);
ExcelUtil
<
SchoolXteamAward
>
util
=
new
ExcelUtil
<
SchoolXteamAward
>(
SchoolXteamAward
.
class
);
util
.
exportExcel
(
response
,
list
,
"团队获奖数据"
);
}
//部分权限
List
<
SysRole
>
roleList1
=
roles
.
stream
().
filter
(
role
->
role
.
getRoleKey
().
equals
(
"jsdnzj_admin"
)).
collect
(
Collectors
.
toList
());
if
(
roleList1
.
size
()
>
0
){
//教师电子档案中级管理员只能查看本部门及部门以下的数据
//根据用户部门id查询用户部门信息
SysDept
sysDept
=
sysDeptService
.
selectDeptById
(
user
.
getDeptId
());
//查询本部门下所有教师的id
List
<
Long
>
deptUserIds
=
schoolXteachingAchievementsService
.
getUserIdsByDeptId
(
sysDept
.
getDeptId
());
if
(
deptUserIds
.
size
()
>
0
){
schoolXteamAwardVo
.
setUserIds
(
deptUserIds
);
}
List
<
SchoolXteamAward
>
list
=
schoolXteamAwardService
.
selectSchoolXteamAwardList
(
schoolXteamAwardVo
);
ExcelUtil
<
SchoolXteamAward
>
util
=
new
ExcelUtil
<
SchoolXteamAward
>(
SchoolXteamAward
.
class
);
util
.
exportExcel
(
response
,
list
,
"团队获奖数据"
);
}
else
{
ExcelUtil
<
SchoolXteamAward
>
util
=
new
ExcelUtil
<
SchoolXteamAward
>(
SchoolXteamAward
.
class
);
util
.
exportExcel
(
response
,
new
ArrayList
<>(),
"团队获奖数据"
);
}
}
}
/**
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationMapper.java
View file @
b84b3d0a
package
yangtz
.
cs
.
liu
.
campus
.
mapper
.
schoolNewTeacherDzdn
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.apache.ibatis.annotations.Param
;
import
yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolIdCardQuerReq
;
import
yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformation
;
import
yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.SchoolTeacherBasicInformationVo
;
...
...
@@ -18,4 +19,11 @@ public interface SchoolTeacherBasichlnformationMapper extends BaseMapper<SchoolT
List
<
SchoolIdCardQuerReq
>
selectByIdCardMap
();
/**
* 根据手机号查询身份证信息
* @param userPhones
* @return
*/
List
<
String
>
selectIdCardsByDdPhone
(
@Param
(
"userPhones"
)
List
<
String
>
userPhones
);
}
smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.java
View file @
b84b3d0a
...
...
@@ -75,11 +75,11 @@ public interface SchoolXteachingAchievementsMapper extends BaseMapper<SchoolXtea
List
<
Long
>
getUserIdsByDeptId
(
@Param
(
"deptId"
)
Long
deptId
);
/**
* 查询本部门下所有教师
身份证
号
* 查询本部门下所有教师
手机
号
* @param deptId
* @return
*/
List
<
String
>
getUser
IdCard
sByDeptId
(
@Param
(
"deptId"
)
Long
deptId
);
List
<
String
>
getUser
Phone
sByDeptId
(
@Param
(
"deptId"
)
Long
deptId
);
/**
* 查询所有级部id
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationServicelmpl.java
View file @
b84b3d0a
...
...
@@ -803,6 +803,15 @@ public class SchoolTeacherBasichlnformationServicelmpl extends ServiceImpl<Schoo
}
/**
* 根据手机号查询身份证信息
* @param userPhones
* @return
*/
@Override
public
List
<
String
>
selectIdCardsByDdPhone
(
List
<
String
>
userPhones
)
{
return
teacherBasichlnformationMapper
.
selectIdCardsByDdPhone
(
userPhones
);
}
@Override
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolNewTeacherDzdn/SchoolXteachingAchievementsServiceImpl.java
View file @
b84b3d0a
...
...
@@ -438,13 +438,13 @@ public class SchoolXteachingAchievementsServiceImpl extends ServiceImpl<SchoolXt
}
/**
* 查询本部门下所有教师
身份证
号
* 查询本部门下所有教师
手机
号
* @param deptId
* @return
*/
@Override
public
List
<
String
>
getUser
IdCard
sByDeptId
(
Long
deptId
)
{
return
schoolXteachingAchievementsMapper
.
getUser
IdCard
sByDeptId
(
deptId
);
public
List
<
String
>
getUser
Phone
sByDeptId
(
Long
deptId
)
{
return
schoolXteachingAchievementsMapper
.
getUser
Phone
sByDeptId
(
deptId
);
}
/**
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/ISchoolXteachingAchievementsService.java
View file @
b84b3d0a
...
...
@@ -100,11 +100,11 @@ public interface ISchoolXteachingAchievementsService extends IService<SchoolXtea
List
<
Long
>
getUserIdsByDeptId
(
Long
deptId
);
/**
* 查询本部门下所有教师
身份证
号
* 查询本部门下所有教师
手机
号
* @param deptId
* @return
*/
List
<
String
>
getUser
IdCard
sByDeptId
(
Long
deptId
);
List
<
String
>
getUser
Phone
sByDeptId
(
Long
deptId
);
/**
* 查询所有级部id
...
...
smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolNewTeacherDzdn/SchoolTeacherBasichlnformationService.java
View file @
b84b3d0a
...
...
@@ -2,6 +2,7 @@ package yangtz.cs.liu.campus.service.schoolNewTeacherDzdn;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.web.multipart.MultipartFile
;
import
yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.ComperhensiveVo
;
import
yangtz.cs.liu.campus.domain.schoolNewTeacherDzdn.ComprehensiveReq
;
...
...
@@ -38,4 +39,11 @@ public interface SchoolTeacherBasichlnformationService extends IService<SchoolT
List
<
SchoolTeacherBasicInformation
>
importExcel
(
MultipartFile
inputStream
)
throws
IOException
;
/**
* 根据手机号查询身份证信息
* @param userPhones
* @return
*/
List
<
String
>
selectIdCardsByDdPhone
(
List
<
String
>
userPhones
);
}
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolTeacherBasiclnformationMapper.xml
View file @
b84b3d0a
...
...
@@ -38,10 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"firstDegree != null "
>
AND CONCAT(IFNULL(first_degree,''),IFNULL(last_degree,'')) LIKE concat('%',#{firstDegree},'%')
</if>
<if
test=
"
idCard
s != null"
>
and
id_card
in
<foreach
item=
"
idCard"
collection=
"idCard
s"
open=
"("
separator=
","
close=
")"
>
#{
idCard
}
<if
test=
"
userPhone
s != null"
>
and
dd_phone
in
<foreach
item=
"
userPhone"
collection=
"userPhone
s"
open=
"("
separator=
","
close=
")"
>
#{
userPhone
}
</foreach>
</if>
</select>
...
...
@@ -107,4 +107,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
where id = #{id}
</update>
<select
id=
"selectIdCardsByDdPhone"
parameterType=
"String"
resultType=
"String"
>
SELECT DISTINCT
id_card
FROM
school_teacher_basic_information
WHERE
del_flag = '0'
<if
test=
"userPhones != null"
>
and dd_phone in
<foreach
item=
"userPhone"
collection=
"userPhones"
open=
"("
separator=
","
close=
")"
>
#{userPhone}
</foreach>
</if>
</select>
</mapper>
smart-campus/src/main/resources/mapper/schoolNewTeacherDzdn/SchoolXteachingAchievementsMapper.xml
View file @
b84b3d0a
...
...
@@ -177,9 +177,9 @@
OR #{deptId} IN ( SELECT ud.dept_id FROM sys_user_dept ud WHERE ud.user_id = u.user_id )
</select>
<select
id=
"getUser
IdCard
sByDeptId"
parameterType=
"Long"
resultType=
"String"
>
<select
id=
"getUser
Phone
sByDeptId"
parameterType=
"Long"
resultType=
"String"
>
SELECT
DISTINCT t.
id_card
DISTINCT t.
teacher_tel
FROM
sys_user u
LEFT JOIN sys_dept d ON u.dept_id = d.dept_id
...
...
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