Merge remote-tracking branch 'origin/children_day' into children_day

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/ChildrenDayReserveService.java
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/ChildrenDayReserveServiceImpl.java

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

@@ -1,12 +1,20 @@
 package com.ym.mec.biz.dal.dao;
 
 
+import com.ym.mec.biz.dal.dto.ChildrenStatisticsDto;
 import com.ym.mec.biz.dal.entity.ChildrenDayReserve;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 public interface ChildrenDayReserveDao extends BaseDAO<Integer, ChildrenDayReserve> {
 
+    List<ChildrenStatisticsDto> queryChildrenStatistics(Map<String, Object> map);
+
+    Integer countChildrenStatistics(Map<String, Object> map);
+
     /**
      * 根据用户id获取用户预约信息
      * @param userId

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

@@ -405,4 +405,6 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     MusicGroup getStudentLastMusicGroup(@Param("userId") Integer userId);
+
+    List<MusicGroup> findByCooperationId(@Param("cooperationId") Integer cooperationOrganId, @Param("musicStatus") String musicStatus);
 }

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

@@ -0,0 +1,126 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+public class ChildrenStatisticsDto {
+
+    private String organName;
+
+    private String cooperationOrganName;
+
+    private  String musicGroupName;
+
+    private  Integer normalNum;
+
+    private Integer reserveNum;
+
+    private Integer noReserveNum;
+
+    private Integer instrumentalMusicNum;
+
+    private Integer musicTheoryNum;
+
+    private Integer buyVipNum;
+
+    private BigDecimal buyVipAmount;
+
+    private Integer buyMusicTheoryNum;
+
+    private BigDecimal buyMusicTheoryAmount;
+
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
+    public String getCooperationOrganName() {
+        return cooperationOrganName;
+    }
+
+    public void setCooperationOrganName(String cooperationOrganName) {
+        this.cooperationOrganName = cooperationOrganName;
+    }
+
+    public String getMusicGroupName() {
+        return musicGroupName;
+    }
+
+    public void setMusicGroupName(String musicGroupName) {
+        this.musicGroupName = musicGroupName;
+    }
+
+    public Integer getNormalNum() {
+        return normalNum;
+    }
+
+    public void setNormalNum(Integer normalNum) {
+        this.normalNum = normalNum;
+    }
+
+    public Integer getReserveNum() {
+        return reserveNum;
+    }
+
+    public void setReserveNum(Integer reserveNum) {
+        this.reserveNum = reserveNum;
+    }
+
+    public Integer getNoReserveNum() {
+        return noReserveNum;
+    }
+
+    public void setNoReserveNum(Integer noReserveNum) {
+        this.noReserveNum = noReserveNum;
+    }
+
+    public Integer getInstrumentalMusicNum() {
+        return instrumentalMusicNum;
+    }
+
+    public void setInstrumentalMusicNum(Integer instrumentalMusicNum) {
+        this.instrumentalMusicNum = instrumentalMusicNum;
+    }
+
+    public Integer getMusicTheoryNum() {
+        return musicTheoryNum;
+    }
+
+    public void setMusicTheoryNum(Integer musicTheoryNum) {
+        this.musicTheoryNum = musicTheoryNum;
+    }
+
+    public Integer getBuyVipNum() {
+        return buyVipNum;
+    }
+
+    public void setBuyVipNum(Integer buyVipNum) {
+        this.buyVipNum = buyVipNum;
+    }
+
+    public BigDecimal getBuyVipAmount() {
+        return buyVipAmount;
+    }
+
+    public void setBuyVipAmount(BigDecimal buyVipAmount) {
+        this.buyVipAmount = buyVipAmount;
+    }
+
+    public Integer getBuyMusicTheoryNum() {
+        return buyMusicTheoryNum;
+    }
+
+    public void setBuyMusicTheoryNum(Integer buyMusicTheoryNum) {
+        this.buyMusicTheoryNum = buyMusicTheoryNum;
+    }
+
+    public BigDecimal getBuyMusicTheoryAmount() {
+        return buyMusicTheoryAmount;
+    }
+
+    public void setBuyMusicTheoryAmount(BigDecimal buyMusicTheoryAmount) {
+        this.buyMusicTheoryAmount = buyMusicTheoryAmount;
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class ChildrenReserveQueryInfo extends QueryInfo {
+
+    private String organId;
+
+    private Integer cooperationId;
+
+    private String musicGroupId;
+
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
+    public Integer getCooperationId() {
+        return cooperationId;
+    }
+
+    public void setCooperationId(Integer cooperationId) {
+        this.cooperationId = cooperationId;
+    }
+
+    public String getMusicGroupId() {
+        return musicGroupId;
+    }
+
+    public void setMusicGroupId(String musicGroupId) {
+        this.musicGroupId = musicGroupId;
+    }
+}

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

@@ -2,8 +2,11 @@ package com.ym.mec.biz.service;
 
 
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.ChildrenStatisticsDto;
 import com.ym.mec.biz.dal.dto.DegreeFeeDto;
 import com.ym.mec.biz.dal.entity.ChildrenDayReserve;
+import com.ym.mec.biz.dal.page.ChildrenReserveQueryInfo;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface ChildrenDayReserveService extends BaseService<Integer, ChildrenDayReserve> {
@@ -25,6 +28,7 @@ public interface ChildrenDayReserveService extends BaseService<Integer, Children
      */
     ChildrenDayReserve getUserReserve(Integer userId);
 
+    PageInfo<ChildrenStatisticsDto> queryStatisticsPage(ChildrenReserveQueryInfo queryInfo);
 
     /**
      * 获取活动的费用信息

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

@@ -365,4 +365,11 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
 	 * @return 关闭结果
 	 */
 	Boolean closeMusicGroup(CloseMusicGroupDto closeMusicGroupDto);
+
+	/**
+	 * 根据合作单位获取所有乐团列表
+	 * @param cooperationId
+	 * @return
+	 */
+	List<MusicGroup> findByCooperationId(Integer cooperationId);
 }

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

