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

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dao;
 
 
+import com.ym.mec.biz.dal.dto.ChildrenStatisticsDetailDto;
 import com.ym.mec.biz.dal.dto.ChildrenStatisticsDto;
 import com.ym.mec.biz.dal.entity.ChildrenDayReserve;
 import com.ym.mec.common.dal.BaseDAO;
@@ -11,9 +12,19 @@ import java.util.Map;
 
 public interface ChildrenDayReserveDao extends BaseDAO<Integer, ChildrenDayReserve> {
 
-    List<ChildrenStatisticsDto> queryChildrenStatistics(Map<String, Object> map);
+    /**
+     * 获取后台考级活动列表
+     * @param params
+     * @return
+     */
+    List<ChildrenStatisticsDto> queryChildrenStatistics(Map<String, Object> params);
 
-    Integer countChildrenStatistics(Map<String, Object> map);
+    /**
+     * 获取后台考级活动列表
+     * @param params
+     * @return
+     */
+    Integer countChildrenStatistics(Map<String, Object> params);
 
     /**
      * 根据用户id获取用户预约信息
@@ -21,4 +32,18 @@ public interface ChildrenDayReserveDao extends BaseDAO<Integer, ChildrenDayReser
      * @return
      */
     ChildrenDayReserve getByUserId(@Param("userId") Integer userId);
+
+    /**
+     * 获取后台考级活动详情列表
+     * @param params
+     * @return
+     */
+    int countChildrenStatisticsDetail(Map<String, Object> params);
+
+    /**
+     * 获取后台考级活动详情列表
+     * @param params
+     * @return
+     */
+    List<ChildrenStatisticsDetailDto> queryChildrenStatisticsDetail(Map<String, Object> params);
 }

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

@@ -0,0 +1,43 @@
+package com.ym.mec.biz.dal.dto;
+
+public class ChildrenStatisticsDetailDto {
+    private String username;
+
+    private String phone;
+
+    private Integer userId;
+
+    private boolean isReserve;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public boolean getIsReserve() {
+        return isReserve;
+    }
+
+    public void setIsReserve(boolean reserve) {
+        isReserve = reserve;
+    }
+}

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

