Merge remote-tracking branch 'origin/wn' into ywx

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

@@ -9,6 +9,7 @@ import com.xhkjedu.utils.N_Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -28,48 +29,64 @@ public class ResearchUserService {
     private MessageSender messageSender;
 
     /**
-     *功能描述  参与评论集合
+     * 功能描述  参与评论集合
+     *
+     * @param * @param researchid
+     * @return java.util.List<com.xhkjedu.model.research.TResearchUser>
      * @author WN
      * @date 2020/6/11
-     * @param  * @param researchid
-     * @return java.util.List<com.xhkjedu.model.research.TResearchUser>
      */
-    public List<Map> listRusersByReaearchid(Integer researchid,Integer schoolid){
-        return researchUserMapper.listRusersByReaearchid(researchid,schoolid);
+    public List<Map> listRusersByReaearchid(Integer researchid, Integer schoolid) {
+        return researchUserMapper.listRusersByReaearchid(researchid, schoolid);
     }
 
     /**
-     *功能描述 教师--参与教研集合
-     * @author WN
-     * @date 2020/6/12
-     * @param  * @param userid
+     * 功能描述 教师--参与教研集合
+     *
+     * @param *      @param userid
      * @param rorder
      * @return java.util.List<com.xhkjedu.vo.research.ResearchVo>
+     * @author WN
+     * @date 2020/6/12
      */
-    public List<Map> listUserResearchs(Integer userid, String rorder, Integer rustate){
-        return researchUserMapper.listUserResearchs(userid,rorder,rustate,N_Utils.getSecondTimestamp());
+    public List<Map> listUserResearchs(Integer userid, String rorder, Integer rustate) {
+        return researchUserMapper.listUserResearchs(userid, rorder, rustate, N_Utils.getSecondTimestamp());
     }
 
     /**
-     *功能描述 教师--获取教研详情
+     * 功能描述 教师--获取教研详情
+     *
+     * @param * @param researchid
+     * @return com.xhkjedu.model.research.TResearch
      * @author WN
      * @date 2020/6/12
-     * @param  * @param researchid
-     * @return com.xhkjedu.model.research.TResearch
      */
-    public ResearchUserVo getResearchUserDetail(Integer researchid,Integer userid){
-        ResearchUserVo researchUserVo = researchUserMapper.getResearchUserDetail(researchid,userid);
-        //更改阅读次数
+    public ResearchUserVo getResearchUserDetail(Integer researchid, Integer userid) {
+        ResearchUserVo researchUserVo = researchUserMapper.getResearchUserDetail(researchid, userid);
+        // 更改阅读次数
         researchMapper.updateReadnum(researchid);
 
-        //视频转换mq
+        // 视频转换mq
         if (!researchUserVo.getMp4code().equals("h264")) {
             messageSender.convertVideo(researchUserVo.getResearchid(), researchUserVo.getResearchpath());
         }
 
-        //如果教研是公开的，则获取所有已提交教研
-        if(researchUserVo.getPubliced() == 0){
-            List<Map> schools = researchUserMapper.listReaearchSchools(researchid,researchUserVo.getSchoolid());
+        // 如果教研是公开的，则获取所有已提交教研
+        if (researchUserVo.getPubliced() == 0) {
+            List<Map> schools = researchUserMapper.listReaearchSchools(researchid, 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);
         }
 
@@ -77,24 +94,26 @@ public class ResearchUserService {
     }
 
     /**
-     *功能描述 教师--保存教研评价
+     * 功能描述 教师--保存教研评价
+     *
+     * @param * @param ru
+     * @return java.lang.Integer
      * @author WN
      * @date 2020/6/12
-     * @param  * @param ru
-     * @return java.lang.Integer
      */
-    public Integer updateUserResearch(TResearchUser ru){
-        ru.setRustate(1);//状态0未评1已评
+    public Integer updateUserResearch(TResearchUser ru) {
+        ru.setRustate(1);// 状态0未评1已评
         ru.setReviewtime(N_Utils.getSecondTimestamp());
         return researchUserMapper.updateUserResearch(ru);
     }
 
     /**
      * 其他教研活动列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.research.ResearchVo>
      * @Param [research]
      * @Author ywx
      * @Date 2020/6/23 14:24
-     * @return java.util.List<com.xhkjedu.vo.research.ResearchVo>
      **/
     public List<Map> otherList(TResearchUser research) {
         research.setCreatetime(N_Utils.getSecondTimestamp());
@@ -103,10 +122,11 @@ public class ResearchUserService {
 
     /**
      * 教师未评价教研数量
+     *
+     * @return java.lang.Integer
      * @Param [userid]
      * @Author ywx
      * @Date 2020/7/24 10:45
-     * @return java.lang.Integer
      **/
     public Integer noEvaluatedNum(Integer userid) {
         return researchUserMapper.noEvaluatedNum(userid, N_Utils.getSecondTimestamp());

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

@@ -94,16 +94,17 @@
             <result column="userid" property="userid"></result>
             <result column="content" property="content"></result>
             <result column="reviewtime" property="reviewtime"></result>
+            <result column="rustate" property="rustate"></result>
             <result column="createname" property="createname"></result>
             <result column="headpic" property="headpic"></result>
         </collection>
     </resultMap>
     <!--教研学校用户-->
     <select id="listReaearchSchools" resultMap="researchSchoolUser">
-        select ru.schoolid,s.schoolname,ru.ruid,ru.userid,ru.content,ru.reviewtime,
+        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
         left join t_school s on ru.schoolid=s.schoolid
-        where ru.researchid=#{researchid} and ru.rustate=1 order by ru.schoolid=#{schoolid},ru.schoolid,ru.reviewtime desc
+        where ru.researchid=#{researchid} order by ru.schoolid=#{schoolid},ru.schoolid,ru.reviewtime desc
     </select>
 </mapper>