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

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/SuperClassGroupDto.java

@@ -7,4 +7,14 @@ import com.ym.mec.biz.dal.entity.ClassGroup;
  * @Date 2019/12/30
  */
 public class SuperClassGroupDto extends ClassGroup {
+
+    private String groupName;
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
 }

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

@@ -2214,16 +2214,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
         }
 
-        List<CourseScheduleEndDto> results = new ArrayList<>();
-        int count = courseScheduleDao.endCountCourseSchedules(params);
+        List<SuperClassGroupDto> results = new ArrayList<>();
+        int count = classGroupDao.superCountClassGroups(params);
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
-            results = courseScheduleDao.endFindCourseSchedules(params);
+            results = classGroupDao.superFindClassGroups(params);
             List<Group> groups=new ArrayList<>();
             groups.add(null);
-            for (CourseScheduleEndDto courseScheduleEndDto : results) {
-                Group group=new Group(courseScheduleEndDto.getMusicGroupId(),courseScheduleEndDto.getGroupType());
+            for (SuperClassGroupDto result : results) {
+                Group group=new Group(result.getMusicGroupId(),result.getGroupType());
                 groups.add(group);
             }
             groups = groupDao.findByGroupIds(groups);

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

@@ -920,14 +920,48 @@
       where id_=1
     </update>
 
-    <resultMap id="SuperClassGroupInfo" type="com.ym.mec.biz.dal.dto.SuperClassGroupDto">
+    <resultMap id="SuperClassGroupInfo" type="com.ym.mec.biz.dal.dto.SuperClassGroupDto" extends="ClassGroup">
 
     </resultMap>
-    <select id="superFindClassGroups" resultMap="SuperClassGroupInfo">
 
+    <sql id="superFindClassGroupsCondition">
+        <where>
+            <if test="search != null">
+                AND (cg.name_ LIKE CONCAT('%',#{search},'%') OR cg.id_ = #{search}
+                <if test="groups != null">
+                    OR cg.music_group_id_ IN
+                    <foreach collection="groups" item="group" open="(" close=")" separator=",">
+                        #{group.id}
+                    </foreach>
+                </if>
+                )
+            </if>
+            <if test="groupType != null">
+                AND cg.group_type_=#{groupType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+            <if test="groupId != null">
+                AND cg.music_group_id_=#{groupId}
+            </if>
+            <if test="classGroupId != null">
+                AND cg.id_=#{classGroupId}
+            </if>
+        </where>
+    </sql>
+    <select id="superFindClassGroups" resultMap="SuperClassGroupInfo">
+        SELECT
+            *
+        FROM
+          class_group cg
+            <include refid="superFindClassGroupsCondition"/>
+            ORDER BY cg.create_time_ DESC
+        <include refid="global.limit"/>
     </select>
     <select id="superCountClassGroups" resultType="int">
-
+        SELECT
+          COUNT(id_)
+        FROM
+            class_group cg
+            <include refid="superFindClassGroupsCondition"/>
     </select>
 
 </mapper>

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

@@ -7,10 +7,10 @@ import com.ym.mec.biz.dal.dto.HighClassGroupDto;
 import com.ym.mec.biz.dal.dto.TestDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
-import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.SalarySettlementTypeEnum;
+import com.ym.mec.biz.dal.page.EndCourseScheduleQueryInfo;
 import com.ym.mec.biz.dal.page.queryMusicGroupCourseScheduleQueryInfo;
 import com.ym.mec.biz.service.ClassGroupService;
 import com.ym.mec.biz.service.ClassGroupTeacherMapperService;
@@ -294,4 +294,11 @@ public class ClassGroupController extends BaseController {
     public HttpResponseResult delClassNoStartCourse(Integer classGroupId) throws Exception {
         return succeed(classGroupService.delClassNoStartCourse(classGroupId));
     }
+
+    @ApiOperation(value = "终极班级信息获取")
+    @GetMapping("/superFindClassGroups")
+    @PreAuthorize("@pcs.hasPermissions('classGroup/superFindClassGroups')")
+    public HttpResponseResult superFindClassGroups(EndCourseScheduleQueryInfo queryInfo){
+        return succeed(classGroupService.endFindClassGroups(queryInfo));
+    }
 }

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

@@ -311,11 +311,10 @@ public class ExportController extends BaseController {
                 if (row.getNextPaymentDate() != null) {
                     row.setNextPaymentDateStr(DateUtil.format(row.getNextPaymentDate(), DateUtil.DEFAULT_PATTERN));
                 }
-                row.setCurrentGrade(row.getCurrentGrade() + row.getCurrentClass());
             }
-            String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级班级", "专业", "学员状态", "新增学员", "缴费金额",
+            String[] header = {"学员编号", "学员姓名", "性别", "联系电话", "年级","班级", "专业", "学员状态", "新增学员", "缴费金额",
                     "下次缴费日期", "报名缴费", "是否激活"};
-            String[] body = {"userId", "realName", "gender", "phone", "currentGrade", "subjectName", "studentStatus", "isNewStudentStr",
+            String[] body = {"userId", "realName", "gender", "phone", "currentGrade","currentClass", "subjectName", "studentStatus", "isNewStudentStr",
                     "courseFee", "nextPaymentDateStr", "paymentStatus", "activeName"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, musicGroupStudentsDtoPageInfo.getRows());
             response.setContentType("application/octet-stream");