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

sstudy/src/main/java/com/xhkjedu/sstudy/controller/question/QuestionController.java

@@ -62,7 +62,7 @@ public class QuestionController {
         Integer pageSize = tQuestion.getPageSize();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
         PageHelper.startPage(page, pageSize);
-        List<QuestionVo> list = tQuestionService.findAll(tQuestion);
+        List<Map<String, Object>> list = tQuestionService.findAll(tQuestion);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取列表成功",pageResult);
     }
@@ -169,4 +169,32 @@ public class QuestionController {
         return new ResultVo(0, "保存成功",list);
     }
 
+    /**
+     * @Description 分享集团校
+     * @Date 2023/8/29 9:25
+     * @Author YWX
+     * @Param [question]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/share_gs")
+    public ResultVo shareGroupSchool(@RequestBody TQuestion question) {
+        N_Utils.validation(new Object[]{question.getQuestionid(), "试题id", 2, question.getCreateid(), "用户id", 1});
+        return tQuestionService.shareGroupSchool(question);
+    }
+
+    /**
+     * @Description 获取分享的伙伴校
+     * @Date 2023/8/29 11:22
+     * @Author YWX
+     * @Param [question]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_share_ps")
+    public ResultVo listSharePartnerSchool(@RequestBody TQuestion question) {
+        String questionid = question.getQuestionid();
+        N_Utils.validation(new Object[]{questionid, "试题id", 2});
+        List<Map<String, Object>> list=tQuestionService.listSharePartnerSchool(questionid);
+        return new ResultVo(0,"获取分享的伙伴校成功",list);
+    }
+
 }

sstudy/src/main/java/com/xhkjedu/sstudy/controller/resource/ResourceController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author ywx
@@ -87,7 +88,7 @@ public class ResourceController {
         Integer pageSize = tResource.getPageSize();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
         PageHelper.startPage(page, pageSize);
-        List<TResource> list = resourceService.findAll(tResource);
+        List<Map> list = resourceService.findAll(tResource);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取列表成功",pageResult);
     }
@@ -128,6 +129,34 @@ public class ResourceController {
         tResource.setLevel(1);//资源级别1校本
     }
 
+    /**
+     * @Description 获取分享的伙伴校
+     * @Date 2023/8/29 14:48
+     * @Author YWX
+     * @Param [tResource]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_share_ps")
+    public ResultVo listSharePartnerSchool(@RequestBody TResource tResource) {
+        String resourceid = tResource.getResourceid();
+        N_Utils.validation(new Object[]{resourceid, "资源id", 2});
+        List<Map<String, Object>> list=resourceService.listSharePartnerSchool(resourceid);
+        return new ResultVo(0,"获取分享的伙伴校成功",list);
+    }
+
+    /**
+     * @Description 分享集团校
+     * @Date 2023/8/29 16:11
+     * @Author YWX
+     * @Param [tResource]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/share_gs")
+    public ResultVo shareGroupSchool(@RequestBody TResource tResource) {
+        N_Utils.validation(new Object[]{tResource.getResourceid(), "资源id", 2, tResource.getCreateid(), "用户id", 1});
+        return resourceService.shareGroupSchool(tResource);
+    }
+
     @PostMapping("/update_downcount")
     public ResultVo updateDownCount(@RequestBody TResource tResource) {
         String resourceid = tResource.getResourceid();
@@ -145,7 +174,7 @@ public class ResourceController {
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,createid,"教师id",1
                 ,level,"资源级别",1});
         PageHelper.startPage(page, pageSize);
-        List<TResource> list = resourceService.listMyResource(tResource);
+        List<Map> list = resourceService.listMyResource(tResource);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取教师备课资源列表成功",pageResult);
     }
@@ -155,7 +184,7 @@ public class ResourceController {
         Integer createid = tResource.getCreateid();
         N_Utils.validation(new Object[]{createid,"教师id",1});
         tResource.setLevel(2);
-        List<TResource> list = resourceService.listMyResource(tResource);
+        List<Map> list = resourceService.listMyResource(tResource);
         return new ResultVo(0,"获取我的备课列表成功",list);
     }
 

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/question/QuestionMapper.java

@@ -43,7 +43,7 @@ public interface QuestionMapper extends TkMapper<TQuestion> {
      * @Date 2020/6/9 8:48
      * @return java.util.List<com.xhkjedu.model.question.TQuestion>
      **/
