From 65f2f8d74c62c9a30d8f5c4813804b261267abc4 Mon Sep 17 00:00:00 2001 From: weishengyou <2454197255@qq.com> Date: Mon, 12 Jan 2026 17:00:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=BB=BC=E5=90=88=E7=B4=A0=E8=B4=A8?= =?UTF-8?q?=E6=9D=BF=E5=9D=97=E7=9A=84=E7=BB=BC=E5=90=88=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=A7=93=E5=90=8D=E3=80=81=E5=AD=A6=E5=8F=B7?= =?UTF-8?q?=E3=80=81=E5=AD=A6=E9=99=A2=E3=80=81=E4=B8=93=E4=B8=9A=E3=80=81?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7,=E4=BB=A5=E6=96=B9=E4=BE=BF=E6=90=9C?= =?UTF-8?q?=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../comprehensive/CphClasstwoController.java | 22 +++- .../comprehensive/CphIamController.java | 5 +- .../CphIdeologyScoreController.java | 21 +++- .../CphProRankingController.java | 24 +++- .../comprehensive/SrsCeScoreController.java | 22 +++- .../SrsCourseScoreController.java | 3 + .../comprehensive/SrsCqScoreController.java | 10 +- .../comprehensive/SrsSportTestController.java | 19 ++- .../NotificationManagementController.java | 15 +++ .../srs/comprehensive/domain/CphClasstwo.java | 24 ++++ .../com/srs/comprehensive/domain/CphIam.java | 43 +++++++ .../domain/CphIdeologyScore.java | 10 ++ .../srs/comprehensive/domain/CphProRank.java | 114 +++++++++++++++++- .../srs/comprehensive/domain/SrsCeScore.java | 22 ++++ .../comprehensive/domain/SrsSportTest.java | 24 ++++ .../domain/Vo/stuYearStudentUser.java | 4 + .../comprehensive/CphClasstwoMapper.xml | 33 +++-- .../mapper/comprehensive/CphIamMapper.xml | 10 ++ .../comprehensive/CphIdeologyScoreMapper.xml | 21 +++- .../comprehensive/CphProRankingMapper.xml | 2 + .../mapper/comprehensive/SrsCeScoreMapper.xml | 37 ++++-- .../comprehensive/SrsCourseScoreMapper.xml | 10 +- .../comprehensive/SrsSportTestMapper.xml | 9 +- 23 files changed, 468 insertions(+), 36 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphClasstwoController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphClasstwoController.java index 6650e28..0dffe30 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphClasstwoController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphClasstwoController.java @@ -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 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 list = cphClasstwoService.selectCphClasstwoList(cphClasstwo); ExcelUtil util = new ExcelUtil(CphClasstwo.class); util.exportExcel(response, list, "第二课堂数据"); diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIamController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIamController.java index 47021b0..227a62d 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIamController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIamController.java @@ -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 cphIam1= cphIamService.selectCphIamSumList(cphIam); + List cphIam1= cphIamService.selectCphIamSumList(cphIam); return getDataTable(cphIam1); } diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIdeologyScoreController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIdeologyScoreController.java index be7c9e8..3ecf826 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIdeologyScoreController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphIdeologyScoreController.java @@ -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 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 list = cphIdeologyScoreService.selectCphIdeologyScoreList(cphIdeologyScore); ExcelUtil util = new ExcelUtil(CphIdeologyScore.class); util.exportExcel(response, list, "思想品德初始分数数据"); diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphProRankingController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphProRankingController.java index 1b71fcc..63fc305 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphProRankingController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphProRankingController.java @@ -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 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 list = cphProRankingService.getRankList(cphProRanking); ExcelUtil util = new ExcelUtil(CphProRank.class); util.exportExcel(response, list, "平均学分绩总排名数据"); diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCeScoreController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCeScoreController.java index db1a173..1bdf4cd 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCeScoreController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCeScoreController.java @@ -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 list = srsCeScoreService.selectSrsCeScoreList(srsCeScore); ExcelUtil util = new ExcelUtil(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 srsCeScoreStudentStuYears = srsCeScoreService.SrsCeScoreStudentStuYear(srsCeScore); return getDataTable(srsCeScoreStudentStuYears); diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCourseScoreController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCourseScoreController.java index a8e60a5..5505284 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCourseScoreController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCourseScoreController.java @@ -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()); } diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java index 7ea7fdb..ed49cec 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsCqScoreController.java @@ -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 list = srsCqScoreService.listCphScore(search); return getDataTable(list); diff --git a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsSportTestController.java b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsSportTestController.java index f3709ff..749cbda 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsSportTestController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsSportTestController.java @@ -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 list = srsSportTestService.selectSrsSportTestList(srsSportTest); ExcelUtil util = new ExcelUtil(SrsSportTest.class); util.exportExcel(response, list, "体能测试数据"); diff --git a/srs-admin/src/main/java/com/srs/web/controller/routine/NotificationManagementController.java b/srs-admin/src/main/java/com/srs/web/controller/routine/NotificationManagementController.java index 38f1d9c..5dc2337 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/routine/NotificationManagementController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/routine/NotificationManagementController.java @@ -139,4 +139,19 @@ public class NotificationManagementController extends BaseController { List 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); + }*/ } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphClasstwo.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphClasstwo.java index 731fb66..1e3dce0 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphClasstwo.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphClasstwo.java @@ -82,6 +82,14 @@ public class CphClasstwo extends BaseEntity @TableField(exist = false) private SysUser user; + + /** 学院id */ + @TableField(exist = false) + private Long deptId; + + /** 专业id */ + @TableField(exist = false) + private Long majorId; public SysUser getUser() { return user; } @@ -235,4 +243,20 @@ public class CphClasstwo extends BaseEntity public void setStuNo(String stuNo) { this.stuNo = stuNo; } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public Long getMajorId() { + return majorId; + } + + public void setMajorId(Long majorId) { + this.majorId = majorId; + } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphIam.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphIam.java index 8650eca..25405f2 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphIam.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphIam.java @@ -1,6 +1,7 @@ package com.srs.comprehensive.domain; import com.srs.common.core.domain.entity.SysUser; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.srs.common.annotation.Excel; @@ -75,6 +76,48 @@ public class CphIam extends BaseEntity public String className; public String majorName; + private Long classId;//班级id + + public Long getClassId() { + return classId; + } + + public void setClassId(Long classId) { + this.classId = classId; + } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public Long getMajorId() { + return majorId; + } + + public void setMajorId(Long majorId) { + this.majorId = majorId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + /** 学院id*/ + private Long deptId; + /** 专业id*/ + private Long majorId; + + private String name; + + public SrsStudent getStudent() { return student; } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphIdeologyScore.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphIdeologyScore.java index 15d9c49..2539978 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphIdeologyScore.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphIdeologyScore.java @@ -105,4 +105,14 @@ public class CphIdeologyScore extends BaseEntity { @TableField(exist = false) private String className; + /** 学院id */ + @Excel(name = "学院id") + @TableField(exist = false) + private Long deptId; + + /** 专业id */ + @Excel(name = "专业id") + @TableField(exist = false) + private Long majorId; + } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphProRank.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphProRank.java index 1d5c056..3018c93 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphProRank.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/CphProRank.java @@ -43,4 +43,116 @@ public class CphProRank { private Long ranking; @Excel(name = "不及格课程数门数") private Long nopass; -} + + /** 学院id */ + @TableField(exist = false) + private Long deptId; + + /** 专业id */ + @TableField(exist = false) + private Long majorId; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getStuNo() { + return stuNo; + } + + public void setStuNo(String stuNo) { + this.stuNo = stuNo; + } + + public String getXsxm() { + return xsxm; + } + + public void setXsxm(String xsxm) { + this.xsxm = xsxm; + } + + public Long getClassId() { + return classId; + } + + public void setClassId(Long classId) { + this.classId = classId; + } + + public String getClassCode() { + return classCode; + } + + public void setClassCode(String classCode) { + this.classCode = classCode; + } + + public String getClassName() { + return className; + } + + public void setClassName(String className) { + this.className = className; + } + + public Long getStuYearId() { + return stuYearId; + } + + public void setStuYearId(Long stuYearId) { + this.stuYearId = stuYearId; + } + + public String getStuYearName() { + return stuYearName; + } + + public void setStuYearName(String stuYearName) { + this.stuYearName = stuYearName; + } + + public BigDecimal getTotalScore() { + return totalScore; + } + + public void setTotalScore(BigDecimal totalScore) { + this.totalScore = totalScore; + } + public BigDecimal getAvgScore() { + return avgScore; + } + + public void setAvgScore(BigDecimal avgScore) { + this.avgScore = avgScore; + } + + public Long getRanking() { + return ranking; + } + + public void setRanking(Long ranking) { + this.ranking = ranking; + } + + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public Long getMajorId() { + return majorId; + } + + public void setMajorId(Long majorId) { + this.majorId = majorId; + } +} \ No newline at end of file diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsCeScore.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsCeScore.java index 1ac7890..b8cd5b1 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsCeScore.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsCeScore.java @@ -38,6 +38,12 @@ public class SrsCeScore extends BaseEntity private String delFlag; private SrsStudent student; + /** 学院id */ + private Long deptId; + + /** 专业id */ + private Long majorId; + public void setId(Long id) { this.id = id; @@ -114,4 +120,20 @@ public class SrsCeScore extends BaseEntity public void setStuNo(String stuNo) { this.stuNo = stuNo; } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public Long getMajorId() { + return majorId; + } + + public void setMajorId(Long majorId) { + this.majorId = majorId; + } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsSportTest.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsSportTest.java index 4b9d242..4c02f2c 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsSportTest.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/SrsSportTest.java @@ -46,6 +46,14 @@ public class SrsSportTest extends BaseEntity @TableField() private String stuNo; + + /** 学院id */ + @TableField(exist = false) + private Long deptId; + + /** 专业id */ + @TableField(exist = false) + private Long majorId; /** 删除标志（0代表存在 */ private String delFlag; @@ -149,4 +157,20 @@ public class SrsSportTest extends BaseEntity public void setStuNo(String stuNo) { this.stuNo = stuNo; } + + public Long getDeptId() { + return deptId; + } + + public void setDeptId(Long deptId) { + this.deptId = deptId; + } + + public Long getMajorId() { + return majorId; + } + + public void setMajorId(Long majorId) { + this.majorId = majorId; + } } diff --git a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/stuYearStudentUser.java b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/stuYearStudentUser.java index 9f348e7..8b6f8d4 100644 --- a/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/stuYearStudentUser.java +++ b/srs-comprehensive/src/main/java/com/srs/comprehensive/domain/Vo/stuYearStudentUser.java @@ -7,6 +7,10 @@ import java.math.BigDecimal; @Data public class stuYearStudentUser { private Long classId;//班级id + /** 学院id*/ + private Long deptId; + /** 专业id*/ + private Long majorId; private Long stuYearId;//学年id private String stuNo; private String name; diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphClasstwoMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphClasstwoMapper.xml index 3f98a95..1afbf37 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphClasstwoMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphClasstwoMapper.xml @@ -105,14 +105,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -132,6 +145,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphIamMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphIamMapper.xml index a32543b..094e2e2 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphIamMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphIamMapper.xml @@ -120,6 +120,10 @@ and audit_status = #{auditStatus} and ss.stu_no=#{params.stuNo} and ci.stu_year_id = #{stuYearId} + and ss.class_id = #{student.classId} + and f.dept_id = #{student.deptId} + and e.major_id = #{student.majorId} + and ss.name like #{student.name} @@ -138,12 +142,16 @@ ) t1 ON ide.stu_no=t1.stu_no and ide.stu_year_id=t1.stu_year_id LEFT JOIN srs_student stu ON ide.stu_no = stu.stu_no left join srs_class sc on stu.class_id=sc.class_id + LEFT JOIN srs_majors ma on sc.major_id = ma.major_id + LEFT JOIN sys_dept d on ma.college_id = d.dept_id LEFT JOIN srs_stu_year sy ON sy.id = ide.stu_year_id and ide.stu_year_id = #{stuYearId} and stu.class_id = #{classId} and stu.stu_no = #{stuNo} and stu.name like #{name} + and d.dept_id = #{deptId} + and ma.major_id = #{majorId} @@ -160,6 +168,8 @@ and stu.class_id = #{student.classId} and stu.stu_no = #{student.stuNo} and stu.name like #{student.name} + and stu.dept_id = #{student.deptId} + and stu.major_id = #{student.majorId} diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphIdeologyScoreMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphIdeologyScoreMapper.xml index 9a256be..e785533 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphIdeologyScoreMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphIdeologyScoreMapper.xml @@ -19,17 +19,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, stu_no, score, stu_year_id, description, status, del_flag, create_by, create_time, update_by, update_time from cph_ideology_score + select i.id, i.stu_no, i.score, i.stu_year_id, i.description, i.status, i.del_flag, i.create_by, i.create_time, i.update_by, i.update_time, s.name, sy.stu_year_name, sc.class_name, m.major_name, d.dept_name + from cph_ideology_score i + left join srs_student s on i.stu_no = s.stu_no + left join srs_stu_year sy on i.stu_year_id = sy.id + left join srs_class sc on s.class_id = sc.class_id + left join srs_majors m on sc.major_id = m.major_id + left join sys_dept d on m.college_id = d.dept_id diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml index 844153c..aff5855 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml @@ -74,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and avg_credit = #{avgCredit} and ranking = #{ranking} and nopass = #{nopass} + and b.dept_id = #{deptId} + and b.major_id = #{majorId} diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCeScoreMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCeScoreMapper.xml index 499fa80..9cbb310 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCeScoreMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCeScoreMapper.xml @@ -61,14 +61,30 @@ @@ -158,15 +174,20 @@ diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCourseScoreMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCourseScoreMapper.xml index 231dcc1..455c2b8 100644 --- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCourseScoreMapper.xml +++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCourseScoreMapper.xml @@ -231,9 +231,11 @@