字典管理 - 班级管理

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/BasicStudentResult.java

@@ -34,6 +34,9 @@ public class BasicStudentResult {
     @ApiModelProperty(value = "班级信息")
     private String clazz;
 
+    @ApiModelProperty(value = "班级id")
+    private String clazzId;
+
     @ApiModelProperty(value = "是否被逻辑删除？")
     private Boolean enable;
 
@@ -123,4 +126,12 @@ public class BasicStudentResult {
     public void setCreateId(Long createId) {
         this.createId = createId;
     }
+
+    public String getClazzId() {
+        return clazzId;
+    }
+
+    public void setClazzId(String clazzId) {
+        this.clazzId = clazzId;
+    }
 }

distributed-print-business/src/main/resources/mapper/BasicStudentMapper.xml

@@ -4,20 +4,22 @@
 
     <select id="listByClass" resultType="com.qmth.distributed.print.business.bean.dto.TaskPrintClassDto">
         SELECT
-            s.clazz classId,
-            s.clazz className,
+            s.clazz_id classId,
+            clz.clazz_name className,
             COUNT(1) studentCount
         FROM
             basic_student s
+                LEFT JOIN
+            basic_clazz clz ON s.clazz_id = clz.id and clz.enable = true
         WHERE
             s.school_id = #{schoolId}
             <if test="stringList != null and stringList != ''">
-                and s.clazz in
+                and s.clazz_id in
                 <foreach collection="stringList" item="cla" open="(" close=")" separator=",">
                     #{cla}
                 </foreach>
             </if>
-        GROUP BY s.clazz
+        GROUP BY s.clazz_id
     </select>
 
     <select id="findBasicStudentPage"
@@ -27,9 +29,10 @@
             student_name AS studentName,
             student_code AS studentCode,
             phone_number AS phoneNumber,
-            campus_id AS campusId,
+            stu.campus_id AS campusId,
             cam.campus_name AS campusName,
-            clazz,
+            clazz_id AS clazzId,
+            clz.clazz_name AS clazz,
             stu.enable,
             stu.create_id AS createId,
             stu.create_time AS createTime
@@ -38,6 +41,8 @@
                 LEFT JOIN
             basic_campus cam ON stu.campus_id = cam.id
                 AND cam.enable = TRUE
+                LEFT JOIN
+            basic_clazz clz ON stu.clazz_id = clz.id AND clz.enable = true
         <where>
             and stu.enable = true
             <if test="queryParams != null and queryParams != ''">

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicClazzController.java

@@ -1,15 +1,17 @@
 package com.qmth.distributed.print.api;
 
+import com.qmth.boot.api.annotation.Aac;
+import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.teachcloud.common.bean.params.BasicClazzParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
-import com.qmth.teachcloud.common.service.BasicClazzService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.templete.execute.AsyncBasicClazzImportService;
+import com.qmth.teachcloud.common.bean.params.BasicClazzParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.entity.TBTask;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
+import com.qmth.teachcloud.common.service.BasicClazzService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -32,7 +34,7 @@ import java.util.Objects;
 @Api(tags = "班级管理controller")
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.basic}/clazz")
-//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class BasicClazzController {
     @Resource
     private BasicClazzService basicClazzService;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/BasicCourseResult.java

@@ -31,6 +31,9 @@ public class BasicCourseResult {
     @ApiModelProperty(value = "班级")
     private String clazz;
 
+    @ApiModelProperty(value = "班级")
+    private Long clazzId;
+
     @ApiModelProperty(value = "是否被逻辑删除")
     private Boolean enable;
 
@@ -112,4 +115,12 @@ public class BasicCourseResult {
     public void setCreateId(Long createId) {
         this.createId = createId;
     }
+
+    public Long getClazzId() {
+        return clazzId;
+    }
+
+    public void setClazzId(Long clazzId) {
+        this.clazzId = clazzId;
+    }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicClazzServiceImpl.java

@@ -236,6 +236,7 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
                 orgId = sysUser.getOrgId();
                 id = SystemConstant.getDbUuid();
                 basicClazz.setId(id);
+                basicClazz.setEnable(true);
                 basicClazz.setCreateId(sysUser.getId());
             } else {
                 // id不为空 -> 编辑

teachcloud-common/src/main/resources/mapper/BasicCourseMapper.xml

@@ -64,8 +64,10 @@
             MAX(bc.name) AS courseName,
             MAX(teaching_room_id) AS teachingRoomId,
             MAX(org.name) AS teachingRoomName,
-            GROUP_CONCAT(buc.clazz
+            GROUP_CONCAT(clz.clazz_name
                          SEPARATOR ',') AS clazz,
+            GROUP_CONCAT(clz.id
+                         SEPARATOR ',') AS clazzId,
             MAX(bc.enable) as enable,
             MAX(bc.create_id) AS createId,
             MAX(bc.create_time) AS createTime
@@ -74,6 +76,8 @@
                 INNER JOIN
             basic_user_course buc ON bc.id = buc.course_id
                 LEFT JOIN
+            basic_clazz clz ON buc.clazz_id = clz.id AND clz.enable = TRUE
+                LEFT JOIN
             sys_org org ON bc.teaching_room_id = org.id
                 AND org.type = 'TEACHING_ROOM'
                 AND org.enable = TRUE