@@ -4,6 +4,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ChildrenDayReserveDao;
 import com.ym.mec.biz.dal.dao.DegreeLevelFeeDao;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
+import com.ym.mec.biz.dal.dto.ChildrenStatisticsDto;
 import com.ym.mec.biz.dal.dao.OrganizationDegreeCourseFeeDao;
 import com.ym.mec.biz.dal.dto.DegreeFeeDto;
 import com.ym.mec.biz.dal.entity.ChildrenDayReserve;
@@ -11,13 +12,21 @@ import com.ym.mec.biz.dal.entity.DegreeLevelFee;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.OrganizationDegreeCourseFee;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import com.ym.mec.biz.dal.page.ChildrenReserveQueryInfo;
 import com.ym.mec.biz.service.ChildrenDayReserveService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
+import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import java.util.List;
 
 @Service
@@ -62,6 +71,26 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
     }
 
     @Override
+    public PageInfo<ChildrenStatisticsDto> queryStatisticsPage(ChildrenReserveQueryInfo queryInfo) {
+        PageInfo<ChildrenStatisticsDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<ChildrenStatisticsDto> dataList = null;
+        int count = childrenDayReserveDao.countChildrenStatistics(params);;
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = childrenDayReserveDao.queryChildrenStatistics(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
+
+    @Override
     public DegreeFeeDto getFeeInfo(Integer organId) {
         List<DegreeLevelFee> degreeLevelFee = degreeLevelFeeDao.getAll();
         OrganizationDegreeCourseFee courseFee = organizationDegreeCourseFeeDao.getByOrganId(organId);
@@ -70,6 +99,4 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
         degreeFeeDto.setOrganizationDegreeCourseFee(courseFee);
         return degreeFeeDto;
     }
-
-
 }

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

@@ -123,9 +123,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     private CourseScheduleTeacherSalaryDao courseScheduleTeacherSalaryDao;
 
     @Autowired
-    private CourseScheduleStudentPaymentDao courseScheduleStudentPaymentDao;
-
-    @Autowired
     private CourseScheduleStudentPaymentService courseScheduleStudentPaymentService;
 
     @Autowired
@@ -3013,4 +3010,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         return true;
     }
 
+    @Override
+    public List<MusicGroup> findByCooperationId(Integer cooperationId) {
+        return musicGroupDao.findByCooperationId(cooperationId,"PROGRESS");
+    }
+
 }

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

@@ -72,6 +72,51 @@
         SELECT COUNT(*)
         FROM children_day_reserve
     </select>
