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

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

@@ -100,7 +100,7 @@ create_time_ = #{createTime},
 	<select id="getOrganIdByUserId" resultType="java.lang.Integer">
 		select organ_id_ from sys_user where id_=#{userId}
 	</select>
-	<select id="createCourseScheduleByDemoGroupId" parameterType="com.ym.mec.biz.dal.entity.DemoGroup" resultMap="com.ym.mec.biz.dal.entity.CourseSchedule.CourseSchedule">
+	<select id="createCourseScheduleByDemoGroupId" parameterType="com.ym.mec.biz.dal.entity.DemoGroup" resultMap="com.ym.mec.biz.dal.dao.CourseScheduleDao.CourseSchedule">
 		SELECT
 			dgcgm.class_group_id_ class_group_id_,
 			'NOT_START' status_,

mec-education/src/main/java/com/ym/mec/education/base/BaseQuery.java

@@ -0,0 +1,20 @@
+package com.ym.mec.education.base;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 21:50
+ */
+@Data
+public class BaseQuery implements Serializable {
+
+    @ApiModelProperty(value = "起始页",required = false)
+    private Integer pageNo = 1;
+
+    @ApiModelProperty(value = "每页显示记录数",required = false)
+    private Integer pageSize = 10;
+}

mec-education/src/main/java/com/ym/mec/education/base/PageResponse.java

@@ -1,7 +1,8 @@
 package com.ym.mec.education.base;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ym.mec.education.enums.ReturnCodeEnum;
 import org.apache.commons.lang3.StringUtils;
-
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
@@ -32,6 +33,15 @@ public class PageResponse<T> extends Response implements Serializable {
         this.isAsc = true;
     }
 
+    public static PageResponse success(IPage page) {
+        PageResponse pageResponse = new PageResponse(Math.toIntExact(page.getCurrent()), Math.toIntExact(page.getSize()));
+        pageResponse.setReturnCode(ReturnCodeEnum.CODE_1000.getCode());
+        pageResponse.setMessage(ReturnCodeEnum.CODE_1000.getValue());
+        pageResponse.setRecords(page.getRecords());
+        pageResponse.setTotal(Math.toIntExact(page.getTotal()));
+        return pageResponse;
+    }
+
     public PageResponse(Integer current, Integer size) {
         this(current, size, true);
     }
@@ -165,4 +175,4 @@ public class PageResponse<T> extends Response implements Serializable {
         return pg.append(" }").toString();
     }
 
-}
+}

mec-education/src/main/java/com/ym/mec/education/controller/MusicGroupController.java

@@ -3,16 +3,27 @@ package com.ym.mec.education.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.collect.Lists;
 import com.netflix.hystrix.contrib.javanica.annotation.DefaultProperties;
 import com.ym.mec.education.base.BaseResponse;
 import com.ym.mec.education.base.PageResponse;
+import com.ym.mec.education.entity.ClassGroup;
+import com.ym.mec.education.entity.ClassGroupTeacherMapper;
 import com.ym.mec.education.entity.MusicGroup;