-    List<QuestionVo> findAll(@Param("question") TQuestion question);
+    List<Map<String, Object>> findAll(@Param("question") TQuestion question);
 
     /**
      * 更新单个试题状态
@@ -98,4 +98,14 @@ public interface QuestionMapper extends TkMapper<TQuestion> {
 
     //子题集合
     List<Map<String, String>> listSonQuestionForSelect(@Param("questionids") String questionids);
+
+    //获取试题详情及关联章节、知识点、伙伴校
+    TQuestion getQuestionAndDirectorPointById(String questionid);
+
+    //获取分享的伙伴校
+    List<Map<String, Object>> listSharePartnerSchool(@Param("questionid") String questionid);
+
+    //更新分享过伙伴校试题的时间
+    void batchUpdateTime(@Param("list") List<Integer> schoolIds, @Param("shareqid") String shareqid
+            ,@Param("timestamp") int timestamp);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/resource/ResourceMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Repository
 public interface ResourceMapper extends TkMapper<TResource> {
@@ -20,7 +21,7 @@ public interface ResourceMapper extends TkMapper<TResource> {
     ResourceVo findById2(@Param("resourceid") String resourceid);
 
     //列表
-    List<TResource> findAll(@Param("resource") TResource tResource);
+    List<Map> findAll(@Param("resource") TResource tResource);
 
     //更新下载次数
     void updateDownCount(@Param("resourceid") String resourceid);
@@ -48,7 +49,7 @@ public interface ResourceMapper extends TkMapper<TResource> {
      * @Date 2020/7/9 11:44
      * @return java.util.List<com.xhkjedu.model.resource.TResource>
      **/
