Merge branch 'master' into yonge

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java
#	mec-education/src/main/java/com/ym/mec/education/controller/CourseScheduleController.java
#	mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupCategoryController.java

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/enums/SysUserType.java

@@ -6,7 +6,7 @@ import com.ym.mec.common.enums.BaseEnum;
 
 public enum SysUserType implements BaseEnum<String, SysUserType> {
 
-	STUDENT("学生"), EDU_TEACHER("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置"), ADMIN("管理员");
+	STUDENT("学生"), EDUCATION("教务老师"), TEACHER("指导老师"), SYSTEM("系统內置"), ADMIN("管理员");
 
 	private String desc;
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -278,13 +278,13 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
 
     /**
      * @param month:
-     * @param organId:
+     * @param organIdList:
      * @return java.util.List<java.util.Date>
      * @describe 获取当月有课的日期
      * @author Joburgess
      * @date 2019/10/18
      */
-    List<Date> getCourseScheduleDate(@Param("month") Date month, @Param("organId") Long organId);
+    List<Date> getCourseScheduleDate(@Param("month") Date month, @Param("organIdList") String organIdList);
 
     /**
      * @Author: Joburgess

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.OrderStatisDto;
 import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
 import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.dto.UserGoodsDto;
@@ -28,8 +29,8 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      */
     List<Goods> queryApplyGoodsList(@Param("musicGroupId") String musicGroupId, @Param("type") OrderDetailTypeEnum type);
 
-	List<StudentPaymentOrder> queryByCondition(@Param("groupType") GroupType groupType, @Param("musicGroupId") String musicGroupId,
-			@Param("userId") Integer userId, @Param("status") DealStatusEnum status, @Param("type") OrderTypeEnum type);
+    List<StudentPaymentOrder> queryByCondition(@Param("groupType") GroupType groupType, @Param("musicGroupId") String musicGroupId,
+                                               @Param("userId") Integer userId, @Param("status") DealStatusEnum status, @Param("type") OrderTypeEnum type);
 
     /**
      * @Author: Joburgess
@@ -57,7 +58,7 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * 根据学生vip课获取非失败缴费订单
      */
     List<StudentPaymentOrder> findNotFailedOrderByStudentVipGroup(@Param("vipGroupId") Long vipGroupId,
-                                                            @Param("userId") Integer userId);
+                                                                  @Param("userId") Integer userId);
 
     /**
      * @param musicGroupId: 乐团编号/vip课编号
@@ -188,15 +189,19 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
 
     /**
      * 获取零星收费订单列表
+     *
      * @param queryInfo
      * @return
      */
-    List<SporadicChargeInfoDto> sporadicQueryPage( Map<String, Object> queryInfo);
+    List<SporadicChargeInfoDto> sporadicQueryPage(Map<String, Object> queryInfo);
 
     /**
      * COUNT零星收费订单列表
+     *
      * @param params
      * @return
      */
     int countSporadicPage(Map<String, Object> params);
