学年标签适配励志奖学金模块修复

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<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, "第二课堂数据");

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

@@ -145,6 +145,9 @@ 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);
         return getDataTable(cphIam1);

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<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, "思想品德初始分数数据");

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<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, "平均学分绩总排名数据");

srs-admin/src/main/java/com/srs/web/controller/comprehensive/CphStuExtraInfoController.java

@@ -4,12 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 
@@ -43,6 +38,17 @@ public class CphStuExtraInfoController extends BaseController {
         return  AjaxResult.success(res);
     }
 
+    /**
+     * 跟据学生学号查询学生其他信息
+     * @return
+     */
+    @GetMapping("/getOwnInfoByStuNo")
+    @ApiOperation("查询学生自己的其他信息")
+    public AjaxResult getOwnInfo(@RequestParam String stuNo){
+        CphStuExtraInfo res = cphStuExtraInfoService.getStuInfo(stuNo);
+        return  AjaxResult.success(res);
+    }
+
     @PostMapping("/submitOwnInfo")
     @ApiOperation("提交学生自己的其他信息")
     public AjaxResult submitOwnInfo(@RequestBody CphStuExtraInfo param){

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<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);

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());
         }

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<CphTotalScoreInfo> list = srsCqScoreService.listCphScore(search);
         return getDataTable(list);

srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsEducationExperienceController.java

@@ -5,12 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.srs.comprehensive.domain.CphFamilyMember;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import io.swagger.annotations.*;
 import org.springframework.security.access.prepost.PreAuthorize;
 
@@ -44,6 +39,16 @@ public class SrsEducationExperienceController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 跟据学号查询学生教育经历列表
+     * @return
+     */
+    @GetMapping("/getOwnExpByStuNo")
+    @ApiOperation("跟据学号查询学生教育经历列表")
+    public AjaxResult getOwnExp(@RequestParam String stuNo){
+        List<SrsEducationExperience> list = srsEducationExperienceService.getStuExp(stuNo);
+        return AjaxResult.success(list);
+    }
     @PostMapping("/editOwnExp")
     @ApiOperation("修改学生自己的家庭成员")
     public AjaxResult editOwnExp(@RequestBody SrsEducationExperience param){

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<SrsSportTest> list = srsSportTestService.selectSrsSportTestList(srsSportTest);
         ExcelUtil<SrsSportTest> util = new ExcelUtil<SrsSportTest>(SrsSportTest.class);
         util.exportExcel(response, list, "体能测试数据");

srs-admin/src/main/java/com/srs/web/controller/comprehensive/SrsStudentController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.srs.common.annotation.Anonymous;
 import com.srs.common.core.domain.entity.SysUser;
+import com.srs.common.utils.StringUtils;
 import com.srs.comprehensive.domain.Dto.StuDataSelcetDto;
 import com.srs.comprehensive.domain.Dto.StuStatusImport;
 import com.srs.comprehensive.domain.SrsStudent;
@@ -245,6 +246,15 @@ public class SrsStudentController extends BaseController {
         return AjaxResult.success(res);
     }
 
+    @GetMapping("/getOwnInfoByStuNo")
+    public AjaxResult getOwnInfoByStuNo(@RequestParam(value = "stuNo", required = false) String stuNo) {
+        if (StringUtils.isEmpty(stuNo)) {
+            return AjaxResult.error(400, "学生编号不能为空");
+        }
+        SrsStudent res = srsStudentService.getStuInfo(stuNo);
+        return AjaxResult.success(res);
+    }
+
     @GetMapping("/getOwnClass")
     public AjaxResult getOwnClass() {
         String stuNo = getUsername();

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

@@ -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);
+    }*/
 }

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;
+    }
 }

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;
     }

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;
+
 }

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;
+    }
 }

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;
+    }
 }

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;
+    }
 }

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;

srs-comprehensive/src/main/java/com/srs/comprehensive/service/impl/KnzzGlApplyServiceImpl.java

@@ -304,7 +304,7 @@ public class KnzzGlApplyServiceImpl extends ServiceImpl<KnzzGlApplyMapper,KnzzGl
             List<SrsStuYear> yearList = _yearMapper.selectYearsByTag("NLZJ");
 
             SrsStuYear year = yearList.get(0);