+import com.ym.mec.education.enums.ReturnCodeEnum;
+import com.ym.mec.education.req.MusicGroupReq;
+import com.ym.mec.education.resp.MusicGroupResp;
+import com.ym.mec.education.service.IClassGroupService;
+import com.ym.mec.education.service.IClassGroupTeacherMapperService;
 import com.ym.mec.education.service.IMusicGroupService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.context.annotation.Bean;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 
 /**
@@ -29,6 +40,12 @@ public class MusicGroupController {
 
     @Autowired
     private IMusicGroupService musicGroupService;
+
+    @Autowired
+    private IClassGroupService classGroupService;
+
+    @Autowired
+    private IClassGroupTeacherMapperService classGroupTeacherMapperService;
     /**
      * 服务降级处理
      *
@@ -41,12 +58,45 @@ public class MusicGroupController {
         return response;
     }
 
-    @GetMapping(value = "/groupList")
-    public PageResponse groupList(){
+    @PostMapping(value = "/groupList")
+    public PageResponse groupList(@RequestBody MusicGroupReq req){
         PageResponse response = new PageResponse();
         IPage page = new Page();
         QueryWrapper<MusicGroup> queryWrapper = new QueryWrapper<>();
         IPage<MusicGroup> queryPage =  musicGroupService.page(page,queryWrapper);
+        if(queryPage.getRecords() == null && queryPage.getRecords().isEmpty()){
+            response.setReturnCode(ReturnCodeEnum.CODE_1005.getCode());
+            return response;
+        }
+
+        List<MusicGroup> musicGroupList  = queryPage.getRecords();
+        List<MusicGroupResp> musicGroupResps = Lists.newArrayList();
+        musicGroupList.forEach(g ->{
+            MusicGroupResp musicGroupResp = new MusicGroupResp();
+            BeanUtils.copyProperties(g,musicGroupResp);
+            QueryWrapper<ClassGroup> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("music_group_id_",g.getId());
+            List<ClassGroup> classGroups = classGroupService.list(queryWrapper1);
+            if(!CollectionUtils.isEmpty(classGroups)){
+                int studNum = classGroups.stream().mapToInt(ClassGroup::getStudentNum).sum();
+                musicGroupResp.setStudentNum(studNum);
+            }
+
+            QueryWrapper<ClassGroupTeacherMapper> queryWrapper2 = new QueryWrapper<>();
+            queryWrapper2.eq("music_group_id_",g.getId());
+            List<ClassGroupTeacherMapper> classGroupTeacherMappers = classGroupTeacherMapperService.list(queryWrapper2);
+
+            if(!CollectionUtils.isEmpty(classGroupTeacherMappers)){
+                int teachNum = classGroupTeacherMappers.size();
+                musicGroupResp.setStudentNum(teachNum);
+            }
+            musicGroupResps.add(musicGroupResp);
+        });
+        int count = musicGroupService.count(queryWrapper);
+        response.setRecords(musicGroupResps);
+        response.setReturnCode(ReturnCodeEnum.CODE_1000.getCode());
+        response.setMessage(ReturnCodeEnum.CODE_1000.getValue());
+        response.setTotal(count);
         return  response;
     }
 }

mec-education/src/main/java/com/ym/mec/education/controller/StudentAttendanceController.java

@@ -0,0 +1,44 @@
+package com.ym.mec.education.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ym.mec.education.base.PageResponse;
+import com.ym.mec.education.entity.StudentAttendance;
+import com.ym.mec.education.req.StudentAttendanceReq;
+import com.ym.mec.education.service.IStudentAttendanceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.Objects;
+
+/**
+ * @program: mec
+ * @description: 考勤记录
+ * @author: xw
+ * @create: 2019-09-25 21:22
+ */
+@RestController
+@RequestMapping("api/studentAttendance")
+@Slf4j
+public class StudentAttendanceController {
+
+    @Autowired
+    private IStudentAttendanceService studentAttendanceService;
+
+    @PostMapping("/page")
+    public PageResponse page(@RequestBody StudentAttendanceReq studentAttendanceReq) {
+        Page<StudentAttendance> page = new Page(studentAttendanceReq.getPageNo(), studentAttendanceReq.getPageSize());
+        QueryWrapper<StudentAttendance> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(Objects.nonNull(studentAttendanceReq.getMusicGroupId()),
+                StudentAttendance::getMusicGroupId, studentAttendanceReq.getMusicGroupId())
+                .eq(Objects.nonNull(studentAttendanceReq.getClassGroupId()),
+                        StudentAttendance::getClassGroupId, studentAttendanceReq.getClassGroupId());
+        IPage<StudentAttendance> pageResult = studentAttendanceService.page(page, queryWrapper);
+        return PageResponse.success(pageResult);
+    }
+
+}

mec-education/src/main/java/com/ym/mec/education/enums/ReturnCodeEnum.java

