Merge remote-tracking branch 'cloud-schoolapi/ywx'

# Conflicts:
#	sapi/src/main/resources/application.properties

sclass/src/main/resources/application.properties

@@ -61,4 +61,4 @@ enable.scheduled=false
 cron.deleteUriMap=0/3 * * * * ?
 
 #版本号
-versionname=Test_v3.2.3
+versionname=Test_v3.2.6

slive/src/main/resources/application.properties

@@ -102,4 +102,4 @@ cron.updateLicense=0 0 0 * * ?
 cron.updateLicenseState=0 0 0/1 * * ?
 
 #版本号
-versionname=Test_v3.2.5
+versionname=Test_v3.2.6

sstudy/src/main/java/com/xhkjedu/sstudy/controller/recite/ReciteController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName ReciteController
@@ -97,21 +98,30 @@ public class ReciteController {
     }
 
     /**
-     *功能描述 背诵教师--网页--列表
+     * 功能描述 背诵教师--网页--列表
+     *
+     * @param * @param recite
+     * @return com.xhkjedu.vo.ResultVo
      * @author WN
      * @date 2020/6/10
-     * @param  * @param recite
-     * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("list")
-    public ResultVo list(@RequestBody TRecite recite){
+    public ResultVo list(@RequestBody TRecite recite) {
         N_Utils.validation(new Object[]{
-                recite.getPage(),"显示页码",1,recite.getPageSize(),"显示条数",1,
-                recite.getCreateid(),"创建人",1});
+                recite.getPage(), "显示页码", 1, recite.getPageSize(), "显示条数", 1,
+                recite.getCreateid(), "创建人", 1});
         PageHelper.startPage(recite.getPage(), recite.getPageSize());
-        List<ReciteVo> list = reciteService.listRecites(recite);
+        List<Map> list = reciteService.listRecites(recite);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
-        return new ResultVo(0,"获取列表成功",pageResult);
+        return new ResultVo(0, "获取列表成功", pageResult);
+    }
+
+    @PostMapping("/list_class")
+    public ResultVo listClass(@RequestBody TRecite recite) {
+        Integer reciteid = recite.getReciteid();
+        N_Utils.validation(new Object[]{reciteid, "背诵id", 1});
+        List<Map> list = reciteService.listClass(reciteid);
+        return new ResultVo(0, "获取背诵班级成功", list);
     }
 
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/recite/ReciteMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName ReciteMapper
@@ -26,11 +27,22 @@ public interface ReciteMapper extends TkMapper<TRecite> {
     Integer updateRecite(@Param("recite") TRecite recite);
 
     /**
-     *功能描述 列表--网页
+     * 功能描述 列表--网页
+     *
+     * @param * @param recite
+     * @return java.util.Map
      * @author WN
      * @date 2020/6/10
-     * @param  * @param recite
-     * @return java.util.List<com.xhkjedu.vo.recite.ReciteVo>
      */