-            if(!year.getModuleTags().contains("TSKN")){
+            if(!year.getModuleTags().contains("NLZJ")){
                 throw new Exception("当前学年未关联到国家励志奖学金标签!");
             }
             Long yearId = year.getId();

srs-comprehensive/src/main/resources/mapper/comprehensive/CphClasstwoMapper.xml

@@ -105,14 +105,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectCphClasstwoList" parameterType="CphClasstwo" resultMap="CphClasstwoResult">
-        <include refid="selectCphClasstwoVo"/>
+        select ct.id, ct.submitter, ct.stu_year_id, ct.to_add, ct.material,
+               ct.classtwo_score,ct.rule_id, ct.description, ct.audit_status,
+               ct.del_flag, ct.create_by,
+               ct.create_time, ct.update_by, ct.update_time
+        from cph_classtwo ct
+        left join srs_student stu on stu.stu_id = ct.to_add
+        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
         <where>
-            <if test="submitter != null "> and submitter = #{submitter}</if>
+            <if test="submitter != null "> and ct.submitter = #{submitter}</if>
-            <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
+            <if test="stuYearId != null "> and ct.stu_year_id = #{stuYearId}</if>
-            <if test="toAdd != null "> and to_add = #{toAdd}</if>
+            <if test="toAdd != null "> and ct.to_add = #{toAdd}</if>
-            <if test="material != null  and material != ''"> and material = #{material}</if>
+            <if test="material != null  and material != ''"> and ct.material = #{material}</if>
-            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="description != null  and description != ''"> and ct.description = #{description}</if>
-            <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
+            <if test="auditStatus != null  and auditStatus != ''"> and ct.audit_status = #{auditStatus}</if>
+            <if test="student.classId != null "> and stu.class_id = #{student.classId}</if>
+            <if test="student.stuNo != null and student.stuNo != ''"> and stu.stu_no = #{student.stuNo}</if>
+            <if test="student.name != null and student.name != ''"> and stu.name like #{student.name}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="majorId != null "> and ma.major_id = #{majorId}</if>
         </where>
     </select>
     <sql id="selectCphClasstwoJoin">
@@ -132,6 +145,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--    第二课堂连表查询-->
     <select id="selectCphClasstwoListJoin" parameterType="CphClasstwo" resultMap="CphClasstwoResult">
         <include refid="selectCphClasstwoJoin"/>
+        left join srs_majors ma on sc.major_id = ma.major_id
+        left join sys_dept d on ma.college_id = d.dept_id
         <where>
             <if test="submitter != null "> and ct.submitter = #{submitter}</if>
             <if test="stuYearId != null "> and ct.stu_year_id = #{stuYearId}</if>
@@ -142,6 +157,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="student.classId != null "> and stu.class_id = #{student.classId}</if>
             <if test="student.stuNo != null and student.stuNo!=''"> and stu.stu_no = #{student.stuNo}</if>
             <if test="student.name != null "> and stu.name like #{student.name}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="majorId != null "> and ma.major_id = #{majorId}</if>
         </where>
     </select>
 

srs-comprehensive/src/main/resources/mapper/comprehensive/CphIamMapper.xml

@@ -120,6 +120,10 @@
             <if test="auditStatus != null  and auditStatus != ''"> and audit_status = #{auditStatus}</if>
             <if test="params.stuNo != null and params.stuNo !='' " > and ss.stu_no=#{params.stuNo}</if>
             <if test="stuYearId != null "> and ci.stu_year_id = #{stuYearId}</if>
+            <if test="student != null and student.classId != null "> and ss.class_id = #{student.classId}</if>
+            <if test="student != null and student.deptId != null "> and f.dept_id = #{student.deptId}</if>
+            <if test="student != null and student.majorId != null "> and e.major_id = #{student.majorId}</if>
+            <if test="student != null and student.name != null "> and ss.name like #{student.name}</if>
         </where>
     </select>
 
@@ -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
         <where>
             <if test="stuYearId != null "> and ide.stu_year_id = #{stuYearId}</if>
             <if test="classId != null "> and stu.class_id = #{classId}</if>
             <if test="stuNo != null and stuNo!=''"> and stu.stu_no = #{stuNo}</if>
             <if test="name != null and name!=''"> and stu.name like #{name}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="majorId != null "> and ma.major_id = #{majorId}</if>
         </where>
     </select>
 
@@ -160,6 +168,8 @@
             <if test="student.classId != null "> and stu.class_id = #{student.classId}</if>
             <if test="student.stuNo != null and student.stuNo!=''"> and stu.stu_no = #{student.stuNo}</if>
             <if test="student.name != null "> and stu.name like #{student.name}</if>
+            <if test="student.deptId != null "> and stu.dept_id = #{student.deptId}</if>
+            <if test="student.majorId != null "> and stu.major_id = #{student.majorId}</if>
         </where>
     </select>
 

srs-comprehensive/src/main/resources/mapper/comprehensive/CphIdeologyScoreMapper.xml

@@ -19,17 +19,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCphIdeologyScoreVo">
-        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
     </sql>
 
     <select id="selectCphIdeologyScoreList" parameterType="CphIdeologyScore" resultMap="CphIdeologyScoreResult">
         <include refid="selectCphIdeologyScoreVo"/>
         <where>  
-            <if test="stuNo != null  and stuNo != ''"> and stu_no = #{stuNo}</if>
+            <if test="stuNo != null  and stuNo != ''"> and i.stu_no = #{stuNo}</if>
-            <if test="score != null "> and score = #{score}</if>
+            <if test="score != null "> and i.score = #{score}</if>
-            <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
+            <if test="stuYearId != null "> and i.stu_year_id = #{stuYearId}</if>
-            <if test="description != null  and description != ''"> and description = #{description}</if>
+            <if test="description != null  and description != ''"> and i.description = #{description}</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="status != null  and status != ''"> and i.status = #{status}</if>
+            <if test="classId != null "> and s.class_id = #{classId}</if>
+            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
+            <if test="majorId != null "> and m.major_id = #{majorId}</if>
         </where>
     </select>
     

srs-comprehensive/src/main/resources/mapper/comprehensive/CphProRankingMapper.xml

@@ -74,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="avgCredit != null "> and avg_credit = #{avgCredit}</if>
             <if test="ranking != null "> and ranking = #{ranking}</if>
             <if test="nopass != null "> and nopass = #{nopass}</if>
+            <if test="deptId != null "> and b.dept_id = #{deptId}</if>
+            <if test="majorId != null "> and b.major_id = #{majorId}</if>
         </where>
     </select>
 

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCeScoreMapper.xml

@@ -61,14 +61,30 @@
     </sql>
 
     <select id="selectSrsCeScoreList" parameterType="SrsCeScore" resultMap="SrsCeScoreResult">
-        <include refid="selectSrsCeScoreVo"/>
+        select scs.id,
+               scs.stu_id,
+               scs.stu_year_id,
+               scs.ce_score,
+               scs.del_flag,
+               scs.create_by,
+               scs.create_time,
+               scs.update_by,
+               scs.update_time,
+               scs.stu_no
+        from srs_ce_score scs
+        left join srs_student stu on stu.stu_id = scs.stu_id
+        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
         <where>
-            <if test="stuId != null ">and stu_id = #{stuId}</if>
+            <if test="stuId != null ">and scs.stu_id = #{stuId}</if>
-            <if test="stuYearId != null ">and stu_year_id = #{stuYearId}</if>
+            <if test="stuYearId != null ">and scs.stu_year_id = #{stuYearId}</if>
-            <if test="ceScore != null ">and ce_score = #{ceScore}</if>
+            <if test="ceScore != null ">and scs.ce_score = #{ceScore}</if>
-            <if test="student.classId != null ">and stu.class_id = #{student.classId}</if>
+            <if test="student.classId != null ">and sc.class_id = #{student.classId}</if>
             <if test="student.stuNo != null and student.stuNo!=''">and stu.stu_no = #{student.stuNo}</if>
-            <if test="student.name != null ">and stu.name like #{student.name}</if>
+            <if test="student.name != null and student.name != ''">and stu.name like #{student.name}</if>
+            <if test="deptId != null ">and d.dept_id = #{deptId}</if>
+            <if test="majorId != null ">and ma.major_id = #{majorId}</if>
         </where>
     </select>
 
@@ -158,15 +174,20 @@
     <select id="SrsCeScoreStudentStuYear" parameterType="SrsCeScore" resultMap="SrsCeScoreStudentStuYearS">
         select a.id,b.`name`,b.stu_no,c.stu_year_name,a.ce_score,a.stu_id,a.stu_year_id from srs_ce_score as a
         left join srs_student as b on a.stu_id = b.stu_id
+        left join srs_class as sc on b.class_id = sc.class_id
+        left join srs_majors as ma on sc.major_id = ma.major_id
+        left join sys_dept as d on ma.college_id = d.dept_id
         left join srs_stu_year as c on a.stu_year_id = c.id
         <where>
             <if test="delFlag != null ">and a.del_flag = #{delFlag}</if>
             <if test="stuId != null ">and a.stu_id = #{stuId}</if>
-            <if test="stuYearId != null ">and stu_year_id = #{stuYearId}</if>
+            <if test="stuYearId != null ">and a.stu_year_id = #{stuYearId}</if>
-            <if test="ceScore != null ">and ce_score = #{ceScore}</if>
+            <if test="ceScore != null ">and a.ce_score = #{ceScore}</if>
             <if test="student.classId != null ">and b.class_id = #{student.classId}</if>
             <if test="student.stuNo != null and student.stuNo!=''">and b.stu_no = #{student.stuNo}</if>
             <if test="student.name != null ">and b.name like #{student.name}</if>
+            <if test="deptId != null ">and d.dept_id = #{deptId}</if>
+            <if test="majorId != null ">and ma.major_id = #{majorId}</if>
         </where>
     </select>
 </mapper>

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsCourseScoreMapper.xml

@@ -232,8 +232,10 @@
 		select a.id, b.`name`, b.stu_no, c.stu_year_name, a.test_score, a.stu_id, a.stu_year_id, d.class_name
 		from srs_sport_test as a
 		     left join srs_student as b on a.stu_id = b.stu_id
-			     left join srs_stu_year as c on a.stu_year_id = c.id
 		     left join srs_class as d on b.class_id = d.class_id
+                 left join srs_majors as ma on d.major_id = ma.major_id
+                 left join sys_dept as de on ma.college_id = de.dept_id
+		     left join srs_stu_year as c on a.stu_year_id = c.id
 		<where>
 			<if test=" delFlag != null "> and a.del_flag = #{delFlag}</if>
 			<if test="stuYearId != null "> and a.stu_year_id = #{stuYearId}</if>
@@ -242,6 +244,8 @@
 			<if test="student.name != null "> and b.name like #{student.name}</if>
 			<if test="testScoreFrom != null "> and a.test_score &gt;= #{testScoreFrom}</if>
 			<if test="testScoreTo != null "> and a.test_score &lt;= #{testScoreTo}</if>
+			<if test="deptId != null "> and de.dept_id = #{deptId}</if>
+			<if test="majorId != null "> and ma.major_id = #{majorId}</if>
 		</where>
 	</select>
 	<select id="selectGradeRanking" resultType="com.srs.comprehensive.domain.Vo.SrsCeScoreClassDeptGradeMajorsStudentStuYear">

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsSportTestMapper.xml

@@ -84,12 +84,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join srs_student as b on a.stu_id = b.stu_id
         left join srs_stu_year as c on a.stu_year_id = c.id
         left join srs_class as d on b.class_id = d.class_id
+        left join srs_majors as e on d.major_id = e.major_id
+        left join sys_dept as f on e.college_id = f.dept_id
         <where>
             <if test="stuId != null "> and a.stu_id = #{stuId}</if>
             <if test="testScore != null "> and a.test_score = #{testScore}</if>
             <if test="stuYearId != null "> and a.stu_year_id = #{stuYearId}</if>
             <if test="testScoreFrom != null "> and a.test_score &gt;= #{testScoreFrom}</if>
             <if test="testScoreTo != null "> and a.test_score &lt;= #{testScoreTo}</if>
+            <if test="student.classId != null "> and b.class_id = #{student.classId}</if>
+            <if test="student.stuNo != null and student.stuNo != ''"> and b.stu_no = #{student.stuNo}</if>
+            <if test="student.name != null and student.name != ''"> and b.name like #{student.name}</if>
+            <if test="deptId != null "> and f.dept_id = #{deptId}</if>
+            <if test="majorId != null "> and e.major_id = #{majorId}</if>
         </where>
         order by a.stu_year_id, d.class_name
     </select>

srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml

@@ -76,10 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectSrsZxjApplyVo">
         select a.id, a.step, a.xm, a.xb, a.mz, a.zzmm, a.xh, a.rxsj, a.csny, a.dh, a.nj, a.xy, a.zy, a.bj, a.kndj,
-               t.knrd_type as knlx,
+               a.knlx,
                a.knlx2, a.rkzs, a.yzsr, a.rjyr, a.srly, a.jtcy, a.sqly, a.fdyqm, a.fdyqmrq, a.ejxyldqm, a.ejxyldqmrq,
                a.xsqm, a.xsqmrq, a.csdj, a.zzdj, a.zzls, a.zp, a.affix_id, a.status1, a.status2, a.status3, a.dz, a.yb,
                a.xxyjrq, a.apply_year, a.locked, a.level,
+               t.knrd_type as knlx_from_knrd_type,
                EXISTS(SELECT application_id FROM rt_stu_disciplinary_application rsda WHERE rsda.stu_no = a.xh and (penalty_status = 0 or  penalty_status = 2)) as penalty_status0,
                EXISTS(SELECT application_id FROM rt_stu_disciplinary_application rsda WHERE rsda.stu_no = a.xh and (penalty_status = 1 )) as penalty_status1,
                EXISTS(SELECT application_id FROM rt_stu_disciplinary_application rsda WHERE rsda.stu_no = a.xh and (penalty_status = 3 )) as penalty_status3,

srs-workstudy/src/main/java/com/srs/workstudy/domain/QgzxMoney.java

@@ -175,6 +175,13 @@ public class QgzxMoney {
     @TableField("apply_no")
     public String applyNo;
 
+    /**
+     * 指导老师
+     */
+    @ApiModelProperty("指导老师")
+    @TableField("zdls_name")
+    public String zdlsName;
+
     /**
      * 申请时间
      */

srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxMoneyServiceImpl.java

@@ -704,7 +704,16 @@ public class QgzxMoneyServiceImpl extends ServiceImpl<QgzxMoneyMapper, QgzxMoney
 
     @Override
     public List<QgzxMoney> listView(QgzxMoney param) {
-        return qgzxMoneyMapper.listView(param);
+        List<QgzxMoney> list = qgzxMoneyMapper.listView(param);
+        list.forEach(x -> {
+            if (x.getApplyNo() != null && !x.getApplyNo().isEmpty()) {
+                SysUser user = _userMapper.selectUserByUserName(x.getApplyNo());
+                if (user != null) {
+                    x.setZdlsName(user.getNickName());
+                }
+            }
+        });
+        return list;
     }
 
 

srs-workstudy/src/main/resources/mapper/workstudy/QgzxMoneyMapper.xml

@@ -227,7 +227,10 @@
     <select id="listView" parameterType="QgzxMoney" resultType="QgzxMoney">
         select * from (
         select t2.* from (
-        select a.*,b.stu_no,c.post_name,d.dept_name,e.dept_name as stu_dept,
+        select a.id,a.stu_post_id,a.total_time,a.apply_sign,a.apply_no,a.apply_time,a.apply_status,
+        a.dept_sign,a.dept_cmt,null as dept_time,a.dept_no,null as high_time,a.high_no,a.high_cmt,a.high_sign,
+        a.final_no,a.final_time,a.final_cmt,a.final_sign,a.audit_remark,null as money,
+        b.stu_no,c.post_name,d.dept_name,e.dept_name as stu_dept,
         e.stu_name,e.class_name,e.grade_name,f.name as dept_no_name,
         g.name as high_name,h.name as final_name,
         c.work_need,b.bank_card,d.dept_id,b.family_condition,c.post_type,b.id_card,