@@ -10,6 +10,26 @@ public class ChildrenReserveQueryInfo extends QueryInfo {
 
     private String musicGroupId;
 
+    private Integer isReserve;
+
+    private Integer subjectId;
+
+    public Integer getIsReserve() {
+        return isReserve;
+    }
+
+    public void setIsReserve(Integer isReserve) {
+        this.isReserve = isReserve;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
     public String getOrganId() {
         return organId;
     }

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.service;
 
 
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.ChildrenStatisticsDetailDto;
 import com.ym.mec.biz.dal.dto.ChildrenStatisticsDto;
 import com.ym.mec.biz.dal.dto.DegreeFeeDto;
 import com.ym.mec.biz.dal.entity.ChildrenDayReserve;
@@ -37,4 +38,10 @@ public interface ChildrenDayReserveService extends BaseService<Integer, Children
      */
     DegreeFeeDto getFeeInfo(Integer organId);
 
+    /**
+     * 获取后台考级活动详情列表
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<ChildrenStatisticsDetailDto> queryStatisticsDetailPage(ChildrenReserveQueryInfo queryInfo);
 }

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.ChildrenStatisticsDetailDto;
 import com.ym.mec.biz.dal.dto.ChildrenStatisticsDto;
 import com.ym.mec.biz.dal.dao.OrganizationDegreeCourseFeeDao;
 import com.ym.mec.biz.dal.dto.DegreeFeeDto;
@@ -99,4 +100,24 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
         degreeFeeDto.setOrganizationDegreeCourseFee(courseFee);
         return degreeFeeDto;
     }
+
+    @Override
+    public PageInfo<ChildrenStatisticsDetailDto> queryStatisticsDetailPage(ChildrenReserveQueryInfo queryInfo) {
+        PageInfo<ChildrenStatisticsDetailDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<String, Object>();
+        MapUtil.populateMap(params, queryInfo);
+
+        List<ChildrenStatisticsDetailDto> dataList = null;
+        int count = childrenDayReserveDao.countChildrenStatisticsDetail(params);;
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = childrenDayReserveDao.queryChildrenStatisticsDetail(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
+        return pageInfo;
+    }
 }

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

@@ -99,6 +99,8 @@
         LEFT JOIN organization o ON o.id_ = cdr.organ_id_
         <include refid="queryChildrenStatisticsSql"/>
         GROUP BY cdr.music_group_id_
+        ORDER BY cdr.id_ DESC
+        <include refid="global.limit"/>
     </select>
     <select id="countChildrenStatistics" resultType="java.lang.Integer">
         SELECT COUNT(cdr.id_)
@@ -125,4 +127,34 @@
         FROM children_day_reserve
         WHERE user_id_ = #{userId}
     </select>
+
+    <resultMap id="ChildrenStatisticsDetailDtoMap" type="com.ym.mec.biz.dal.dto.ChildrenStatisticsDetailDto">
+        <result property="username" column="username_"/>
+        <result property="userId" column="user_id_"/>
+        <result property="isReserve" column="is_reserve_"/>
+        <result property="phone" column="phone_"/>
+    </resultMap>
+    <select id="countChildrenStatisticsDetail" resultType="java.lang.Integer">
+        SELECT COUNT(cdr.id_) FROM children_day_reserve cdr
+        LEFT JOIN sys_user su ON su.id_ = cdr.user_id_
+        <include refid="queryChildrenStatisticsDetailSql"/>
+    </select>
+    <select id="queryChildrenStatisticsDetail" resultMap="ChildrenStatisticsDetailDtoMap">
+        SELECT su.username_,su.phone_,cdr.user_id_,cdr.is_reserve_
+        FROM children_day_reserve cdr
+        LEFT JOIN sys_user su ON su.id_ = cdr.user_id_
+        <include refid="queryChildrenStatisticsDetailSql"/>
+        ORDER BY cdr.create_time_ DESC
+        <include refid="global.limit"/>
+    </select>
+    <sql id="queryChildrenStatisticsDetailSql">
+        <where>
+            <if test="search != null and search != ''">
+                AND (cdr.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
+            </if>
+            <if test="isReserve != null">
+                AND cdr.is_reserve_ = #{isReserve}
+            </if>
+        </where>
+    </sql>
 </mapper>

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

@@ -3,6 +3,7 @@ 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.ChildrenStatisticsDetailDto;
 import com.ym.mec.biz.dal.dto.ChildrenStatisticsDto;
 import com.ym.mec.biz.dal.entity.Employee;
 import com.ym.mec.biz.dal.page.ChildrenReserveQueryInfo;
@@ -35,7 +36,7 @@ public class ChildrenReserveController extends BaseController {
     @ApiOperation(value = "21年暑期考级活动统计页面")
     @GetMapping("/queryStatisticsPage")
     @PreAuthorize("@pcs.hasPermissions('childrenReserve/queryStatisticsPage')")
-    public HttpResponseResult<PageInfo<ChildrenStatisticsDto>> queryPage(ChildrenReserveQueryInfo queryInfo) {
+    public HttpResponseResult<PageInfo<ChildrenStatisticsDto>> queryStatisticsPage(ChildrenReserveQueryInfo queryInfo) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
             return failed("用户信息获取失败");
@@ -53,4 +54,11 @@ public class ChildrenReserveController extends BaseController {
         }
         return succeed(childrenDayReserveService.queryStatisticsPage(queryInfo));
     }
+
+    @ApiOperation(value = "21年暑期考级活动统计详情页面")
+    @GetMapping("/queryStatisticsDetailPage")
+    @PreAuthorize("@pcs.hasPermissions('childrenReserve/queryStatisticsDetailPage')")
+    public HttpResponseResult<PageInfo<ChildrenStatisticsDetailDto>> queryStatisticsDetailPage(ChildrenReserveQueryInfo queryInfo) {
+        return succeed(childrenDayReserveService.queryStatisticsDetailPage(queryInfo));
+    }
 }