教研详情完善

sapi/src/main/java/com/xhkjedu/sapi/controller/research/ResearchController.java

@@ -153,7 +153,7 @@ public class ResearchController {
      * @return com.xhkjedu.vo.ResultVo
      **/
     @PostMapping("ulist")
-    public ResultVo ulist(@RequestBody TResearch research) {
+    public ResultVo ulist(@RequestBody TResearchUser research) {
         Integer page = research.getPage();
         Integer pageSize = research.getPageSize();
         Integer researchid = research.getResearchid();
@@ -161,7 +161,7 @@ public class ResearchController {
         N_Utils.validation(new Object[]{page, "显示页码", 1, pageSize, "显示条数", 1,
                 researchid, "教研id", 1, schoolid, "学校id", 1});
         PageHelper.startPage(page, pageSize);
-        List<Map<String, String>> list = researchService.listUserByRidAndSid(researchid, schoolid);
+        List<Map<String, String>> list = researchService.listUserByRidAndSid(researchid, schoolid, research.getUserid());
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0, "获取学校下用户教研评价成功", pageResult);
     }

sapi/src/main/java/com/xhkjedu/sapi/mapper/research/ResearchUserMapper.java

@@ -107,7 +107,8 @@ public interface ResearchUserMapper extends TkMapper<TResearchUser> {
     Integer noEvaluatedNum(@Param("userid") Integer userid, @Param("timestamp") int timestamp);
 
     //获取学校下用户教研评价
-    List<Map<String, String>> listUserByRidAndSid(@Param("researchid") Integer researchid, @Param("schoolid") Integer schoolid);
+    List<Map<String, String>> listUserByRidAndSid(@Param("researchid") Integer researchid
+            , @Param("schoolid") Integer schoolid,@Param("userid") Integer userid);
 
     //教研学校用户
     List<Map> listReaearchSchools(@Param("researchid") Integer researchid,@Param("publiced") Integer publiced, @Param("schoolid") Integer schoolid);

sapi/src/main/java/com/xhkjedu/sapi/service/research/ResearchService.java

@@ -209,8 +209,8 @@ public class ResearchService {
      * @Date 2023/7/24 9:08
      * @return java.util.List<java.util.Map<java.lang.String,java.lang.String>>
      **/
-    public List<Map<String, String>> listUserByRidAndSid(Integer researchid, Integer schoolid) {
-        return researchUserMapper.listUserByRidAndSid(researchid,schoolid);
+    public List<Map<String, String>> listUserByRidAndSid(Integer researchid, Integer schoolid, Integer userid) {
+        return researchUserMapper.listUserByRidAndSid(researchid, schoolid, userid);
     }
 
     /*

sapi/src/main/java/com/xhkjedu/sapi/service/research/ResearchUserService.java

@@ -78,19 +78,6 @@ public class ResearchUserService {
         // 如果教研是公开的，则获取所有已提交教研publiced：是否公开0不公开1校内公开2全部公开
         if (publiced > 0) {
             List<Map> schools = researchUserMapper.listReaearchSchools(researchid,publiced, researchUserVo.getSchoolid());
-            // 去除学校中未参与评价教师
-            for (int i = 0; i < schools.size(); i++) {
-                List<Map> commitRusers = new ArrayList<>();
-                List<Map> rusers = (List<Map>) schools.get(i).get("rusers");
-                for (int j = 0; j < rusers.size(); j++) {
-                    Map map = rusers.get(j);
-                    Integer rustate = Integer.parseInt(map.get("rustate").toString());
-                    if (rustate != null && rustate == 1) {
-                        commitRusers.add(map);
-                    }
-                }
-                schools.get(i).put("rusers", commitRusers);
-            }
             researchUserVo.setSchools(schools);
         }
 

sapi/src/main/resources/mapper/research/ResearchUserMapper.xml

@@ -83,6 +83,7 @@
         select ru.ruid,ru.userid,ru.content,ru.reviewtime,ru.createtime,u.username,u.headpic
         from t_research_user ru left join t_user u on ru.userid=u.userid
         where ru.researchid=#{researchid} and ru.rustate=1 and ru.schoolid=#{schoolid}
+        <if test="userid!=null and userid!=0">and ru.userid=#{userid}</if>
         order by ru.reviewtime desc
     </select>
 
@@ -100,16 +101,16 @@
         </collection>
     </resultMap>
     <!--教研学校用户-->
-    <select id="listReaearchSchools" resultMap="researchSchoolUser">
-        select ru.schoolid,s.schoolname,ru.ruid,ru.userid,ru.content,ru.reviewtime,ru.rustate,
-        u.username createname,u.headpic
-        from t_research_user ru left join t_user u on ru.userid=u.userid
+    <select id="listReaearchSchools" resultType="java.util.Map">
+        select ru.schoolid,s.schoolname
+        from t_research_user ru
         left join t_school s on ru.schoolid=s.schoolid
         where ru.researchid=#{researchid}
         <if test="publiced!=null and publiced==1">
             and ru.schoolid=#{schoolid}
         </if>
-        order by ru.schoolid=#{schoolid},ru.schoolid,ru.reviewtime desc
+        group by ru.schoolid
+        order by if(ru.schoolid=#{schoolid},0,ru.schoolid),ru.reviewtime desc
     </select>
 
     <!--根据教研教师id获取教研截至时间-->