فهرست منبع

乐团班级列表,增加根据课程组类型筛选支持乐团、VIP、网管

zouxuan 4 سال پیش
والد
کامیت
72776d79b3

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

@@ -2957,10 +2957,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     public PageInfo<ClassGroupTeachersDto> queryClassGroupPage(ClassGroupQueryInfo queryInfo) {
+        if(queryInfo.getGroupType() == null){
+            queryInfo.setGroupType(MUSIC);
+        }
         PageInfo<ClassGroupTeachersDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
-
+        params.put("groupType",queryInfo.getGroupType().getCode());
         List<ClassGroupTeachersDto> dataList = null;
         int count = classGroupDao.countClassGroup(params);
         if (count > 0) {

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -139,7 +139,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 	public Map<String, List<IndexBaseDto>> indexBaseDataTask(String month) {
 		Map<String, List<IndexBaseDto>> result = new HashMap<>();
 
-		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM");
+		DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 		LocalDate nowDate = LocalDate.now();
 
 		List<Organization> allOrgans = organizationDao.findAllOrgans();

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

@@ -1406,7 +1406,7 @@
 
     <sql id="queryClassGroupPageSql">
         <where>
-            cg.group_type_ = 'MUSIC' AND cg.del_flag_ = 0
+            cg.group_type_ = #{groupType} AND cg.del_flag_ = 0
             <if test="type != null">
                 AND type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
@@ -1420,12 +1420,28 @@
     </sql>
     <select id="countClassGroup" resultType="int">
         SELECT COUNT(cg.id_) FROM class_group cg
-        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
+        <if test="groupType == 'MUSIC'">
+            LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
+        </if>
+        <if test="groupType == 'VIP'">
+            LEFT JOIN vip_group mg ON mg.id_ = cg.music_group_id_
+        </if>
+        <if test="groupType == 'PRACTICE'">
+            LEFT JOIN practice_group mg ON mg.id_ = cg.music_group_id_
+        </if>
         <include refid="queryClassGroupPageSql"/>
     </select>
     <select id="queryClassGroupPage" resultMap="ClassGroupTeachers">
         SELECT cg.*,mg.name_ music_group_name_,o.name_ organName FROM class_group cg
-        LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
+        <if test="groupType == 'MUSIC'">
+            LEFT JOIN music_group mg ON mg.id_ = cg.music_group_id_
+        </if>
+        <if test="groupType == 'VIP'">
+            LEFT JOIN vip_group mg ON mg.id_ = cg.music_group_id_
+        </if>
+        <if test="groupType == 'PRACTICE'">
+            LEFT JOIN practice_group mg ON mg.id_ = cg.music_group_id_
+        </if>
         LEFT JOIN organization o ON o.id_ = mg.organ_id_
         <include refid="queryClassGroupPageSql"/>
         ORDER BY cg.id_ DESC