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

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

@@ -3,6 +3,7 @@ package com.xhkjedu.sapi.controller.research;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.xhkjedu.sapi.model.research.TResearch;
+import com.xhkjedu.sapi.model.research.TResearchUser;
 import com.xhkjedu.sapi.service.research.ResearchService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
@@ -165,4 +166,18 @@ public class ResearchController {
         return new ResultVo(0, "获取学校下用户教研评价成功", pageResult);
     }
 
+    /*
+    * @Description 删除用户教研
+    * @Author WN
+    * @Date 2023/8/8 15:39:05
+    */
+    @PostMapping("deltr")
+    public ResultVo delTeacherResearch(@RequestBody TResearchUser ruser){
+        N_Utils.validation(new Object[]{
+                ruser.getRuid(),"教师教研id",1,
+        });
+        Integer result = researchService.delTeacherResearch(ruser.getRuid());
+        return new ResultVo(0,"删除教师教研成功");
+    }
+
 }

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

@@ -130,4 +130,25 @@ public class ResearchUserController {
         return new ResultVo(0,"获取教师未评价教研数量成功",num);
     }
 
+    /*
+     * @Description 删除用户教研
+     * @Author WN
+     * @Date 2023/8/8 15:39:05
+     */
+    @PostMapping("deltr")
+    public ResultVo delTeacherResearch(@RequestBody TResearchUser ruser){
+        N_Utils.validation(new Object[]{ruser.getRuid(),"教师教研id",1,ruser.getUserid(),"当前登录教师id",1});
+        return researchUserService.delTeacherResearch(ruser);
+    }
+
+    /*
+    * @Description 修改自己教研
+    * @Author WN
+    * @Date 2023/8/8 16:03:54
+    */
+    @PostMapping("uptr")
+    public ResultVo updateTeacherResearch(@RequestBody TResearchUser ruser){
+        N_Utils.validation(new Object[]{ruser.getRuid(),"教师教研id",1,ruser.getUserid(),"当前登录教师id",1});
+        return researchUserService.updateTeacherResearch(ruser);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.xhkjedu.sapi.mapper.research;
 
 import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.sapi.model.research.TResearch;
 import com.xhkjedu.sapi.model.research.TResearchUser;
 import com.xhkjedu.sapi.vo.research.ResearchUserVo;
 import org.apache.ibatis.annotations.Param;
@@ -109,5 +110,14 @@ public interface ResearchUserMapper extends TkMapper<TResearchUser> {
     List<Map<String, String>> listUserByRidAndSid(@Param("researchid") Integer researchid, @Param("schoolid") Integer schoolid);
 
     //教研学校用户
-    List<Map> listReaearchSchools(@Param("researchid") Integer researchid, @Param("schoolid") Integer schoolid);
+    List<Map> listReaearchSchools(@Param("researchid") Integer researchid,@Param("publiced") Integer publiced, @Param("schoolid") Integer schoolid);
+
+    //根据教研教师id获取教研截至时间
+    TResearch getResearchStoptime(@Param("ruid") Integer ruid);
+
+    //删除已评价教研
+    Integer delTeacherResearch(@Param("ruid") Integer ruid);
+
+    //修改已评价教研
+    Integer updateTeacherResearch(@Param("ru") TResearchUser ru);
 }

sapi/src/main/java/com/xhkjedu/sapi/model/research/TResearch.java

@@ -81,5 +81,8 @@ public class TResearch extends BaseBean {
     @Transient
     //学校集合
     private List<Map<String, Object>> schools;
+
+    @Transient
+    private Integer userid;
 }
 

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

@@ -212,4 +212,13 @@ public class ResearchService {
     public List<Map<String, String>> listUserByRidAndSid(Integer researchid, Integer schoolid) {
         return researchUserMapper.listUserByRidAndSid(researchid,schoolid);
     }
+
+    /*
+    * @Description 移除用户已评论教研
+    * @Author WN
+    * @Date 2023/8/8 15:34:52
+    */
+    public Integer delTeacherResearch(Integer ruid){
+        return researchUserMapper.delTeacherResearch(ruid);
+    }
 }

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

@@ -3,9 +3,12 @@ package com.xhkjedu.sapi.service.research;
 import com.xhkjedu.sapi.listener.MessageSender;
 import com.xhkjedu.sapi.mapper.research.ResearchMapper;
 import com.xhkjedu.sapi.mapper.research.ResearchUserMapper;
+import com.xhkjedu.sapi.model.research.TResearch;
 import com.xhkjedu.sapi.model.research.TResearchUser;
+import com.xhkjedu.sapi.vo.research.CompareUserVo;
 import com.xhkjedu.sapi.vo.research.ResearchUserVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -71,9 +74,10 @@ public class ResearchUserService {
             messageSender.convertVideo(researchUserVo.getResearchid(), researchUserVo.getResearchpath());
         }
 
-        // 如果教研是公开的，则获取所有已提交教研
-        if (researchUserVo.getPubliced() == 0) {
-            List<Map> schools = researchUserMapper.listReaearchSchools(researchid, researchUserVo.getSchoolid());
+        int publiced = researchUserVo.getPubliced();
+        // 如果教研是公开的，则获取所有已提交教研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<>();
@@ -81,11 +85,11 @@ public class ResearchUserService {
                 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){
+                    if (rustate != null && rustate == 1) {
                         commitRusers.add(map);
                     }
                 }
-                schools.get(i).put("rusers",commitRusers);
+                schools.get(i).put("rusers", commitRusers);
             }
             researchUserVo.setSchools(schools);
         }