-    List<ReciteVo> listRecites(@Param("recite") TRecite recite);
+    List<Map> listRecites(@Param("recite") TRecite recite);
+
+    /**
+     * 获取背诵班级
+     *
+     * @return java.util.List<java.util.Map>
+     * @Param [reciteid]
+     * @Author ywx
+     * @Date 2022/6/21 10:36
+     **/
+    List<Map> listClass(Integer reciteid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/recite/ReciteService.java

@@ -20,6 +20,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -129,21 +130,27 @@ public class ReciteService {
     }
 
     /**
-     *功能描述 列表--网页
+     * 功能描述 列表--网页
+     *
+     * @param * @param recite
+     * @return java.util.Map
      * @author WN
      * @date 2020/6/10
-     * @param  * @param recite
-     * @return java.util.List<com.xhkjedu.vo.recite.ReciteVo>
      */
-    public List<ReciteVo> listRecites(TRecite recite){
-        List<ReciteVo> list = reciteMapper.listRecites(recite);
-        for (ReciteVo r : list) {
-            List<ReciteClassVo> classlist = r.getClasslist();
-            Integer stunum = classlist.stream().collect(Collectors.summingInt(ReciteClassVo::getStunum));
-            Integer commitnum = classlist.stream().collect(Collectors.summingInt(ReciteClassVo::getCommitnum));
-            r.setCommitrate(N_Utils.getIntegerDivideAndMulitiply(commitnum,stunum));
-        }
+    public List<Map> listRecites(TRecite recite) {
+        List<Map> list = reciteMapper.listRecites(recite);
         return list;
     }
 
+    /**
+     * 获取背诵班级
+     *
+     * @return java.util.List<java.util.Map>
+     * @Param [reciteid]
+     * @Author ywx
+     * @Date 2022/6/21 10:33
+     **/
+    public List<Map> listClass(Integer reciteid) {
+        return reciteMapper.listClass(reciteid);
+    }
 }

sstudy/src/main/resources/application.properties

@@ -107,4 +107,4 @@ file.showurl=http://schoolstatictest.xhkjedu.com/static/
 dbname=xhkjedu_school_test
 
 #版本号
-versionname=Test_v3.2.5
+versionname=Test_v3.2.6

sstudy/src/main/resources/mapper/recite/ReciteMapper.xml

@@ -6,43 +6,24 @@
         UPDATE t_recite SET recitetitle=#{recite.recitetitle},recitecont=#{recite.recitecont}
         WHERE reciteid=#{recite.reciteid}
     </update>
-
-    <resultMap id="reciteClass" type="com.xhkjedu.sstudy.vo.recite.ReciteVo">
-        <result property="reciteid" column="reciteid"></result>
-        <result property="recitetitle" column="recitetitle"></result>
-        <result property="recitecont" column="recitecont"></result>
-        <result property="subjectid" column="subjectid"></result>
-        <result property="subjectname" column="subjectname"></result>
-        <result property="createid" column="createid"></result>
-        <result property="createname" column="createname"></result>
-        <result property="createtime" column="createtime"></result>
-        <collection property="classlist" ofType="com.xhkjedu.sstudy.vo.recite.ReciteClassVo"
-                    javaType="java.util.List" select="listClass" column="{reciteid=reciteid}">
-        </collection>
-    </resultMap>
-    <resultMap id="classResult" type="com.xhkjedu.sstudy.vo.recite.ReciteClassVo">
-        <result property="classid" column="classid"></result>
-        <result property="classname" column="classname"></result>
-        <result property="starttime" column="starttime"></result>
-        <result property="stoptime" column="stoptime"></result>
-        <result property="stunum" column="stunum"></result>
-        <result property="commitnum" column="commitnum"></result>
-    </resultMap>
-    <select id="listClass" resultMap="classResult">
-        select rg.classid,c.classname,c.gradeid,rg.starttime,rg.stoptime,
-        (SELECT COUNT(*) FROM t_recite_student rs WHERE rs.reciteid=rg.reciteid AND rs.classid=rg.classid) stunum,
-        (SELECT COUNT(*) FROM t_recite_student rs WHERE rs.reciteid=rg.reciteid AND rs.classid=rg.classid AND rs.rsstate>0) commitnum
-        from t_recite_group rg LEFT JOIN t_class c ON rg.classid = c.classid
-        where rg.reciteid=#{reciteid} order by c.gradeid,c.classtype,c.classorder
+    <!--获取背诵班级-->
+    <select id="listClass" resultType="java.util.Map">
+        select rs.classid,c.classname,c.gradeid,count(distinct rs.rsid)stunum
+        ,count(distinct case when rs.rsstate>0 then rs.rsid else null end)commitnum
+        from t_recite_student rs left join t_class c on rs.classid = c.classid
+        where rs.reciteid=#{reciteid} group by rs.classid order by c.classtype,c.classorder
     </select>
 
     <!-- 背诵分页列表 网页 -->
-    <select id="listRecites" resultMap="reciteClass">
-        SELECT r.reciteid,r.recitetitle,r.recitecont,r.subjectid,s.subjectname,
-        r.createid,u.username AS createname,r.createtime,rg.starttime,rg.stoptime
-        FROM t_recite r LEFT JOIN t_subject s ON r.subjectid = s.subjectid
-        LEFT JOIN t_user u ON r.createid=u.userid
+    <select id="listRecites" resultType="java.util.Map">
+        SELECT r.reciteid,r.recitetitle,r.recitecont
+        ,(select s.subjectname from t_subject s where s.subjectid=r.subjectid)subjectname
+        ,COUNT(DISTINCT CASE WHEN rs.reciteid=r.reciteid THEN rs.rsid ELSE NULL END)stunum
+        ,COUNT(DISTINCT CASE WHEN rs.reciteid=r.reciteid AND rs.rsstate>0 THEN rs.rsid ELSE NULL END)commitnum
+        ,r.createid,u.username AS createname,r.createtime,rg.starttime,rg.stoptime
+        FROM t_recite r LEFT JOIN t_user u ON r.createid=u.userid
         LEFT JOIN t_recite_group rg ON rg.reciteid = r.reciteid
+        LEFT JOIN t_recite_student rs ON r.reciteid=rg.reciteid
         where r.createid=#{recite.createid}
         <if test="recite.recitestate==1">
             AND rg.stoptime<![CDATA[ >= ]]>UNIX_TIMESTAMP()
@@ -50,6 +31,9 @@
         <if test="recite.recitestate==2">
             AND rg.stoptime<![CDATA[ < ]]>UNIX_TIMESTAMP()
         </if>
+        <if test="recite.recitetitle!=null and recite.recitetitle!=''">
+            AND r.recitetitle like '%${recite.recitetitle}%'
+        </if>
         GROUP BY r.reciteid ORDER BY r.createtime desc
     </select>
 </mapper>

suser/src/main/java/com/xhkjedu/suser/service/system/RoleService.java

@@ -17,6 +17,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName RoleService
@@ -168,7 +169,7 @@ public class RoleService {
                 }
             }
         }
-        return lst;
+        return lst.stream().filter(m -> m.getModulechilds() != null && m.getModulechilds().size() > 0).collect(Collectors.toList());
     }
 
     //判断集合中是否存在模块

suser/src/main/resources/application.properties

@@ -57,4 +57,4 @@ signName=【河南星火燎原】
 #郑州管城大数据SSO认证鉴权接口
 ssourl=http://gcdsj.zzgcjy.cn/portal/sso/api/agent
 #版本号
-versionname=Test_v3.2.9
+versionname=Test_v3.2.10