Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/api/SmartClassControllerAPI.java

@@ -51,6 +51,6 @@ public interface SmartClassControllerAPI {
 
     @GetMapping(value = "/getSchoolClasses")
     @ApiOperation(value = "获取班级", notes = "获取班级", httpMethod = "GET")
-    CommonResult getSchoolClasses(@RequestParam int schoolClass);
+    CommonResult getSchoolClasses(@RequestParam int schoolClass,String className);
 
 }

src/main/java/com/template/controller/SmartClassController.java

@@ -450,12 +450,12 @@ public class SmartClassController implements SmartClassControllerAPI {
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult getSchoolClasses(int schoolClass) {
+    public CommonResult getSchoolClasses(int schoolClass,String className) {
         if (schoolClass==0) {
-            List<SmartClassVo> vos = smartClassService.getSchoolClassIdList();
+            List<SmartClassVo> vos = smartClassService.getSchoolClassIdList(className);
             return CommonResult.ok(vos);
         }
-        SmartClassVo vo = smartClassService.getSchoolClassId(schoolClass);
+        SmartClassVo vo = smartClassService.getSchoolClassId(schoolClass,className);
         return CommonResult.ok(vo);
     }
 }

src/main/java/com/template/mapper/SmartClassMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface SmartClassMapper extends BaseMapper<SmartClass> {
 
 
-    List<SmartClassVo> getSchoolClassIdList();
+    List<SmartClassVo> getSchoolClassIdList(@Param("className") String className);
 
-    SmartClassVo getSchoolClassId(@Param("schoolClass") int schoolClass);
+    SmartClassVo getSchoolClassId(@Param("schoolClass") int schoolClass,@Param("className") String className);
 }

src/main/java/com/template/services/SmartClassService.java

@@ -35,7 +35,7 @@ public interface SmartClassService extends IService<SmartClass> {
 
     PageUtils<SmartClass> queryPageSmartClass(int currentPage, int pageCount, String name);
 
-    List<SmartClassVo> getSchoolClassIdList();
+    List<SmartClassVo> getSchoolClassIdList(String className);
 
-    SmartClassVo getSchoolClassId(int schoolClass);
+    SmartClassVo getSchoolClassId(int schoolClass,String className);
 }

src/main/java/com/template/services/impl/SmartClassServiceImpl.java

@@ -100,14 +100,14 @@ public class SmartClassServiceImpl extends ServiceImpl<SmartClassMapper, SmartCl
     }
 
     @Override
-    public List<SmartClassVo> getSchoolClassIdList() {
-        List<SmartClassVo> vos = smartClassMapper.getSchoolClassIdList();
+    public List<SmartClassVo> getSchoolClassIdList(String className) {
+        List<SmartClassVo> vos = smartClassMapper.getSchoolClassIdList(className);
         return vos;
     }
 
     @Override
-    public SmartClassVo getSchoolClassId(int schoolClass) {
-        SmartClassVo vo = smartClassMapper.getSchoolClassId(schoolClass);
+    public SmartClassVo getSchoolClassId(int schoolClass,String className) {
+        SmartClassVo vo = smartClassMapper.getSchoolClassId(schoolClass,className);
         return vo;
     }
 }

src/main/resources/mapper/template/SmartClassMapper.xml

@@ -8,6 +8,11 @@
                sg.`name` as gradeName
         FROM `smart_class` sc
                  LEFT JOIN smart_grade sg ON sc.grade_id = sg.id
+        where sc.deleted=0
+        <if test="className != null and className != ''">
+            AND sc.`name`= #{className}
+        </if>
+
     </select>
     <select id="getSchoolClassId" resultType="com.template.model.vo.SmartClassVo">
         SELECT sc.id     as id,
@@ -15,7 +20,10 @@
                sg.`name` as gradeName
         FROM `smart_class` sc
                  LEFT JOIN smart_grade sg ON sc.grade_id = sg.id
-        WHERE sc.id = #{schoolClass}
+        WHERE sc.id = #{schoolClass} and sc.deleted=0
+        <if test="className != null and className != ''">
+            AND sc.`name`= #{className}
+        </if>
     </select>
 
 </mapper>

src/main/resources/mapper/template/SmartTeachingMapper.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.SmartTeachingMapper">
+    <resultMap type="com.template.model.vo.UserSubjectVo" id="smartTeachingMap">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="subjectId" column="subject_id"/>
+        <result property="subjectName" column="subject_name"/>
+        <result property="gradeId" column="grade_id"/>
+        <result property="gradeName" column="grade_name"/>
+        <result property="classId" column="class_id"/>
+        <result property="className" column="class_name"/>
+    </resultMap>
+    <select id="querySmartTeachings" resultType="com.template.model.vo.UserSubjectVo" resultMap="smartTeachingMap">
+        select
+        st.id,st.user_id,
+        st.subject_id,ss.name as subject_name,
+        st.grade_id,sg.name as grade_name,
+        st.class_id,sc.name as class_name
+        from smart_teaching st
+        left join smart_grade sg on sg.deleted = 0 and sg.id = st.grade_id
+        left join smart_subject ss on ss.deleted = 0 and ss.id = st.subject_id
+        left join smart_class sc on sc.deleted = 0 and sc.id = st.class_id
+        where st.deleted = 0
+        <if test="userIds != null and userIds.size() > 0">
+            and st.user_id in
+            <foreach collection="userIds" item="userId" index="index" open="(" close=")" separator=",">
+                ${userId}
+            </foreach>
+        </if>
+    </select>
+</mapper>