缴费项目优化

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

@@ -1,14 +1,13 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 import java.util.List;
 
-import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
-import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
-import com.ym.mec.common.page.QueryInfo;
-
 public class MusicGroupQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "所属分部编号",required = false)
@@ -53,17 +52,6 @@ public class MusicGroupQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "维修技师")
     private Integer repairUserId;
 
-    @ApiModelProperty(value = "有剩余未排课时长（当缴费项目结束3个月后，该缴费项目中的学员剩余时长仍未排课，则提醒该事项）")
-    private boolean hasSubCourseTimes = false;
-
-    public boolean getHasSubCourseTimes() {
-        return hasSubCourseTimes;
-    }
-
-    public void setHasSubCourseTimes(boolean hasSubCourseTimes) {
-        this.hasSubCourseTimes = hasSubCourseTimes;
-    }
-
     public Integer getRepairUserId() {
         return repairUserId;
     }

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

@@ -3074,7 +3074,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             throw new BizException("获取用户信息失败");
         }
         //查询有剩余排课时长的乐团
-        if(queryInfo.getHasSubCourseTimes()){
+        if("MUSIC_GROUP_HAS_COURSE_TIMES".equals(queryInfo.getSearchType())){
             List<String> musicGroupIds = musicGroupDao.queryHasSubCourseTimes(queryInfo.getOrganId(),queryInfo.getTenantId());
             queryInfo.setMusicGroupIds(musicGroupIds);
         }