-    List<TResource> listMyResource(@Param("resource") TResource resource);
+    List<Map> listMyResource(@Param("resource") TResource resource);
 
 
     /**
@@ -77,4 +78,13 @@ public interface ResourceMapper extends TkMapper<TResource> {
     //根据模块和资源id获取资源数量
     Integer getResourceNumByLevelAndResourceid(@Param("resourceid") String resourceid);
 
+    //获取分享的伙伴校
+    List<Map<String, Object>> listSharePartnerSchool(@Param("resourceid") String resourceid);
+
+    //获取资源详情及关联章节、伙伴校
+    TResource getResourceAndSchoolById(@Param("resourceid") String resourceid);
+
+    //更新分享过伙伴校资源的时间
+    void batchUpdateTime(@Param("list") List<Integer> schoolIds,@Param("resourceid") String resourceid
+            ,@Param("timestamp") int timestamp);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/model/question/TQuestion.java

@@ -7,6 +7,7 @@ import javax.persistence.Id;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.List;
+import java.util.Map;
 
 @Table(name = "t_question")
 @Data
@@ -50,7 +51,7 @@ public class TQuestion extends BaseBean {
     //组题次数
     private Integer count;
 
-    //资源归属1平台1区平台3学校4个人(搜索时5我的收藏 6我的上传)
+    //资源归属1平台1区平台3学校4个人10伙伴校(搜索时5我的收藏 6我的上传)
     private Integer belong;
 
     //试题类型1单体2母题3子题
@@ -125,4 +126,7 @@ public class TQuestion extends BaseBean {
 
     @Transient
     private List<TQuestion> questions;//子题集合
+    @Transient
+    private List<Map> schools;//伙伴校
+    private String shareqid;//分享试题id
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionService.java

@@ -13,6 +13,8 @@ import com.xhkjedu.sstudy.vo.question.QuestionCollectVo;
 import com.xhkjedu.sstudy.vo.question.QuestionVo;
 import com.xhkjedu.sstudy.vo.subjectbook.DirectorVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -86,7 +88,7 @@ public class QuestionService {
     }
 
     //获取列表
-    public List <QuestionVo> findAll(TQuestion question) {
+    public List <Map<String, Object>> findAll(TQuestion question) {
         return questionMapper.findAll(question);
     }
 
@@ -475,4 +477,86 @@ public class QuestionService {
     public List<Map> listPointsByQuestionid(String questionid) {
         return questionPointMapper.listPointsByQuestionid(questionid);
     }
+
+    /**
+     * @Description 分享伙伴校
+     * @Date 2023/8/29 9:26
+     * @Author YWX
+     * @Param [question]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public ResultVo shareGroupSchool(TQuestion question) {
+        List<Map> schools = question.getSchools();
+        if (N_Utils.isListEmpty(schools)) return new ResultVo(1, "伙伴校不能为空");
+        String shareqid = question.getQuestionid();
+        Integer createid = question.getCreateid();
+        int timestamp = N_Utils.getSecondTimestamp();
+        TQuestion q = questionMapper.getQuestionAndDirectorPointById(shareqid);
+        List<TQuestionPoint> questionPoints = q.getQuestionPoints();
+        List<TQuestionDirector> questionDirectors = q.getDirectors();
+        List<Integer> schoolids = q.getSchools().stream().map(s -> (Integer) s.get("schoolid")).collect(Collectors.toList());
+        List<TQuestion> questions = new ArrayList<>();//未分享过的学校试题集合
+        List<TQuestionPoint> points = new ArrayList<>();//未分享过的学校试题知识点集合
+        List<TQuestionDirector> directors = new ArrayList<>();//未分享过的学校试题章节集合
+        List<Integer> schoolIds = new ArrayList<>();//已分享过的学校集合
+        for (Map<String, Integer> school : schools) {
+            Integer schoolid = school.get("schoolid");
+            if (N_Utils.numInList(schoolid, schoolids)) {//已分享过的学校需更新试题时间
+                schoolIds.add(schoolid);
+                continue;
+            }
+            //试题
+            TQuestion tq = new TQuestion();
+            BeanUtils.copyProperties(q, tq);
+            String questionid = StudyUtil.getId();
+            tq.setQuestionid(questionid);
+            tq.setCount(0);
+            tq.setCreateid(createid);
+            tq.setCreatetime(timestamp);
+            tq.setBelong(10);
+            tq.setSchoolid(schoolid);
+            tq.setShareqid(shareqid);
+            questions.add(tq);
+
+            //试题关联知识点
+            for (TQuestionPoint p : questionPoints) {
+                TQuestionPoint qp = new TQuestionPoint();
+                BeanUtils.copyProperties(p, qp);
+                qp.setQpid(StudyUtil.getId());
+                qp.setQuestionid(questionid);
+                qp.setCreateid(createid);
+                qp.setCreatetime(timestamp);
+                points.add(qp);
+            }
+
+            //试题关联章节
+            for (TQuestionDirector d : questionDirectors) {
+                TQuestionDirector qd = new TQuestionDirector();
+                BeanUtils.copyProperties(d, qd);
+                qd.setQdid(StudyUtil.getId());
+                qd.setQuestionid(questionid);
+                qd.setCreateid(createid);
+                qd.setCreatetime(timestamp);
+                directors.add(qd);
+            }
+        }
+
+        if (N_Utils.isListNotEmpty(questions)) questionMapper.saveBathQuestion(questions);
+        if (N_Utils.isListNotEmpty(points)) questionPointMapper.batchSave(points);
+        if (N_Utils.isListNotEmpty(directors)) questionDirectorMapper.batchSave(directors);
+        if (N_Utils.isListNotEmpty(schoolIds)) questionMapper.batchUpdateTime(schoolIds, shareqid, timestamp);
+        return new ResultVo(0, "分享成功");
+    }
+
+    /**
+     * @Description 获取分享的伙伴校
+     * @Date 2023/8/29 11:22
+     * @Author YWX
+     * @Param [questionid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map<String, Object>> listSharePartnerSchool(String questionid) {
+        return questionMapper.listSharePartnerSchool(questionid);
+    }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/ResourceService.java

@@ -15,13 +15,14 @@ import com.xhkjedu.sstudy.vo.resource.ResourceCollectVo;
 import com.xhkjedu.sstudy.vo.resource.ResourceVo;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author ywx
@@ -145,7 +146,7 @@ public class ResourceService {
     }
 
     //获取列表
-    public List <TResource> findAll(TResource tResource) {
+    public List <Map> findAll(TResource tResource) {
         return resourceMapper.findAll(tResource);
     }
 
@@ -228,7 +229,7 @@ public class ResourceService {
      * @Date 2020/7/9 11:45
      * @return java.util.List<com.xhkjedu.model.resource.TResource>
      **/
