xgxt_sd/zhxg_java
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

为综合素质板块的综合模块完善姓名、学号、学院、专业、班级,以方便搜索

Browse Source
This commit is contained in:
weishengyou
2026-01-12 17:00:08 +08:00
parent 69e9147a92
commit 65f2f8d74c
23 changed files with 468 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphClasstwoController.java
View File

@@ -66,6 +66,9 @@ public class CphClasstwoController extends BaseController
srsStudent.setName(cphIamStudentUser.getName());
}
cphClasstwo.setStudent(srsStudent);
// 添加学院和专业的查询条件
cphClasstwo.setDeptId(cphIamStudentUser.getDeptId());
cphClasstwo.setMajorId(cphIamStudentUser.getMajorId());
startPage();
List<CphClasstwo> list = cphClasstwoService.selectCphClasstwoListJoin(cphClasstwo);
return getDataTable(list);
@@ -77,8 +80,25 @@ public class CphClasstwoController extends BaseController
*/
@Log(title = "第二课堂", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, CphClasstwo cphClasstwo)
public void export(HttpServletResponse response, CphClasstwo cphClasstwo, stuYearStudentUser stuYearStudentUser)
{
if (stuYearStudentUser != null) {
cphClasstwo.setStuYearId(stuYearStudentUser.getStuYearId());
SrsStudent srsStudent = new SrsStudent();
if (stuYearStudentUser.getClassId() != null){
srsStudent.setClassId(stuYearStudentUser.getClassId());
}
if (stuYearStudentUser.getStuNo() != null){
srsStudent.setStuNo(stuYearStudentUser.getStuNo());
}
if (stuYearStudentUser.getName() != null){
srsStudent.setName("%" + stuYearStudentUser.getName() + "%");
}
cphClasstwo.setStudent(srsStudent);
// 添加学院和专业的查询条件
cphClasstwo.setDeptId(stuYearStudentUser.getDeptId());
cphClasstwo.setMajorId(stuYearStudentUser.getMajorId());
}
List<CphClasstwo> list = cphClasstwoService.selectCphClasstwoList(cphClasstwo);
ExcelUtil<CphClasstwo> util = new ExcelUtil<CphClasstwo>(CphClasstwo.class);
util.exportExcel(response, list, "第二课堂数据");

5
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIamController.java
View File

@@ -145,8 +145,11 @@ public class CphIamController extends BaseController {
if(StringUtils.isNotNull(cphIamStudentUser.getName()))
cphIam.setName("%"+cphIamStudentUser.getName()+"%");
cphIam.setClassId(cphIamStudentUser.getClassId());
// 添加学院和专业的查询条件
cphIam.setDeptId(cphIamStudentUser.getDeptId());
cphIam.setMajorId(cphIamStudentUser.getMajorId());
List<CphIdeologyScore> cphIam1= cphIamService.selectCphIamSumList(cphIam);
List<CphIdeologyScore> cphIam1= cphIamService.selectCphIamSumList(cphIam);
return getDataTable(cphIam1);
}

21
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIdeologyScoreController.java
View File

@@ -14,6 +14,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import com.srs.comprehensive.domain.CphIdeologyScore;
import com.srs.comprehensive.service.ICphIdeologyScoreService;
import com.srs.comprehensive.domain.Vo.stuYearStudentUser;
import com.srs.common.core.controller.BaseController;
import com.srs.common.core.domain.AjaxResult;
import com.srs.common.utils.poi.ExcelUtil;
@@ -49,8 +50,16 @@ public class CphIdeologyScoreController extends BaseController {
@PreAuthorize("@ss.hasPermi('comprehensive:ideologyscore:list')")
@GetMapping("/list")
@ApiOperation("查询思想品德初始分数列表")
public TableDataInfo list(CphIdeologyScore cphIdeologyScore)
public TableDataInfo list(CphIdeologyScore cphIdeologyScore, stuYearStudentUser stuYearStudentUser)
{
if (stuYearStudentUser != null) {
cphIdeologyScore.setClassId(stuYearStudentUser.getClassId());
cphIdeologyScore.setDeptId(stuYearStudentUser.getDeptId());
cphIdeologyScore.setMajorId(stuYearStudentUser.getMajorId());
cphIdeologyScore.setStuYearId(stuYearStudentUser.getStuYearId());
cphIdeologyScore.setStuNo(stuYearStudentUser.getStuNo());
cphIdeologyScore.setName(stuYearStudentUser.getName());
}
startPage();
List<CphIdeologyScore> list = cphIdeologyScoreService.selectCphIdeologyScoreList(cphIdeologyScore);
return getDataTable(list);
@@ -63,8 +72,16 @@ public class CphIdeologyScoreController extends BaseController {
@Log(title = "思想品德初始分数", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出思想品德初始分数列表")
public void export(HttpServletResponse response, CphIdeologyScore cphIdeologyScore)
public void export(HttpServletResponse response, CphIdeologyScore cphIdeologyScore, stuYearStudentUser stuYearStudentUser)
{
if (stuYearStudentUser != null) {
cphIdeologyScore.setClassId(stuYearStudentUser.getClassId());
cphIdeologyScore.setDeptId(stuYearStudentUser.getDeptId());
cphIdeologyScore.setMajorId(stuYearStudentUser.getMajorId());
cphIdeologyScore.setStuYearId(stuYearStudentUser.getStuYearId());
cphIdeologyScore.setStuNo(stuYearStudentUser.getStuNo());
cphIdeologyScore.setName(stuYearStudentUser.getName());
}
List<CphIdeologyScore> list = cphIdeologyScoreService.selectCphIdeologyScoreList(cphIdeologyScore);
ExcelUtil<CphIdeologyScore> util = new ExcelUtil<CphIdeologyScore>(CphIdeologyScore.class);
util.exportExcel(response, list, "思想品德初始分数数据");

24
srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphProRankingController.java
View File

@@ -9,6 +9,7 @@ import com.srs.common.core.domain.entity.SysUser;
import com.srs.comprehensive.domain.CphProRank;
import com.srs.comprehensive.domain.Dto.CphProRankingDto;
import com.srs.comprehensive.domain.Vo.CphProRankingVo;
import com.srs.comprehensive.domain.Vo.stuYearStudentUser;
import com.srs.dormitory.domain.Dto.DormitoryModelDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -55,7 +56,11 @@ public class CphProRankingController extends BaseController {
@PreAuthorize("@ss.hasPermi('comprehensive:ranking:list')")
@GetMapping("/list")
@ApiOperation("查询平均学分绩总排名列表")
public TableDataInfo list(CphProRank cphProRanking) {
public TableDataInfo list(CphProRank cphProRanking, stuYearStudentUser stuYearStudentUser) {
if(stuYearStudentUser != null) {
cphProRanking.setDeptId(stuYearStudentUser.getDeptId());
cphProRanking.setMajorId(stuYearStudentUser.getMajorId());
}
startPage();
List<CphProRank> rank = cphProRankingService.getRankList(cphProRanking);
return getDataTable(rank);
@@ -106,7 +111,22 @@ public class CphProRankingController extends BaseController {
@Log(title = "平均学分绩总排名", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation("导出平均学分绩总排名列表")
public void export(HttpServletResponse response, CphProRank cphProRanking) {
public void export(HttpServletResponse response, CphProRank cphProRanking, stuYearStudentUser stuYearStudentUser) {
if (stuYearStudentUser != null) {
cphProRanking.setStuYearId(stuYearStudentUser.getStuYearId());
if (stuYearStudentUser.getClassId() != null){
cphProRanking.setClassId(stuYearStudentUser.getClassId());
}
if (stuYearStudentUser.getStuNo() != null){
cphProRanking.setStuNo(stuYearStudentUser.getStuNo());
}
if (stuYearStudentUser.getName() != null){
cphProRanking.setXsxm(stuYearStudentUser.getName());
}
// 添加学院和专业的查询条件
cphProRanking.setDeptId(stuYearStudentUser.getDeptId());
cphProRanking.setMajorId(stuYearStudentUser.getMajorId());
}
List<CphProRank> list = cphProRankingService.getRankList(cphProRanking);
ExcelUtil<CphProRank> util = new ExcelUtil<CphProRank>(CphProRank.class);
util.exportExcel(response, list, "平均学分绩总排名数据");

22
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCeScoreController.java
View File

@@ -54,8 +54,25 @@ public class SrsCeScoreController extends BaseController
*/
@Log(title = "综合评价", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SrsCeScore srsCeScore)
public void export(HttpServletResponse response, SrsCeScore srsCeScore, stuYearStudentUser stuYearStudentUser)
{
if (stuYearStudentUser != null) {
srsCeScore.setStuYearId(stuYearStudentUser.getStuYearId());
SrsStudent srsStudent = new SrsStudent();
if (stuYearStudentUser.getClassId() != null){
srsStudent.setClassId(stuYearStudentUser.getClassId());
}
if (stuYearStudentUser.getStuNo() != null){
srsStudent.setStuNo(stuYearStudentUser.getStuNo());
}
if (stuYearStudentUser.getName() != null){
srsStudent.setName("%" + stuYearStudentUser.getName() + "%");
}
srsCeScore.setStudent(srsStudent);
// 添加学院和专业的查询条件
srsCeScore.setDeptId(stuYearStudentUser.getDeptId());
srsCeScore.setMajorId(stuYearStudentUser.getMajorId());
}
List<SrsCeScore> list = srsCeScoreService.selectSrsCeScoreList(srsCeScore);
ExcelUtil<SrsCeScore> util = new ExcelUtil<SrsCeScore>(SrsCeScore.class);
util.exportExcel(response, list, "综合评价数据");
@@ -122,6 +139,9 @@ public class SrsCeScoreController extends BaseController
srsStudent.setName(cphIamStudentUser.getName());
}
srsCeScore.setStudent(srsStudent);
// 添加学院和专业的查询条件
srsCeScore.setDeptId(cphIamStudentUser.getDeptId());
srsCeScore.setMajorId(cphIamStudentUser.getMajorId());
startPage();
List<SrsCeScoreStudentStuYear> srsCeScoreStudentStuYears = srsCeScoreService.SrsCeScoreStudentStuYear(srsCeScore);
return getDataTable(srsCeScoreStudentStuYears);

3
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCourseScoreController.java
View File

@@ -161,6 +161,9 @@ public class SrsCourseScoreController extends BaseController {
srsStudent.setName(cphIamStudentUser.getName());
}
srsSportTest.setStudent(srsStudent);
// 添加学院和专业的查询条件
srsSportTest.setDeptId(cphIamStudentUser.getDeptId());
srsSportTest.setMajorId(cphIamStudentUser.getMajorId());
if (cphIamStudentUser.getTestScoreFrom()!= null) {
srsSportTest.setTestScoreFrom(cphIamStudentUser.getTestScoreFrom());
}

10
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java
View File

@@ -325,7 +325,15 @@ public class SrsCqScoreController extends BaseController {
}
@GetMapping("/listCphScore")
public TableDataInfo listCphScore(CphSearch search) {
public TableDataInfo listCphScore(CphSearch search, stuYearStudentUser stuYearStudentUser) {
if (stuYearStudentUser != null) {
search.setClassId(stuYearStudentUser.getClassId());
search.setDeptId(stuYearStudentUser.getDeptId());
search.setMajorId(stuYearStudentUser.getMajorId());
search.setStuYearId(stuYearStudentUser.getStuYearId());
search.setStuNo(stuYearStudentUser.getStuNo());
/*search.setStuName(stuYearStudentUser.getName());*/
}
startPage();
List<CphTotalScoreInfo> list = srsCqScoreService.listCphScore(search);
return getDataTable(list);

19
srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsSportTestController.java
View File

@@ -70,8 +70,25 @@ public class SrsSportTestController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:sportTest:export')")
@Log(title = "体能测试", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, SrsSportTest srsSportTest)
public void export(HttpServletResponse response, SrsSportTest srsSportTest, stuYearStudentUser stuYearStudentUser)
{
if (stuYearStudentUser != null) {
srsSportTest.setStuYearId(stuYearStudentUser.getStuYearId());
SrsStudent srsStudent = new SrsStudent();
if (stuYearStudentUser.getClassId() != null){
srsStudent.setClassId(stuYearStudentUser.getClassId());
}
if (stuYearStudentUser.getStuNo() != null){
srsStudent.setStuNo(stuYearStudentUser.getStuNo());
}
if (stuYearStudentUser.getName() != null){
srsStudent.setName("%" + stuYearStudentUser.getName() + "%");
}
srsSportTest.setStudent(srsStudent);
// 添加学院和专业的查询条件
srsSportTest.setDeptId(stuYearStudentUser.getDeptId());
srsSportTest.setMajorId(stuYearStudentUser.getMajorId());
}
List<SrsSportTest> list = srsSportTestService.selectSrsSportTestList(srsSportTest);
ExcelUtil<SrsSportTest> util = new ExcelUtil<SrsSportTest>(SrsSportTest.class);
util.exportExcel(response, list, "体能测试数据");

15
srs-admin/src/main/java/com/srs/web/controller/routine/NotificationManagementController.java
View File

@@ -139,4 +139,19 @@ public class NotificationManagementController extends BaseController {
List<NotificationManagement> list = notificationManagementService.selectNotificationManagementListBySender(notificationManagement);
return getDataTable(list);
}
/**
* 向指定学号的学生发送通知(DTO方式)
*/
/*@PreAuthorize("@ss.hasPermi('routine:NotificationManagement:add')")
@Log(title = "向学生发送通知", businessType = BusinessType.INSERT)
@PostMapping("/sendToStudentDto")
@ApiOperation("向指定学号的学生发送通知(DTO方式)")
public AjaxResult sendNotificationToStudentDto(@RequestBody SendToStudentDto sendToStudentDto) {
int result = notificationManagementService.sendNotificationToStudent(
sendToStudentDto.getStudentNo(),
sendToStudentDto.getTitle(),
sendToStudentDto.getContent());
return toAjax(result);
}*/
}