@@ -131,4 +135,68 @@ public class ResearchUserService {
     public Integer noEvaluatedNum(Integer userid) {
         return researchUserMapper.noEvaluatedNum(userid, N_Utils.getSecondTimestamp());
     }
+
+    //判断修改1教研是否为自己发布的2在截至时间之前
+    private CompareUserVo getReachStoptimeCompareNow(Integer ruid, Integer userid) {
+        CompareUserVo compareUserVo = new CompareUserVo();
+
+        // 获取教研截至时间和教师id
+        TResearch research = researchUserMapper.getResearchStoptime(ruid);
+
+        //先获取当前登录用户和要修改的用户是否为同一个
+        if(userid.equals(research.getUserid())){
+            compareUserVo.setSameuser(1);
+        }else{
+            compareUserVo.setSameuser(0);
+        }
+
+        Integer nowtime = N_Utils.getSecondTimestamp();// 当前时间
+        Integer stoptime = research.getStoptime();//教研截至时间
+        int compresult = nowtime.compareTo(stoptime);
+        if (compresult == -1 || compresult == 0) {
+            compareUserVo.setComparetime(1);
+        }else {
+            compareUserVo.setComparetime(0);
+        }
+
+        return compareUserVo;
+    }
+
+    // 删除教研
+    public ResultVo delTeacherResearch(TResearchUser ruser){
+        CompareUserVo compareUserVo = getReachStoptimeCompareNow(ruser.getRuid(),ruser.getUserid());
+        if(compareUserVo.getSameuser() != 1){
+            return new ResultVo(1,"只能删除自己发布的教研");
+        }
+
+        if(compareUserVo.getComparetime() != 1){
+            return new ResultVo(1,"教研已结束禁止操作");
+        }
+        Integer rtn = researchUserMapper.delTeacherResearch(ruser.getRuid());
+        if(rtn > 0){
+            return new ResultVo(0,"删除成功");
+        }else {
+            return new ResultVo(1,"删除失败");
+        }
+    }
+
+    // 修改教研
+    public ResultVo updateTeacherResearch(TResearchUser ruser)  {
+        CompareUserVo compareUserVo = getReachStoptimeCompareNow(ruser.getRuid(),ruser.getUserid());
+        if(compareUserVo.getSameuser() != 1){
+            return new ResultVo(1,"只能编辑自己发布的教研");
+        }
+
+        if(compareUserVo.getComparetime() != 1){
+            return new ResultVo(1,"教研已结束禁止操作");
+        }
+        ruser.setReviewtime(N_Utils.getSecondTimestamp());
+        Integer rtn = researchUserMapper.updateTeacherResearch(ruser);
+        if(rtn > 0){
+            return new ResultVo(0,"保存成功");
+        }else {
+            return new ResultVo(1,"保存失败");
+        }
+    }
+
 }

sapi/src/main/java/com/xhkjedu/sapi/vo/research/CompareUserVo.java

@@ -0,0 +1,16 @@
+package com.xhkjedu.sapi.vo.research;
+
+import lombok.Data;
+
+/**
+ * @Description：比较结果
+ * @Author: WN
+ * @Date: 2023/8/8 16:31:19
+ **/
+@Data
+public class CompareUserVo {
+
+    private Integer sameuser;
+
+    private Integer comparetime;
+}

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

@@ -105,6 +105,26 @@
         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} order by ru.schoolid=#{schoolid},ru.schoolid,ru.reviewtime desc
+        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
+    </select>
+
+    <!--根据教研教师id获取教研截至时间-->
+    <select id="getResearchStoptime" resultType="com.xhkjedu.sapi.model.research.TResearch">
+        select r.stoptime,ru.userid from t_research r left join t_research_user ru on r.researchid=ru.researchid
+        where ru.ruid=#{ruid}
     </select>
+
+    <!--删除已评价教研-->
+    <update id="delTeacherResearch">
+        update t_research_user set rustate=0,content=null,reviewtime=null where ruid=#{ruid}
+    </update>
+
+    <!--修改已评价教研-->
+    <update id="updateTeacherResearch" parameterType="com.xhkjedu.sapi.model.research.TResearchUser">
+        update t_research_user set content=#{ru.content},reviewtime=#{ru.reviewtime} where ruid=#{ru.ruid}
+    </update>
 </mapper>