+    <resultMap id="ChildrenStatisticsDtoMap" type="com.ym.mec.biz.dal.dto.ChildrenStatisticsDto">
+        <result property="buyMusicTheoryAmount" column="buy_music_theory_amount_"/>
+        <result property="buyMusicTheoryNum" column="buy_music_theory_num_"/>
+        <result property="buyVipAmount" column="buy_vip_amount_"/>
+        <result property="buyVipNum" column="buy_vip_num_"/>
+        <result property="cooperationOrganName" column="cooperation_organ_name_"/>
+        <result property="instrumentalMusicNum" column="instrumental_music_num_"/>
+        <result property="musicGroupName" column="music_group_name_"/>
+        <result property="musicTheoryNum" column="music_theory_num_"/>
+        <result property="noReserveNum" column="no_reserve_num_"/>
+        <result property="normalNum" column="normal_num_"/>
+        <result property="organName" column="organ_name_"/>
+        <result property="reserveNum" column="reserve_num_"/>
+    </resultMap>
+    <select id="queryChildrenStatistics" resultMap="ChildrenStatisticsDtoMap">
+        SELECT o.name_ organ_name_,co.name_ cooperation_organ_name_,mg.name_ music_group_name_,COUNT(sr.user_id_) normal_num_,
+               COUNT(CASE WHEN cdr.is_reserve_ = 1 THEN 1 ELSE NULL END) 'reserve_num_',
+               COUNT(CASE WHEN cdr.is_reserve_ = 0 THEN 1 ELSE NULL END) 'no_reserve_num_'
+        FROM children_day_reserve cdr
+                 LEFT JOIN music_group mg ON mg.id_ = cdr.music_group_id_
+                 LEFT JOIN student_registration sr ON sr.music_group_id_ = cdr.music_group_id_ AND sr.music_group_status_ = 'NORMAL'
+                 LEFT JOIN cooperation_organ co ON co.id_ = cdr.cooperation_organ_id_
+                 LEFT JOIN organization o ON o.id_ = cdr.organ_id_
+        <include refid="queryChildrenStatisticsSql"/>
+        GROUP BY cdr.music_group_id_
+    </select>
+    <select id="countChildrenStatistics" resultType="java.lang.Integer">
+        SELECT COUNT(cdr.id_)
+        FROM children_day_reserve cdr
+        <include refid="queryChildrenStatisticsSql"/>
+        GROUP BY cdr.music_group_id_
+    </select>
+    <sql id="queryChildrenStatisticsSql">
+        <where>
+            <if test="cooperationId != null">
+                AND cdr.cooperation_organ_id_ = #{cooperationId}
+            </if>
+            <if test="musicGroupId != null and musicGroupId != ''">
+                AND cdr.music_group_id_ = #{musicGroupId}
+            </if>
+            <if test="organId != null">
+                AND FIND_IN_SET(cdr.organ_id_,#{organId})
+            </if>
+        </where>
+    </sql>
 
     <select id="getByUserId" resultMap="ChildrenDayReserve">
         SELECT *

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

@@ -739,6 +739,12 @@
         </foreach>
         AND mg.educational_teacher_id_ IS NOT NULL
     </select>
+    <select id="findByCooperationId" resultMap="MusicGroup">
+        SELECT * FROM music_group WHERE cooperation_organ_id_ = #{cooperationId}
+        <if test="musicStatus != null">
+            AND status_ = #{musicStatus}
+        </if>
+    </select>
 
     <select id="getStudentLastMusicGroup" resultMap="MusicGroup">
         SELECT mg.*

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

@@ -0,0 +1,56 @@
+package com.ym.mec.web.controller;
+
+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.dto.ChildrenStatisticsDto;
+import com.ym.mec.biz.dal.entity.Employee;
+import com.ym.mec.biz.dal.page.ChildrenReserveQueryInfo;
+import com.ym.mec.biz.service.ChildrenDayReserveService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RequestMapping("childrenReserve")
+@Api(tags = "儿童节活动")
+@RestController
+public class ChildrenReserveController extends BaseController {
+
+    @Autowired
+    private ChildrenDayReserveService childrenDayReserveService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private EmployeeDao employeeDao;
+
+    @ApiOperation(value = "21年暑期考级活动统计页面")
+    @GetMapping("/queryStatisticsPage")
+    @PreAuthorize("@pcs.hasPermissions('childrenReserve/queryStatisticsPage')")
+    public HttpResponseResult<PageInfo<ChildrenStatisticsDto>> queryPage(ChildrenReserveQueryInfo queryInfo) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed("用户信息获取失败");
+        }
+        Employee employee = employeeDao.get(sysUser.getId());
+        if (StringUtils.isEmpty(queryInfo.getOrganId())) {
+            queryInfo.setOrganId(employee.getOrganIdList());
+        }else if(StringUtils.isEmpty(employee.getOrganIdList())){
+            return failed("用户所在分部异常");
+        }else {
+            List<String> list = Arrays.asList(employee.getOrganIdList().split(","));
+            if(!list.containsAll(Arrays.asList(queryInfo.getOrganId().split(",")))){
+                return failed("非法请求");
+            }
+        }
+        return succeed(childrenDayReserveService.queryStatisticsPage(queryInfo));
+    }
+}

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

@@ -331,4 +331,12 @@ public class MusicGroupController extends BaseController {
 		return succeed(organizationService.getGradeList(musicGroup.getOrganId()));
 	}
 
+	@ApiOperation(value = "根据合作单位获取所有乐团列表")
+	@GetMapping("/findByCooperationId")
+	@PreAuthorize("@pcs.hasPermissions('musicGroup/findByCooperationId')")
+	@ApiImplicitParams({@ApiImplicitParam(name = "cooperationId", value = "合作单位", required = true, dataType = "Integer")})
+	public HttpResponseResult<List<MusicGroup>> findByCooperationId(Integer cooperationId) {
+		return succeed(musicGroupService.findByCooperationId(cooperationId));
+	}
+
 }