@@ -0,0 +1,43 @@
+package com.ym.mec.education.enums;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 21:15
+ */
+public enum ReturnCodeEnum {
+    CODE_1000(1000, "message.common.success"),
+    CODE_1001(1001, "message.security.unauthorized"),
+    CODE_1002(1002, "message.common.information.nonexistence"),
+    CODE_1003(1003, "message.payment.type.error"),
+    CODE_1004(1004, "message.common.server.error"),
+    CODE_1005(1005, "message.common.failed"),
+    CODE_1006(1006, "message.common.parameters.missing"),
+    CODE_1007(1007, "message.common.timeout"),
+    CODE_1008(1008, "message.common.information.already.exists"),
+    CODE_1009(1009, "message.common.session.expired"),
+    CODE_1010(1010, "message.security.authfailed"),
+    CODE_1011(1011, "message.app.sign.authfailed");
+
+    private Integer code;
+    private String value;
+
+    private ReturnCodeEnum(Integer code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public final Integer getCode() {
+        return this.code;
+    }
+
+    public final String getValue() {
+        return this.value;
+    }
+
+
+    @Override
+    public String toString() {
+        return this.code + "=" + this.value;
+    }
+}

mec-education/src/main/java/com/ym/mec/education/mapper/ClassGroupMapper.java

@@ -1,6 +1,6 @@
 package com.ym.mec.education.mapper;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.ClassGroup;
 
 /**

mec-education/src/main/java/com/ym/mec/education/mapper/ClassGroupTeacherMapperMapper.java

@@ -1,6 +1,6 @@
 package com.ym.mec.education.mapper;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.ClassGroupTeacherMapper;
 
 /**

mec-education/src/main/java/com/ym/mec/education/mapper/StudentAttendanceMapper.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.StudentAttendance;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/req/MusicGroupReq.java

@@ -0,0 +1,16 @@
+package com.ym.mec.education.req;
+
+import com.ym.mec.education.base.BaseQuery;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 20:59
+ */
+@Data
+public class MusicGroupReq extends BaseQuery {
+
+    private String name;
+}

mec-education/src/main/java/com/ym/mec/education/resp/MusicGroupResp.java

@@ -0,0 +1,96 @@
+package com.ym.mec.education.resp;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author : chengp
+ * @version V1.0
+ * @Description: TODO
+ * @date Date : 2019年09月25日 21:36
+ */
+@Data
+public class MusicGroupResp implements Serializable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+    /**
+     * 乐团名称
+     */
+    private String name;
+    /**
+     * 所属分部
+     */
+    private Integer organId;
+    /**
+     * 学校(合作单位)
+     */
+    private Integer schoolId;
+    /**
+     * 报名截止日期
+     */
+    private Date applyExpireDate;
+    /**
+     * 运营主管
+     */
+    private Integer teamTeacherId;
+    /**
+     * 教务老师
+     */
+    private Integer educationalTeacherId;
+    /**
+     * 收费类型
+     */
+    private Integer chargeTypeId;
+    /**
+     * 课程形态
+     */
+    private String courseForm;
+    private Date createTime;
+    private Date updateTime;
+    /**
+     * 状态（报名中、缴费中、筹备中、进行中、取消）
+     */
+    private String status;
+    /**
+     * 计费开始日期
+     */
+    private Date billStartDate;
+    /**
+     * 提高课班级数
+     */
+    private Integer improventClassesNum;
+    /**
+     * 招生年级（多个用|分开）
+     */
+    private String enrollClasses;
+    /**
+     * 缴费截止时间
+     */
+    private Date paymentExpireDate;
+    /**
+     * 是否是加课
+     */
+    private String isExtraClass;
+    /**
+     * 合作单位编号
+     */
+    private Integer cooperationOrganId;
+    /**
+     * 启蒙课日期
+     */
+    private Date enlightenmentCourseTime;
+    /**
+     * 家长会日期
+     */
+    private Date parentMeetingTime;
+
+    private Integer studentNum;
+
+    private Integer teacherNum;
+
+}

mec-education/src/main/java/com/ym/mec/education/service/IClassGroupService.java

@@ -1,6 +1,6 @@
 package com.ym.mec.education.service;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.ClassGroup;
 
 /**

mec-education/src/main/java/com/ym/mec/education/service/IClassGroupTeacherMapperService.java

@@ -1,6 +1,6 @@
 package com.ym.mec.education.service;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.ClassGroupTeacherMapper;
 
 /**

mec-education/src/main/java/com/ym/mec/education/service/IStudentAttendanceService.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.StudentAttendance;
-import com.baomidou.mybatisplus.service.IService;
 
 /**
  * <p>

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

@@ -1,6 +1,6 @@
 package com.ym.mec.education.service.impl;
 
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.ClassGroup;
 import com.ym.mec.education.mapper.ClassGroupMapper;
 import com.ym.mec.education.service.IClassGroupService;

mec-education/src/main/java/com/ym/mec/education/service/impl/ClassGroupTeacherMapperServiceImpl.java

@@ -1,6 +1,6 @@
 package com.ym.mec.education.service.impl;
 
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.ClassGroupTeacherMapper;
 import com.ym.mec.education.mapper.ClassGroupTeacherMapperMapper;
 import com.ym.mec.education.service.IClassGroupTeacherMapperService;

mec-education/src/main/java/com/ym/mec/education/service/impl/StudentAttendanceServiceImpl.java

@@ -1,9 +1,9 @@
 package com.ym.mec.education.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.StudentAttendance;
 import com.ym.mec.education.mapper.StudentAttendanceMapper;
 import com.ym.mec.education.service.IStudentAttendanceService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**