Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherMusicClassQueryInfo.java

@@ -0,0 +1,18 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class TeacherMusicClassQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "乐团状态",required = true)
+    private String status;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -99,7 +99,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @param queryInfo
      * @return
      */
-    PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(QueryInfo queryInfo);
+    PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(TeacherMusicClassQueryInfo queryInfo);
 
     /**
      * 获取老师VIP课程信息列表

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -414,7 +414,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 	}
 
     @Override
-    public PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(QueryInfo queryInfo) {
+    public PageInfo<TeacherMusicClassInfoDto> getTeacherMusicClass(TeacherMusicClassQueryInfo queryInfo) {
         PageInfo<TeacherMusicClassInfoDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
@@ -2148,7 +2148,8 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         if (Objects.isNull(classGroup)) {
             throw new BizException("班级不存在");
         }
-        classGroup.setTotalClassTimes(classGroup.getTotalClassTimes() + num);
+        int totalClassTimes = classGroup.getTotalClassTimes() == null ? 0 : classGroup.getTotalClassTimes();
+        classGroup.setTotalClassTimes(totalClassTimes+ num);
         classGroup.setUpdateTime(new Date());
 
         classGroupDao.update(classGroup);

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -219,6 +219,9 @@
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
         WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC'
+        <if test="status != null">
+            AND mg.status_ = #{status}
+        </if>
         <include refid="global.limit"/>
     </select>
 
@@ -481,6 +484,9 @@
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
         LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
         WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND cg.group_type_ = 'MUSIC'
+        <if test="status != null">
+            AND mg.status_ = #{status}
+        </if>
     </select>
     <select id="findStudentOrganIdsByClassGroup" resultType="int">
         SELECT

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.EmployeeDao;
 import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.*;
 import com.ym.mec.biz.service.ClassGroupService;
@@ -166,7 +167,7 @@ public class TeacherController extends BaseController {
     @GetMapping("/getTeacherMusicClass")
     @ApiParam(value = "教师编号", required = true)
     @PreAuthorize("@pcs.hasPermissions('teacher/getTeacherMusicClass')")
-    public Object getTeacherMusicClass(QueryInfo queryInfo){
+    public Object getTeacherMusicClass(TeacherMusicClassQueryInfo queryInfo){
         return succeed(classGroupService.getTeacherMusicClass(queryInfo));
     }