dsdasd

src/main/java/com/template/api/SmartEvaluateTeacherControllerAPI.java

@@ -96,7 +96,7 @@ public interface SmartEvaluateTeacherControllerAPI {
      */
     @GetMapping(value = "queryTopSixTeacher")
     @ApiOperation(value = "最受欢迎老师TOP6", notes = "最受欢迎老师TOP6", httpMethod = "GET")
-    CommonResult queryTopSixTeacher();
+    CommonResult queryTopSixTeacher(Integer termId);
 
     @GetMapping(value = "/rankingList")
     @ApiOperation(value = "排行榜", notes = "排行榜", httpMethod = "GET")

src/main/java/com/template/controller/SmartEvaluateTeacherController.java

@@ -603,8 +603,18 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
     }
 
     @PassToken
-    public CommonResult queryTopSixTeacher() {
-        List<EvaluateTeacherVo> teachers = smartEvaluateTeacherService.smartTopTeacherList();
+    public CommonResult queryTopSixTeacher(Integer termId) {
+        if(termId == null){
+            //获取当前学期ID
+            List<SmartSemester> semesters = smartSemesterService.querySemesterByTime(new Date());
+            if(semesters != null && semesters.size() > 0){
+                termId = semesters.get(0).getId();
+            }else{
+                return CommonResult.fail("不存在学期数据，排名数据获取失败");
+            }
+        }
+
+        List<EvaluateTeacherVo> teachers = smartEvaluateTeacherService.smartTopTeacherList(termId);
 
         return CommonResult.ok(teachers);
     }

src/main/java/com/template/controller/SmartSemesterController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.template.annotation.DESRespondSecret;
 import com.template.api.SmartSemesterControllerAPI;
+import com.template.common.utils.TimeExchange;
 import com.template.common.utils.paramUtils;
 import com.template.model.evaluate.teacher.SmartEvaluateTdetail;
 import com.template.model.evaluate.teacher.SmartEvaluateTeacher;
@@ -78,19 +79,19 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
         Date startTime = smartApply.getStartTime();
         Date endTime = smartApply.getEndTime();
         SmartSemester semester = smartSemesterService.querySemesterByName(smartApply.getName());
-        if(semester != null){
-            return CommonResult.fail(smartApply.getName()+"学期数据在系统中已存在");
+        if (semester != null) {
+            return CommonResult.fail(smartApply.getName() + "学期数据在系统中已存在");
         }
 
         //一天里不能是多个学期
-        List<SmartSemester> list = smartSemesterService.getSemesterTime(startTime, endTime);
+        List<SmartSemester> list = smartSemesterService.getSemesterTime(TimeExchange.DateToString(startTime, "yyyy-MM-dd HH:mm:ss"), TimeExchange.DateToString(endTime, "yyyy-MM-dd HH:mm:ss"));
         if (ObjectUtils.isNotEmpty(list) && list.size() > 0) {
             return CommonResult.fail("该时间段已包含其他学期");
         }
 
-        try{
+        try {
             int result = smartSemesterService.insertSmartSemester(smartApply);
-            if(result <= 0){
+            if (result <= 0) {
                 //return CommonResult.fail("添加失败");
                 throw new Exception("添加失败！");
             }
@@ -250,10 +251,10 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
 
             //region 任课老师赋值
             List<UserSubjectVo> teachings = smartTeachingService.querySmartTeachings(null);
-            if(teachings != null && teachings.size() > 0){
+            if (teachings != null && teachings.size() > 0) {
                 List<SmartEvaluateTeacher> sets = new ArrayList<>();
-                for (UserSubjectVo usv:teachings) {
-                    if(usv.getUserName() != null){
+                for (UserSubjectVo usv : teachings) {
+                    if (usv.getUserName() != null) {
                         SmartEvaluateTeacher set = new SmartEvaluateTeacher();
                         set.setCardNo(usv.getCardNo());
                         set.setName(usv.getUserName());
@@ -271,15 +272,15 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
                         sets.add(set);
                     }
                 }
-                if(sets != null && sets.size() > 0){
+                if (sets != null && sets.size() > 0) {
                     boolean teacherBatch = smartEvaluateTeacherService.saveBatch(sets);
-                    if(!teacherBatch){
+                    if (!teacherBatch) {
                         throw new Exception("添加失败！");
                     }
                 }
             }
             //endregion
-        }catch (Exception e) {
+        } catch (Exception e) {
             throw new Exception("添加失败！");
         }
 
@@ -292,7 +293,7 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
 
         SmartSemester smartApply = smartSemesterService.getSmartById(id);
 
-        try{
+        try {
             int result = smartApply.getId();
 
             //region 添加对应的默认教师评分项
@@ -450,10 +451,10 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
 
             //region 任课老师赋值
             List<UserSubjectVo> teachings = smartTeachingService.querySmartTeachings(null);
-            if(teachings != null && teachings.size() > 0){
+            if (teachings != null && teachings.size() > 0) {
                 List<SmartEvaluateTeacher> sets = new ArrayList<>();
-                for (UserSubjectVo usv:teachings) {
-                    if(usv.getUserName() != null){
+                for (UserSubjectVo usv : teachings) {
+                    if (usv.getUserName() != null) {
                         SmartEvaluateTeacher set = new SmartEvaluateTeacher();
                         set.setCardNo(usv.getCardNo());
                         set.setName(usv.getUserName());
@@ -471,15 +472,15 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
                         sets.add(set);
                     }
                 }
-                if(sets != null && sets.size() > 0){
+                if (sets != null && sets.size() > 0) {
                     boolean teacherBatch = smartEvaluateTeacherService.saveBatch(sets);
-                    if(!teacherBatch){
+                    if (!teacherBatch) {
                         throw new Exception("添加失败！");
                     }
                 }
             }
             //endregion
-        }catch (Exception e) {
+        } catch (Exception e) {
             throw new Exception("添加失败！");
         }
 
@@ -503,7 +504,7 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
         Date startTime = sa.getStartTime();
         Date endTime = sa.getEndTime();
         //        一天里不能是多个学期
-        List<SmartSemester> list = smartSemesterService.getSemesterTime(startTime, endTime);
+        List<SmartSemester> list = smartSemesterService.getSemesterTime(TimeExchange.DateToString(startTime,"yyyy-MM-dd HH:mm:ss") , TimeExchange.DateToString(endTime,"yyyy-MM-dd HH:mm:ss"));
         if (ObjectUtils.isNotEmpty(list) && list.size() > 0) {
             return CommonResult.fail("该时间段已包含其他学期");
         }
@@ -548,7 +549,7 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
     @DESRespondSecret(validated = true)
     public CommonResult getSmartSemester() {
 
-        LambdaQueryWrapper<SmartSemester> wrapper=new LambdaQueryWrapper<>();
+        LambdaQueryWrapper<SmartSemester> wrapper = new LambdaQueryWrapper<>();
         wrapper.orderByDesc(SmartSemester::getStartTime);
 
         List<SmartSemester> list = smartSemesterService.list(wrapper);

src/main/java/com/template/mapper/SmartEvaluateTeacherMapper.java

@@ -23,7 +23,7 @@ public interface SmartEvaluateTeacherMapper extends BaseMapper<SmartEvaluateTeac
 
     Double getAvgLowingScore(@RequestParam("term") String term);
 
-    List<EvaluateTeacherVo> smartTopTeacherList();
+    List<EvaluateTeacherVo> smartTopTeacherList(@RequestParam("termId") Integer termId);
 
     List<RankingVo> getRankingList(@Param("term") String term);
 

src/main/java/com/template/mapper/SmartSemesterMapper.java

@@ -2,7 +2,11 @@ package com.template.mapper;
 
 import com.template.model.pojo.SmartSemester;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,5 +18,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface SmartSemesterMapper extends BaseMapper<SmartSemester> {
-
+    List<SmartSemester> getSemesterList(@Param("startTime") String startTime, @Param("endTime") String endTime);
 }

src/main/java/com/template/services/SmartEvaluateTeacherService.java

@@ -35,7 +35,7 @@ public interface SmartEvaluateTeacherService extends IService<SmartEvaluateTeach
 
     Double getAvgLowingScore(String term);
 
-    List<EvaluateTeacherVo> smartTopTeacherList();
+    List<EvaluateTeacherVo> smartTopTeacherList(Integer termId);
 
     List<RankingVo> getRankingList(String term);
 

src/main/java/com/template/services/SmartSemesterService.java

@@ -36,6 +36,8 @@ public interface SmartSemesterService extends IService<SmartSemester> {
 
     List<SmartSemester> getSemestersByTime(LocalDateTime now);
 
-    List<SmartSemester> getSemesterTime(Date startTime, Date endTime);
+    List<SmartSemester> getSemesterTime(String startTime, String endTime);
+
+    List<SmartSemester> querySemesterByTime(Date dateTime);
 
 }

src/main/java/com/template/services/impl/SmartEvaluateTeacherServiceImpl.java

@@ -80,8 +80,8 @@ public class SmartEvaluateTeacherServiceImpl extends ServiceImpl<SmartEvaluateTe
     }
 
     @Override
-    public List<EvaluateTeacherVo> smartTopTeacherList() {
-        List<EvaluateTeacherVo> result =smartEvaluateTeacherMapper.smartTopTeacherList();
+    public List<EvaluateTeacherVo> smartTopTeacherList(Integer termId) {
+        List<EvaluateTeacherVo> result =smartEvaluateTeacherMapper.smartTopTeacherList(termId);
         return result;
     }
 

src/main/java/com/template/services/impl/SmartSemesterServiceImpl.java

@@ -104,12 +104,17 @@ public class SmartSemesterServiceImpl extends ServiceImpl<SmartSemesterMapper, S
     }
 
     @Override
-    public List<SmartSemester> getSemesterTime(Date startTime, Date endTime) {
-        LambdaQueryWrapper<SmartSemester> wrapper=new LambdaQueryWrapper<>();
-        wrapper.and(query -> query.between(SmartSemester::getStartTime,startTime,endTime)
-                .or()
-                .between(SmartSemester::getEndTime,startTime,endTime));
-        List<SmartSemester> list = this.list(wrapper);
-        return list;
+    public List<SmartSemester> getSemesterTime(String startTime, String endTime) {
+        List<SmartSemester> result = smartSemesterMapper.getSemesterList(startTime,endTime);
+        return result;
+    }
+
+    @Override
+    public List<SmartSemester> querySemesterByTime(Date dateTime) {
+        QueryWrapper<SmartSemester> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge("end_time", dateTime);
+        queryWrapper.orderByAsc("end_time");
+        List<SmartSemester> result = smartSemesterMapper.selectList(queryWrapper);
+        return result;
     }
 }

src/main/resources/mapper/template/SmartEvaluateTeacherMapper.xml

@@ -14,10 +14,10 @@
 
     <select id="smartTopTeacherList" resultType="com.template.model.vo.EvaluateTeacherVo" resultMap="smartTopTeacherMap">
         select id,name from smart_evaluate_teacher
-        where term in
-        (select t.term from(select term from smart_evaluate_teacher
-        where deleted = 0 order by term desc
-        limit 1) as t) and deleted = 0
+        where deleted = 0
+        <if test="termId != null and termId != ''">
+            and term_id = #{termId}
+        </if>
         order by total_score desc
     </select>
 

src/main/resources/mapper/template/SmartSemesterMapper.xml

@@ -2,4 +2,24 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.SmartSemesterMapper">
 
+
+    <select id="getAffiliateList" resultType="com.template.model.pojo.SmartUser">
+        SELECT * FROM `smart_user`
+        where deleted = 0 and is_cancel=0
+        <if test="id != null and id != ''">
+            and FIND_IN_SET(#{id},affiliate)
+        </if>
+    </select>
+
+
+    <select id="getSemesterList" resultType="com.template.model.pojo.SmartSemester">
+        select * from smart_semester
+        where deleted = 0
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and ((start_time &lt;= #{startTime} and end_time &gt;= #{startTime})
+            or (start_time &lt;= #{endTime} and end_time &gt;= #{endTime})
+            or (start_time &lt;= #{startTime} and end_time &gt;= #{endTime}))
+        </if>
+    </select>
+
 </mapper>