+
+    List<OrderStatisDto> getLuckStatis();
 }

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

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public class LuckStatisDto {
+    private List<OrderStatisDto> orderStatisDtoList;
+    private Integer totalNum;
+    private BigDecimal totalMoney;
+
+    public List<OrderStatisDto> getOrderStatisDtoList() {
+        return orderStatisDtoList;
+    }
+
+    public void setOrderStatisDtoList(List<OrderStatisDto> orderStatisDtoList) {
+        this.orderStatisDtoList = orderStatisDtoList;
+    }
+
+    public Integer getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(Integer totalNum) {
+        this.totalNum = totalNum;
+    }
+
+    public BigDecimal getTotalMoney() {
+        return totalMoney;
+    }
+
+    public void setTotalMoney(BigDecimal totalMoney) {
+        this.totalMoney = totalMoney;
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+public class OrderStatisDto {
+    private String organName;
+    private Integer nums;
+    private BigDecimal money;
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public Integer getNums() {
+        return nums;
+    }
+
+    public void setNums(Integer nums) {
+        this.nums = nums;
+    }
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+}

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

@@ -12,7 +12,7 @@ import java.util.Date;
 public class CourseScheduleQueryInfo extends QueryInfo {
 
     @ApiModelProperty(value = "部门编号")
-    private Long organId;
+    private String organIdList;
 
     @ApiModelProperty(value = "上课日期")
     private Date date;
@@ -50,12 +50,12 @@ public class CourseScheduleQueryInfo extends QueryInfo {
         this.classGroupId = classGroupId;
     }
 
-    public Long getOrganId() {
-        return organId;
+    public String getOrganIdList() {
+        return organIdList;
     }
 
-    public void setOrganId(Long organId) {
-        this.organId = organId;
+    public void setOrganIdList(String organIdList) {
+        this.organIdList = organIdList;
     }
 
     public Date getDate() {

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

@@ -167,7 +167,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	 * @return java.util.List<java.util.Date>
 	 * @describe 获取
 	 */
-	List<Date> getCourseScheduleDates(Date month);
+	List<Date> getCourseScheduleDates(Date month, String organIdList);
 
 	/**
 	 * @describe 课程调整

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

@@ -304,9 +304,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     @Override
-    public List<Date> getCourseScheduleDates(Date month) {
-//        return courseScheduleDao.getCourseScheduleDate(month, Long.parseLong(user.getOrganId()));
-        return null;
+    public List<Date> getCourseScheduleDates(Date month, String organIdList) {
+        return courseScheduleDao.getCourseScheduleDate(month, Long.parseLong(user.getOrganId()));
     }
 
     @Override
@@ -350,10 +349,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
     @Override
     public PageInfo getCourseSchedulesWithDateByEdu(CourseScheduleQueryInfo queryInfo) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (null == user) {
-            throw new BizException("请登录");
-        }
 //        queryInfo.setOrganId(Long.parseLong(user.getOrganId()));
         PageInfo pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
 

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

@@ -454,7 +454,7 @@
             LEFT JOIN teacher_attendance ta ON cs.id_=ta.class_group_id_ AND ta.teacher_id_=cs.teacher_id_
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND mg.organ_id_ = #{organId}
+        AND FIND_IN_SET(mg.organ_id_,#{organIdList})
         AND cs.id_ IS NOT NULL AND cg.group_type_ = 'MUSIC'
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
         <include refid="global.limit"/>
@@ -469,7 +469,7 @@
         LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND mg.organ_id_ = #{organId}
+        AND FIND_IN_SET(mg.organ_id_,#{organIdList})
         AND cs.id_ IS NOT NULL AND cg.group_type_ = 'MUSIC'
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
     </select>
@@ -769,7 +769,7 @@
         LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
         WHERE
         (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
-        AND mg.organ_id_ = #{organId} AND cs.id_ IS NOT NULL
+        AND FIND_IN_SET(mg.organ_id_,#{organIdList}) AND cs.id_ IS NOT NULL
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>

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

@@ -489,4 +489,14 @@
             AND spo.status_ = #{payStatus}
         </if>
     </sql>
+
+    <resultMap id="luckStatis" type="com.ym.mec.biz.dal.dto.OrderStatisDto">
+        <result property="organName" column="organName"/>
+        <result property="nums" column="nums"/>
+        <result property="money" column="money"/>
+    </resultMap>
+    <select id="getLuckStatis" resultMap="luckStatis">
+        SELECT o.name_ organName, SUM(spo.actual_amount_) money ,COUNT(spo.id_) nums FROM student_payment_order spo LEFT JOIN organization o ON o.id_=spo.organ_id_
+        WHERE spo.type_='LUCK' AND spo.status_='SUCCESS' GROUP BY spo.organ_id_ ORDER BY spo.organ_id_
+    </select>
 </mapper>

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

@@ -299,7 +299,7 @@
             LEFT JOIN sys_user su ON t.id_ = su.id_
         WHERE
             FIND_IN_SET(#{subjectIds},t.subject_id_)
-            AND INTE_ARRAY ( CONCAT(t.organ_id_,',',t.flow_organ_range_), #{organIds} )
+            AND INTE_ARRAY ( CONCAT( t.organ_id_, IF(t.flow_organ_range_ IS NULL,'',CONCAT(',', t.flow_organ_range_)) ), #{organIds} )
     </select>
     <select id="findByTeacherId" resultMap="TeacherBasicDto">
         SELECT

mec-common/common-core/src/main/java/com/ym/mec/common/page/PageInfo.java

@@ -8,6 +8,7 @@
 package com.ym.mec.common.page;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -130,6 +131,7 @@ public class PageInfo<T> implements Serializable {
 
 	public void setTotal(int total) {
 		this.total = total;
+		this.totalPage=new BigDecimal(total).divide(new BigDecimal(limit),0,BigDecimal.ROUND_CEILING).intValue();
 	}
 
 	public List<T> getRows() {

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

@@ -4,7 +4,6 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.page.CourseScheduleQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.education.base.BaseResponse;
@@ -15,14 +14,12 @@ import com.ym.mec.education.resp.CourseScheduleResp;
 import com.ym.mec.education.service.ICourseScheduleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
@@ -70,22 +67,12 @@ public class CourseScheduleController {
         return courseScheduleService.courseInfo(courseScheduleReq);
     }
 
-    @ApiOperation(value = "根据月份获取乐团在该月有课的日期")
-    @GetMapping("/getCourseScheduleDateByMonth")
-    public Object getCourseScheduleDateByMonth(Date month) {
+    public Object getCourseScheduleDateByMonth(@ApiParam(value = "月份", required = true) @RequestParam Date month) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (null == user) {
             throw new BizException("请登录");
         }
-        return BaseResponse.success(scheduleService.getCourseScheduleDates(month));
-    }
-
-    @ApiOperation(value = "根据日期获取当日排课")
-    @GetMapping("/getCourseSchedulesWithDate")
-    public Object getCourseSchedulesWithDate(CourseScheduleQueryInfo queryInfo) {
-        return BaseResponse.success(scheduleService.getCourseSchedulesWithDateByEdu(queryInfo));
-    }
-
+	}
     @ApiOperation(value = "课时调整")
     @PostMapping(value = "/classStartDateAdjust")
     public Object classStartDateAdjust(ClassDateAdjustDto classDateAdjustDto){

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -1,6 +1,8 @@
 package com.ym.mec.student.controller;
 
 import com.ym.mec.biz.dal.dao.SysConfigDao;
+import com.ym.mec.biz.dal.dto.LuckStatisDto;
+import com.ym.mec.biz.dal.dto.OrderStatisDto;
 import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
 import com.ym.mec.biz.service.*;
 import io.swagger.annotations.Api;
@@ -292,4 +294,20 @@ public class StudentOrderController extends BaseController {
             e.printStackTrace();
         }
     }
+
+    @GetMapping("/getLuckStatis")
+    public HttpResponseResult getLuckStatis(){
+        List<OrderStatisDto> orders = studentPaymentOrderDao.getLuckStatis();
+        BigDecimal totalMoney = BigDecimal.ZERO;
+        Integer totalNum = 0;
+        for (OrderStatisDto order : orders) {
+            totalMoney = totalMoney.add(order.getMoney());
+            totalNum += order.getNums();
+        }
+        LuckStatisDto luckStatisDto = new LuckStatisDto();
+        luckStatisDto.setOrderStatisDtoList(orders);
+        luckStatisDto.setTotalNum(totalNum);
+        luckStatisDto.setTotalMoney(totalMoney);
+        return succeed(luckStatisDto);
+    }
 }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -58,7 +58,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @ApiOperation(value = "根据日期获取当日排课")
     @GetMapping("/getCourseSchedulesWithDate")
     public Object getCourseSchedulesWithDate(@ApiParam(value = "日期", required = true) Date date,
-                                             @ApiParam(value = "课程类型",required = false) String type){
+                                             @ApiParam(value = "课程类型") String type){
         if(Objects.isNull(date)){
             return failed("请指定日期!");
         }

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupCategoryController.java

@@ -57,7 +57,7 @@ public class VipGroupCategoryController extends BaseController {
 				organId += "," + teacher.getFlowOrganRange();
 			}
 		}
-		return succeed(vipGroupCategoryService.findAllByOrgan(organId));
+		return succeed(vipGroupCategoryService.findAllByOrgan(user.getOrganId().toString()));
 	}
 
 	@ApiOperation("新增")

mec-web/src/main/java/com/ym/mec/web/controller/education/EducationCourseScheduleController.java

@@ -0,0 +1,71 @@
+package com.ym.mec.web.controller.education;
+
+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.page.CourseScheduleQueryInfo;
+import com.ym.mec.biz.service.CourseScheduleService;
+import com.ym.mec.biz.service.SysConfigService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.exception.BizException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * @Author Joburgess
+ * @Date 2020/1/8
+ */
+
+@RestController
+@RequestMapping("educationCourseSchedule")
+@Api(tags = "教务端课程计划服务")
+public class EducationCourseScheduleController extends BaseController {
+
+    @Autowired
+    private CourseScheduleService scheduleService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private SysConfigService sysConfigService;
+    @Autowired
+    private EmployeeDao employeeDao;
+
+    @ApiOperation(value = "根据月份获取乐团在该月有课的日期")
+    @GetMapping("/getCourseScheduleDateByMonth")
+    public Object getCourseScheduleDateByMonth(@ApiParam(value = "月份", required = true) @RequestParam Date month) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (null == user) {
+            throw new BizException("请登录");
+        }
+        Employee employee = employeeDao.get(user.getId());
+        if(Objects.isNull(employee)){
+            throw new BizException("员工信息不存在");
+        }
+        return succeed(scheduleService.getCourseScheduleDates(month,employee.getOrganIdList()));
+    }
+
+    @ApiOperation(value = "根据日期获取当日排课")
+    @GetMapping("/getCourseSchedulesWithDate")
+    public Object getCourseSchedulesWithDate(CourseScheduleQueryInfo queryInfo) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (null == user) {
+            throw new BizException("请登录");
+        }
+        Employee employee = employeeDao.get(user.getId());
+        if(Objects.isNull(employee)){
+            throw new BizException("员工信息不存在");
+        }
+        queryInfo.setOrganIdList(employee.getOrganIdList());
+        return succeed(scheduleService.getCourseSchedulesWithDateByEdu(queryInfo));
+    }
+}