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

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

@@ -55,6 +55,8 @@ public interface QuestionMapper extends TkMapper<TQuestion> {
     QuestionVo findById(@Param("questionid") String questionid);
     //复合题子题
     List<Map> listSonQuestionsForDetail(@Param("questionid") String questionid);
+    //复合题子题分享集团校用
+    List<TQuestion> listSonQuestionsForShare(@Param("questionid") String questionid);
 
     /**
      * 章节、知识点选题

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

@@ -493,6 +493,10 @@ public class QuestionService {
         Integer createid = question.getCreateid();
         int timestamp = N_Utils.getSecondTimestamp();
         TQuestion q = questionMapper.getQuestionAndDirectorPointById(shareqid);
+        List<TQuestion> list = new ArrayList<>();
+        if (q.getQlevel().equals(2)) {
+            list = questionMapper.listSonQuestionsForShare(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());
@@ -518,6 +522,19 @@ public class QuestionService {
             tq.setSchoolid(schoolid);
             tq.setShareqid(shareqid);
             questions.add(tq);
+            for (TQuestion s : list) {
+                TQuestion sq = new TQuestion();
+                BeanUtils.copyProperties(s, sq);
+                sq.setQuestionid(StudyUtil.getId());
+                sq.setQuestionpid(questionid);
+                sq.setCount(0);
+                sq.setCreateid(createid);
+                sq.setCreatetime(timestamp);
+                sq.setBelong(10);
+                sq.setSchoolid(schoolid);
+                sq.setShareqid(shareqid);
+                questions.add(sq);
+            }
 
             //试题关联知识点
             for (TQuestionPoint p : questionPoints) {

sstudy/src/main/java/com/xhkjedu/sstudy/utils/ConvertUtil.java

@@ -102,6 +102,7 @@ public class ConvertUtil extends JedisUtil {
             //获取压缩包文件
             pdfurl = messageSender.convertResource(resource);
         } else {
+            if (resource.getBelong().equals(10)) resourceid = resource.getResourcepid();
             List<Map> files = resourceFileMapper.listFile(resourceid);
             pdfurl = JSON.toJSONString(files);
         }

sstudy/src/main/java/com/xhkjedu/sstudy/vo/resource/ResourceVo.java

@@ -108,4 +108,5 @@ public class ResourceVo {
     private List<DirectorVo> directors;
 
     private Integer sharenum;//分享集团校数量
+    private String resourcepid;//所属资源id
 }

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

@@ -118,6 +118,10 @@
              ,q.qtypeid,q.qtypename,q.ctype,q.qlevel,q.sorder
         from t_question q where q.qlevel=3 and q.questionpid=#{questionid} order by q.sorder
     </select>
+    <!--复合题子题分享集团校用-->
+    <select id="listSonQuestionsForShare" resultType="com.xhkjedu.sstudy.model.question.TQuestion">
+        select q.* from t_question q where q.qlevel=3 and q.questionpid=#{questionid} order by q.sorder
+    </select>
     <!--管理端试题列表-->
     <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.schoolid

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

@@ -141,6 +141,7 @@
         <result property="directornum" column="directornum"/>
         <result property="areaall" column="areaall"/>
         <result property="sharenum" column="sharenum"/>
+        <result property="resourcepid" column="resourcepid"/>
         <collection property="directors" ofType="com.xhkjedu.sstudy.vo.subjectbook.DirectorVo" javaType="java.util.List">
             <result property="lsbid" column="lsbid"/>
             <result property="directorid" column="directorid"/>
@@ -167,6 +168,7 @@
     </select>
     <select id="findById2" resultType="com.xhkjedu.sstudy.vo.resource.ResourceVo">
         select r.resourceid,r.resourceclass,r.resourceurl,r.pdfurl,r.converted,r.suffix,r.mp4code
+        ,r.belong,r.resourcepid
         from t_resource r where r.resourceid=#{resourceid}
     </select>
     <!--更新下载次数-->