-    public List<TResource> listMyResource(TResource resource) {
+    public List<Map> listMyResource(TResource resource) {
         return resourceMapper.listMyResource(resource);
     }
 
@@ -333,10 +334,17 @@ public class ResourceService {
         String resourceid = resource.getResourceid();
         Integer createid = resource.getCreateid();
         int timestamp = N_Utils.getSecondTimestamp();
-        TResource vo = resourceMapper.selectByPrimaryKey(resourceid);
+        TResource vo = resourceMapper.getResourceAndSchoolById(resourceid);
+        List<Integer> schoolids = vo.getGuideGroups().stream().map(TGuideGroup::getSchoolid).collect(Collectors.toList());
         List<TResourceDirector> directors = new ArrayList<>(groups.size());
+        List<Integer> schoolIds = new ArrayList<>();//已分享过的学校集合
         try {
             for (TGuideGroup g : groups) {
+                Integer schoolid = g.getSchoolid();
+                if (N_Utils.numInList(schoolid, schoolids)) {//已分享过的学校需更新试题时间
+                    schoolIds.add(schoolid);
+                    continue;
+                }
                 TResource r = new TResource();
                 String id = StudyUtil.getId();
                 r.setResourceid(id);
@@ -366,7 +374,7 @@ public class ResourceService {
                 r.setCreateid(createid);
                 r.setCreatetime(timestamp);
                 r.setBelong(10);
-                r.setSchoolid(g.getSchoolid());
+                r.setSchoolid(schoolid);
                 r.setResourcepid(resourceid);
                 resourceMapper.insertSelective(r);
 
@@ -379,7 +387,8 @@ public class ResourceService {
                 rd.setDirectorid(resource.getDirectorid());
                 directors.add(rd);
             }
-            resourceDirectorMapper.batchSave(directors);
+            if(N_Utils.isListNotEmpty(directors)) resourceDirectorMapper.batchSave(directors);
+            if (N_Utils.isListNotEmpty(schoolIds)) resourceMapper.batchUpdateTime(schoolIds, resourceid, timestamp);
         } catch (Exception e) {
             log.error("分享伙伴校出错：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -387,4 +396,70 @@ public class ResourceService {
         }
         return new ResultVo(0, "分享成功");
     }
+
+    /**
+     * @Description 获取分享的伙伴校
+     * @Date 2023/8/29 14:48
+     * @Author YWX
+     * @Param [resourceid]
+     * @Return java.util.List<java.util.Map>
+     **/
+    public List<Map<String, Object>> listSharePartnerSchool(String resourceid) {
+        return resourceMapper.listSharePartnerSchool(resourceid);
+    }
+
+    /**
+     * @Description 分享集团校
+     * @Date 2023/8/29 16:33
+     * @Author YWX
+     * @Param [tResource]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public ResultVo shareGroupSchool(TResource tResource) {
+        List<TGuideGroup> groups = tResource.getGuideGroups();
+        if (N_Utils.isListEmpty(groups)) return new ResultVo(1, "伙伴校不能为空");
+        String resourcepid = tResource.getResourceid();
+        Integer createid = tResource.getCreateid();
+        int timestamp = N_Utils.getSecondTimestamp();
+        TResource r = resourceMapper.getResourceAndSchoolById(resourcepid);
+        List<Integer> schoolids = r.getGuideGroups().stream().map(TGuideGroup::getSchoolid).collect(Collectors.toList());
+        List<TResourceDirector> resourceDirectors = r.getDirectors();
+        List<TResourceDirector> directors = new ArrayList<>();
+        List<Integer> schoolIds = new ArrayList<>();//已分享过的学校集合
+        for (TGuideGroup group : groups) {
+            Integer schoolid = group.getSchoolid();
+            if (N_Utils.numInList(schoolid, schoolids)) {//已分享过的学校需更新资源时间
+                schoolIds.add(schoolid);
+                continue;
+            }
+            //资源
+            TResource tr = new TResource();
+            BeanUtils.copyProperties(r, tr);
+            String resourceid = StudyUtil.getId();
+            tr.setResourceid(resourceid);
+            tr.setReadcount(0);
+            tr.setDowncount(0);
+            tr.setCreateid(createid);
+            tr.setCreatetime(timestamp);
+            tr.setBelong(10);
+            tr.setSchoolid(schoolid);
+            tr.setResourcepid(resourcepid);
+            resourceMapper.insertSelective(tr);
+
+            //资源管理章节
+            for (TResourceDirector d : resourceDirectors) {
+                TResourceDirector rd = new TResourceDirector();
+                BeanUtils.copyProperties(d, rd);
+                rd.setRdid(StudyUtil.getId());
+                rd.setResourceid(resourceid);
+                rd.setCreateid(createid);
+                rd.setCreatetime(timestamp);
+                directors.add(rd);
+            }
+        }
+        if (N_Utils.isListNotEmpty(directors)) resourceDirectorMapper.batchSave(directors);
+        if (N_Utils.isListNotEmpty(schoolIds)) resourceMapper.batchUpdateTime(schoolIds, resourcepid, timestamp);
+        return new ResultVo(0, "分享成功");
+    }
 }

sstudy/src/main/resources/mapper/question/QuestionMapper.xml

@@ -134,9 +134,10 @@
         from t_question q where q.qlevel=3 and q.questionpid=#{questionid} order by q.sorder
     </select>
     <!--管理端试题列表-->
-    <select id="findAll" resultType="com.xhkjedu.sstudy.vo.question.QuestionVo">
+    <select id="findAll" resultType="java.util.Map">
         select q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.belong,q.createid
         ,q.qtypeid,q.qtypename,q.createtime,q.count,q.qstate,q.source,q.year,q.region,q.schoolname,q.hashear,q.hearfile,q.qlevel
+        ,(select count(*) from t_question q2 where q2.shareqid=q.questionid and q2.qstate=1 and q.schoolid=#{question.schoolid})sharenum
         from t_question q
         <if test="question.lsbid!=null and question.lsbid!='0'.toString() and question.lsbid!=''">
             left join t_question_director qd on q.questionid=qd.questionid
@@ -148,7 +149,7 @@
         <if test="question.belong==0">
             and (q.belong in(1,2)
             <if test="question.schoolid!=null">
-                or (q.belong=3 and q.schoolid=#{question.schoolid})
+                or (q.belong in(3,10) and q.schoolid=#{question.schoolid})
             </if>
             <if test="question.createid!=null">
                 or (q.belong=4 and q.createid=#{question.createid})
@@ -164,6 +165,9 @@
         <if test="question.belong==3">
             and q.schoolid=#{question.schoolid}
         </if>
+        <if test="question.belong==10">
+            and q.schoolid=#{question.schoolid} and q.belong=#{question.belong}
+        </if>
         <if test="question.subjectid!=null and question.subjectid!='0'.toString() and question.subjectid!=''">
             and q.subjectid=#{question.subjectid}
         </if>
@@ -237,8 +241,9 @@
     <!--章节、知识点选题-->
     <select id="listForSelect" resultType="java.util.Map">
         select q.questionid,q.score,q.complexity,q.qstem,q.qstemtxt,q.qoption,q.qanswer,q.qanalyze
-        ,q.qtypeid,q.qtypename,q.count,q.ctype,q.source,q.year,q.region,q.schoolname,
-               q.qlevel,q.hearfile,q.hashear
+        ,q.qtypeid,q.qtypename,q.count,q.ctype,q.source,q.year,q.region,q.schoolname
+        ,q.qlevel,q.hearfile,q.hashear,q.belong,q.createid
+        ,(select count(*) from t_question q2 where q2.shareqid=q.questionid and q2.qstate=1 and q.schoolid=#{question.schoolid})sharenum
         from t_question q
         <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!=''">
             left join t_question_point qp on q.questionid = qp.questionid
@@ -274,7 +279,7 @@
         <if test="question.belong==0">
             and (q.belong in(1,2)
             <if test="question.schoolid!=null">
-                or (q.belong=3 and q.schoolid=#{question.schoolid})
+                or (q.belong in(3,10) and q.schoolid=#{question.schoolid})
             </if>
             <if test="question.createid!=null">
                 or (q.belong=4 and q.createid=#{question.createid})
@@ -290,6 +295,9 @@
         <if test="question.belong==3">
             and q.schoolid=#{question.schoolid}
         </if>
+        <if test="question.belong==10">
+            and q.schoolid=#{question.schoolid} and q.belong=#{question.belong}
+        </if>
         <if test="question.belong!=null and question.belong!=0">
             <if test="question.belong==4 or question.belong==6">
                 and q.createid=#{question.createid}
@@ -331,12 +339,12 @@
     <insert id="saveBathQuestion" parameterType="com.xhkjedu.sstudy.model.question.TQuestion">
         INSERT INTO t_question (questionid,qstem,qstemtxt,qoption,qanswer,qanalyze,score,complexity,
                                 ctype,hashear,hearfile,qtypeid,qtypename, subjectid,qlevel,snum,sorder,questionpid,
-                                qstate,source,year,region,schoolname,createid,createtime,belong,schoolid)
+                                qstate,source,year,region,schoolname,createid,createtime,belong,schoolid,shareqid)
         VALUES
         <foreach collection ="list" item="p" index= "index" separator =",">
             (#{p.questionid},#{p.qstem},#{p.qstemtxt},#{p.qoption},#{p.qanswer},#{p.qanalyze},#{p.score},#{p.complexity},
              #{p.ctype},#{p.hashear},#{p.hearfile},#{p.qtypeid},#{p.qtypename},#{p.subjectid},#{p.qlevel},#{p.snum},#{p.sorder},#{p.questionpid},
-             #{p.qstate},#{p.source},#{p.year},#{p.region},#{p.schoolname},#{p.createid},#{p.createtime},#{p.belong},#{p.schoolid})
+             #{p.qstate},#{p.source},#{p.year},#{p.region},#{p.schoolname},#{p.createid},#{p.createtime},#{p.belong},#{p.schoolid},#{p.shareqid})
         </foreach>
     </insert>
 
@@ -344,5 +352,35 @@
     <select id="getQuestionHasHearNum" resultType="java.lang.Integer">
         select count(*) from t_question where hashear=1 and qstate=1 and subjectid=#{subjectid}
     </select>
-
+    <!--获取试题详情及关联章节、知识点、伙伴校-->
+    <resultMap id="questionMap" type="com.xhkjedu.sstudy.model.question.TQuestion">
+        <collection property="questionPoints" select="listPoint2" column="questionid"></collection>
+        <collection property="directors" select="listDirector" column="questionid"></collection>
+        <collection property="schools" select="listSchool" column="questionid"></collection>
+    </resultMap>
+    <select id="listPoint2" resultType="com.xhkjedu.sstudy.model.question.TQuestionPoint">
+        select * from t_question_point where questionid=#{questionid}
+    </select>
+    <select id="listDirector" resultType="com.xhkjedu.sstudy.model.question.TQuestionDirector">
+        select * from t_question_director where questionid=#{questionid}
+    </select>
+    <select id="listSchool" resultType="java.util.Map">
+        select schoolid from t_question where shareqid=#{questionid} group by schoolid
+    </select>
+    <select id="getQuestionAndDirectorPointById" resultMap="questionMap">
+        select * from t_question where questionid=#{questionid}
+    </select>
+    <!--获取分享的伙伴校-->
+    <select id="listSharePartnerSchool" resultType="java.util.Map">
+        select s.schoolid,s.schoolname
+        from t_question q left join t_school s on q.schoolid=s.schoolid
+        where q.shareqid=#{questionid} and s.schoolstate=1
+        group by s.schoolid order by s.schoolid
+    </select>
+    <!--更新分享过伙伴校试题的时间-->
+    <update id="batchUpdateTime">
+        update t_question set createtime=#{timestamp}
+        where shareqid=#{shareqid} and schoolid in
+        <foreach collection="list" item="schoolid" open="(" separator="," close=")">${schoolid}</foreach>
+    </update>
 </mapper>

sstudy/src/main/resources/mapper/resource/ResourceMapper.xml

@@ -9,11 +9,12 @@
         delete from t_resource where resourceid=#{resourceid}
     </delete>
     <!--列表-->
-    <select id="findAll" resultType="com.xhkjedu.sstudy.model.resource.TResource">
+    <select id="findAll" resultType="java.util.Map">
         select r.resourceid,r.resourcename,r.createtime,r.suffix,u.username createname,r.resourceurl,rd.lsbid,
         rd.directorid,r.resourceclass,r.resourcetype,r.readcount,r.downcount,r.pdfurl,r.converted,r.resourcecover
         ,r.comm,r.duration,r.resourcesize,r.mp4code,r.createid,r.belong
         ,r.resourcegrade,r.source,r.year,r.region,r.schoolname
+        ,(select count(*) from t_resource r2 where r2.resourcepid=r.resourceid and r.resourcestate=1)sharenum
         from t_resource r left join t_user u on u.userid=r.createid
         left join t_resource_director rd on r.resourceid=rd.resourceid
         <if test="resource.belong!=null and resource.belong==5">
@@ -87,10 +88,11 @@
     </select>
     <!--教师备课、预习导学资源列表-->
     <!--2020.11.16 教师备课只获取自己上传到个人空间文件，不获取收藏的文件-->
-    <select id="listMyResource" resultType="com.xhkjedu.sstudy.vo.resource.ResourceVo">
+    <select id="listMyResource" resultType="java.util.Map">
         select r.resourceid,r.resourcename,r.createtime,r.suffix,u.username createname,r.resourceurl,rd.lsbid,
         rd.directorid,r.resourceclass,r.resourcetype,r.readcount,r.downcount,r.pdfurl,r.converted,r.resourcecover
         ,r.comm,r.duration,r.resourcesize,r.mp4code
+        ,(select count(*) from t_resource r2 where r2.resourcepid=r.resourceid and r.resourcestate=1)sharenum
         from t_resource r left join t_user u on u.userid=r.createid
         left join t_resource_director rd on r.resourceid=rd.resourceid
         where r.resourcestate=1 and r.level=#{resource.level} and r.createid=#{resource.createid}
@@ -177,7 +179,7 @@
     <select id="studentVideoList" resultType="com.xhkjedu.sstudy.model.resource.TResource">
         select r.resourceid,r.resourcename,r.createtime,r.suffix,u.username createname
         ,r.readcount,r.comm,r.resourceurl,r.resourcecover,r.duration,r.resourcesize
-        ,r.resourcegrade,r.source,r.year,r.region,r.schoolname
+        ,r.resourcegrade,r.source,r.year,r.region,r.schoolname,r.belong
         from t_resource r left join t_user u on u.userid=r.createid
         left join t_resource_director rd on r.resourceid=rd.resourceid
         where r.resourcestate=1 and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{resource.schoolid}))
@@ -231,7 +233,7 @@
     <select id="studentVideoWebList" resultType="com.xhkjedu.sstudy.model.resource.TResource">
         select r.resourceid,r.resourcename,r.createtime,r.suffix,u.username createname
         ,r.readcount,r.comm,r.resourceurl,r.resourcecover,r.duration,r.resourcesize,r.mp4code
-        ,r.resourcegrade,r.source,r.year,r.region,r.schoolname,r.converted
+        ,r.resourcegrade,r.source,r.year,r.region,r.schoolname,r.converted,r.belong
         from t_resource r left join t_user u on u.userid=r.createid
         left join t_resource_director rd on r.resourceid=rd.resourceid
         where r.resourcestate=1 and (r.belong in(1,2) or (r.belong=3 and r.schoolid=#{resource.schoolid}))
@@ -269,5 +271,32 @@
     <select id="getResourceNumByLevelAndResourceid" resultType="java.lang.Integer">
         select count(*) from t_resource where level=2 and resourceid=#{resourceid}
     </select>
+    <!--获取分享的伙伴校-->
+    <select id="listSharePartnerSchool" resultType="java.util.Map">
+        select s.schoolid,s.schoolname
+        from t_resource r left join t_school s on r.schoolid=s.schoolid
+        where r.resourcepid=#{resourceid} and s.schoolstate=1
+        group by s.schoolid order by s.schoolid
+    </select>
+    <!--获取资源详情及关联章节、伙伴校-->
+    <resultMap id="resourceMap" type="com.xhkjedu.sstudy.model.resource.TResource">
+        <collection property="directors" select="listDirector" column="resourceid"></collection>
+        <collection property="guideGroups" select="listSchool" column="resourceid"></collection>
+    </resultMap>
+    <select id="listDirector" resultType="com.xhkjedu.sstudy.model.resource.TResourceDirector">
+        select * from t_resource_director where resourceid=#{resourceid}
+    </select>
+    <select id="listSchool" resultType="com.xhkjedu.sstudy.model.resource.TGuideGroup">
+        select schoolid from t_resource where resourcepid=#{resourceid} group by schoolid
+    </select>
+    <select id="getResourceAndSchoolById" resultMap="resourceMap">
+        select r.* from t_resource r where r.resourceid=#{resourceid}
+    </select>
+    <!--更新分享过伙伴校资源的时间-->
+    <update id="batchUpdateTime">
+        update t_resource set createtime=#{timestamp}
+        where resourcepid=#{resourceid} and schoolid in
+        <foreach collection="list" item="schoolid" open="(" separator="," close=")">${schoolid}</foreach>
+    </update>
 
 </mapper>