Merge remote-tracking branch 'origin/feature/0406-degree' into feature/0406-degree

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

@@ -1,24 +1,62 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.DegreeRegistration;
+import com.ym.mec.auth.api.enums.CertificateTypeEnum;
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
 
 @Data
-public class DegreeRegistrationActivityDto extends DegreeRegistration {
+public class DegreeRegistrationActivityDto {
+    @ApiModelProperty(value = "考级编号",required = true)
+    private Long degreeId;
+
+    @ApiModelProperty(value = "学员编号",required = true)
+    private Integer userId;
+
+    @ApiModelProperty(value = "名字",required = true)
+    private String name;
+
+    @ApiModelProperty(value = "性别",required = true)
+    private String gender;
+
+    @ApiModelProperty(value = "证件类型",required = true)
+    private CertificateTypeEnum certificateType;
+
+    @ApiModelProperty(value = "身份证号",required = true)
+    private String idcard;
+
+    @ApiModelProperty(value = "城市",required = true)
+    private String city;
+
+    @ApiModelProperty(value = "学校",required = true)
+    private String school;
+
+    @ApiModelProperty(value = "声部",required = true)
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "证书",required = true)
+    private String theoryCert;
+
+    @ApiModelProperty(value = "家长联系电话",required = true)
+    private String mobile;
+
+    @ApiModelProperty(value = "学员分部",required = true)
+    private Integer organId;
 
     @ApiModelProperty(value = "用户考级报名基本信息",required = true)
     private List<DegreeRegistrationDto> degreeRegistrationDtos;
 
-    @ApiModelProperty(value = "课程信息",required = true)
-    private Map<CourseSchedule.CourseScheduleType, Integer> additionCourseInfo;
-
+    @ApiModelProperty(value = "总金额",required = true)
     private BigDecimal price;
-    
+
+    @ApiModelProperty(value = "是否余额支付",required = true)
     private boolean isUseBalance;
+
+    @ApiModelProperty(value = "是否重新支付",required = false)
+    private Boolean isRepay = false;
+
+    private Integer tenantId = TenantContextHolder.getTenantId();
 }

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

@@ -18,9 +18,6 @@ public class DegreeRegistrationDto{
     @ApiModelProperty(value = "乐理级别证书",required = false)
     private String theoryCert;
 
-    @ApiModelProperty(value = "考级费用",required = false)
-    private BigDecimal money;
-
     @ApiModelProperty(value = "1乐器考级、2乐理考级",required = false)
     private DegreeTypeEnum type;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/DegreeRegistration.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.auth.api.enums.CertificateTypeEnum;
 import com.ym.mec.biz.dal.enums.DegreeTypeEnum;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,7 +34,7 @@ public class DegreeRegistration {
     private String gender;
 
     @ApiModelProperty(value = "证件类型",required = true)
-	private String certificateType;
+	private CertificateTypeEnum certificateType;
 
     @ApiModelProperty(value = "身份证号",required = true)
     private String idcard;
@@ -47,6 +48,8 @@ public class DegreeRegistration {
     @ApiModelProperty(value = "声部",required = true)
     private Integer subjectId;
 
+    private String subjectName;
+
     @ApiModelProperty(value = "考试级别",required = true)
     private String level;
 
@@ -80,8 +83,6 @@ public class DegreeRegistration {
 
     private Integer organId;
 
-//    private String activityTag;
-
     private String vipTeacherName;
 
     private String normalTeacherName;

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.enums.DegreeTypeEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -66,6 +67,12 @@ public class DegreeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "乐器", required = true)
     private String subject;
 
+    @ApiModelProperty(value = "声部", required = true)
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "考级类型",required = true)
+    private DegreeTypeEnum type;
+
     /**
      * 考试级别
      */
@@ -136,6 +143,34 @@ public class DegreeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "0-未支付 1-支付中 2-已支付 2-已退费",required = false)
     private Integer status;
 
+
+    @ApiModelProperty(value = "考级管理ID",required = false)
+    private Integer degreeId;
+
+    public Integer getDegreeId() {
+        return degreeId;
+    }
+
+    public void setDegreeId(Integer degreeId) {
+        this.degreeId = degreeId;
+    }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public DegreeTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(DegreeTypeEnum type) {
+        this.type = type;
+    }
+
     public String getDegreeType() {
         return degreeType;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeNewsWrapper.java

@@ -36,7 +36,7 @@ public class DegreeNewsWrapper {
         @ApiModelProperty("关键字匹配")
 		private String keyword;
 
-        private String organId;
+        private Integer organId;
 
         @ApiModelProperty("用户所在分部")
         private String defaultOrganId;

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/DegreeWrapper.java

@@ -181,6 +181,9 @@ public class DegreeWrapper {
         @ApiModelProperty("报名人次")
         private Integer registerTotal;
 
+        @ApiModelProperty("报名人数")
+        private Integer registerNum;
+
         @ApiModelProperty("购课人次")
         private Integer purchaseCourse;
 

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

@@ -140,6 +140,10 @@ public class DegreeLevelFeeServiceImpl extends ServiceImpl<DegreeLevelFeeMapper,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void batchSave(List<DegreeLevelFeeNew> degreeLevelFees) {
+        long count = degreeLevelFees.stream().map(e -> e.getLevel()).count();
+        if(count > 1){
+            throw new BizException("请勿录入重复的报考级别");
+        }
         DegreeLevelFeeNew degreeLevelFeeNew = degreeLevelFees.get(0);
         String levels = degreeLevelFees.stream().map(e -> e.getLevel().toString()).collect(Collectors.joining(","));
         this.check(degreeLevelFeeNew.getSubjectId(),degreeLevelFeeNew.getDegreeType(),levels,null);

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

@@ -23,12 +23,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
@@ -55,6 +55,9 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
     @Autowired
     private DegreeService degreeService;
 
+    @Autowired
+    private SubjectService subjectService;
+
     @Override
     public BaseDAO<Integer, DegreeRegistration> getDAO() {
         return degreeRegistrationDao;
@@ -81,7 +84,6 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         }
         Date nowDate = new Date();
         String orderNo = idGeneratorService.generatorId("payment") + "";
-        degreeRegistration.setOrderNo(orderNo);
         //获取收费项价格
         BigDecimal money = BigDecimal.ZERO;
         List<DegreeRegistrationDto> registrationDtos = degreeRegistration.getDegreeRegistrationDtos();
@@ -90,28 +92,35 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             DegreeRegistration degree = new DegreeRegistration();
             BeanUtils.copyProperties(degreeRegistration,degree);
             String level = registrationDto.getLevel();
+            degree.setOrderNo(orderNo);
             degree.setLevel(level);
             degree.setDegreeId(registrationDto.getDegreeId());
-            degree.setMoney(registrationDto.getMoney());
             degree.setTheoryCert(registrationDto.getTheoryCert());
             degree.setType(registrationDto.getType());
             degree.setStatus(1);
-            DegreeLevelFeeNew one = degreeLevelFeeService.lambdaQuery()
-                    .eq(DegreeLevelFeeNew::getSubjectId, degreeRegistration.getSubjectId())
-                    .eq(DegreeLevelFeeNew::getDegreeType, degreeRegistration.getType())
-                    .eq(DegreeLevelFeeNew::getLevel, degreeRegistration.getLevel()).one();
+            DegreeLevelFeeNew one;
+            if(registrationDto.getType() == DegreeTypeEnum.THEORY){
+                one = degreeLevelFeeService.lambdaQuery()
+                        .eq(DegreeLevelFeeNew::getDegreeType, registrationDto.getType())
+                        .eq(DegreeLevelFeeNew::getLevel, registrationDto.getLevel()).one();
+            }else {
+                one = degreeLevelFeeService.lambdaQuery()
+                        .eq(DegreeLevelFeeNew::getSubjectId, degreeRegistration.getSubjectId())
+                        .eq(DegreeLevelFeeNew::getDegreeType, registrationDto.getType())
+                        .eq(DegreeLevelFeeNew::getLevel, registrationDto.getLevel()).one();
+            }
             if(Objects.isNull(one)){
                 throw new BizException("该级别已不可报名");
             }
             degree.setMoney(one.getFee());
+            money = money.add(one.getFee());
             degreeRegistrationList.add(degree);
         }
-        degreeRegistrationDao.batchInsert(degreeRegistrationList);
-
         if(money.compareTo(degreeRegistration.getPrice())!=0){
             throw new BizException("商品价格不符");
         }
-        
+        degreeRegistrationDao.batchInsert(degreeRegistrationList);
+
         Integer userId = degreeRegistration.getUserId();
         String channelType = "";
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
@@ -145,11 +154,7 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
             studentPaymentOrder.setBalancePaymentAmount(BigDecimal.ZERO);
         }
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
-        studentPaymentOrder.setClassGroupId(degreeRegistration.getId());
-        String collect = degreeRegistrationList.stream().map(e -> e.getDegreeId().toString()).collect(Collectors.joining(","));
-        if(StringUtils.isNotEmpty(collect)){
-            studentPaymentOrder.setMusicGroupId(collect);
-        }
+        studentPaymentOrder.setMusicGroupId(degreeRegistration.getDegreeId().toString());
         studentPaymentOrder.setOrganId(degreeRegistration.getOrganId());
         studentPaymentOrder.setRoutingOrganId(degreeRegistration.getOrganId());
         studentPaymentOrderService.insert(studentPaymentOrder);
@@ -262,6 +267,24 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                 degreeRegistration.setVipTeacherName(vipTeacherMapper.get(degreeRegistration.getUserId()));
                 degreeRegistration.setNormalTeacherName(teacherMapper.get(degreeRegistration.getUserId()));
             }
+            // 设置声部
+            Set<Integer> subjectIdSet = dataList.stream().map(o -> o.getSubjectId()).filter(Objects::nonNull).collect(Collectors.toSet());
+
+            List<Subject> subjectList = subjectService.findBySubjectByIdList(new ArrayList<>(subjectIdSet));
+
+            // id 分组
+            Map<Integer, Subject> subjectMap = subjectList.stream().collect(Collectors.toMap(Subject::getId, Function.identity()));
+            for (DegreeRegistration degreeRegistration : dataList) {
+                if (degreeRegistration.getSubjectId() == null) {
+                    continue;
+                }
+                Subject subject = subjectMap.get(degreeRegistration.getSubjectId());
+                if (subject != null) {
+                    degreeRegistration.setSubjectName(subject.getName());
+                }
+            }
+
+
             DegreeRegistration degree = degreeRegistrationDao.getTotalAmount(params);
             pageInfo.setApplyNum(degreeRegistrationDao.countApplyNum(params));
             pageInfo.setTotalAmount(degree.getMoney());

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

@@ -167,6 +167,7 @@ public class DegreeServiceImpl extends ServiceImpl<DegreeMapper, Degree> impleme
         statistical.setActualAmount(BigDecimal.ZERO);
         statistical.setDegreeIncome(BigDecimal.ZERO);
         statistical.setCourseIncome(BigDecimal.ZERO);
+        statistical.setRegisterNum(degree.getRegisterNum());
 
         // 查询考级报名的订单
         List<DegreeRegistration> registrations = degreeRegistrationDao.selectByDegreeId(id);

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

@@ -16,10 +16,10 @@
 				AND dn.status_ = #{param.status}
 			</if>
 			<if test="param.organId != null">
-				AND (FIND_IN_SET(param.organId,dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')
+				AND (FIND_IN_SET(#{param.organId},dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')
 			</if>
 			<if test="param.organId == null and param.defaultOrganId != null and param.defaultOrganId != ''">
-				AND (INTE_ARRAY(param.defaultOrganId,dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')
+				AND (INTE_ARRAY(#{param.defaultOrganId},dn.organ_ids_) OR dn.organ_ids_ IS NULL OR dn.organ_ids_ = '')
 			</if>
 		</where>
 		group by dn.id_

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

@@ -24,9 +24,8 @@
         <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
         <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="status_" jdbcType="TINYINT" property="status"/>
-        <result column="certificate_type_" property="certificateType"/>
+        <result column="certificate_type_" property="certificateType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 		<result column="tenant_id_" property="tenantId" />
-		<result column="type_" property="type" />
 		<result column="type_" property="type"  typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
@@ -49,6 +48,9 @@
             <if test="organId != null and organId != ''">
                 AND FIND_IN_SET(organ_id_,#{organId})
             </if>
+            <if test="type != null">
+                AND type_ = #{type}
+            </if>
             <if test="status != null">
                 AND status_ = #{status}
             </if>
@@ -58,9 +60,6 @@
             <if test="id != null">
                 AND id_ = #{id}
             </if>
-            <if test="search != null and search != ''">
-                AND (id_ = #{search} OR name_ LIKE CONCAT('%',#{search},'%') )
-            </if>
             <if test="orderNo != null">
                 AND order_no_ = #{orderNo}
             </if>
@@ -80,12 +79,16 @@
                 AND city_ LIKE CONCAT('%', #{city},'%')
             </if>
             <if test="subject != null">
-                AND subject_= #{subject}
+                AND subject_ = #{subject}
+            </if>
+
+            <if test="subjectId != null">
+                AND subject_id_= #{subjectId}
             </if>
             <if test="mobile != null">
                 AND mobile_= #{mobile}
             </if>
-            <if test="level != null">
+            <if test="level != null and level != ''">
                 AND level_= #{level}
             </if>
             <if test="startTime != null">
@@ -94,6 +97,12 @@
             <if test="endTime != null">
                 <![CDATA[AND DATE_FORMAT(create_time_,"%Y-%m-%d") <= #{endTime}]]>
             </if>
+            <if test="search != null and search != ''">
+                and (user_id_ like concat('%',#{search},'%') or name_ like CONCAT('%',#{search},'%') or mobile_ like CONCAT('%',#{search},'%') )
+            </if>
+            <if test="degreeId != null ">
+                and degree_id_ = #{degreeId}
+            </if>
         </where>
     </sql>
 
@@ -134,20 +143,19 @@
         insert into degree_registration (user_id_,degree_id_,organ_id_,order_no_, name_, gender_,
         idcard_, city_, school_,
         subject_id_,level_, theory_cert_,mobile_,
-        money_, memo_, create_time_,
-        update_time_, status_,certificate_type_,tenant_id_,type_)
+        money_, memo_,status_,certificate_type_,tenant_id_,type_)
         values (#{userId},#{degreeId},#{organId,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=VARCHAR},
         #{idcard,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{school,jdbcType=VARCHAR},
         #{subjectId},#{level,jdbcType=VARCHAR},
         #{theoryCert,jdbcType=VARCHAR},#{mobile,jdbcType=VARCHAR},#{money,jdbcType=DECIMAL}, #{memo,jdbcType=VARCHAR},
-        #{createTime}, #{updateTime}, #{status,jdbcType=TINYINT},#{certificateType},#{tenantId},#{type})
+        #{status,jdbcType=TINYINT},#{certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                #{tenantId},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
     </insert>
     <insert id="batchInsert">
         INSERT INTO degree_registration (user_id_,degree_id_,organ_id_,order_no_, name_, gender_,
         idcard_, city_, school_,
         subject_id_,level_, theory_cert_,mobile_,
-        money_, memo_, create_time_,
-        update_time_, status_,certificate_type_,tenant_id_,type_)
+        money_, memo_,status_,certificate_type_,tenant_id_,type_)
         VALUE
         <foreach collection="degreeRegistrationList" separator="," item="degreeRegistration">
             (#{degreeRegistration.userId},#{degreeRegistration.degreeId,jdbcType=INTEGER},#{degreeRegistration.organId,jdbcType=INTEGER},
@@ -155,8 +163,9 @@
             #{degreeRegistration.idcard,jdbcType=VARCHAR}, #{degreeRegistration.city,jdbcType=VARCHAR}, #{degreeRegistration.school,jdbcType=VARCHAR},
             #{degreeRegistration.subjectId},#{degreeRegistration.level,jdbcType=VARCHAR},
             #{degreeRegistration.theoryCert,jdbcType=VARCHAR},#{degreeRegistration.mobile,jdbcType=VARCHAR},#{degreeRegistration.money,jdbcType=DECIMAL}, #{degreeRegistration.memo,jdbcType=VARCHAR},
-            #{degreeRegistration.createTime}, #{degreeRegistration.updateTime}, #{degreeRegistration.status,jdbcType=TINYINT},
-            #{degreeRegistration.certificateType},#{degreeRegistration.tenantId},#{degreeRegistration.type})
+            #{degreeRegistration.status,jdbcType=TINYINT},
+            #{degreeRegistration.certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            #{degreeRegistration.tenantId},#{degreeRegistration.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
         </foreach>
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.DegreeRegistration">
@@ -211,16 +220,12 @@
             <if test="memo != null">
                 memo_ = #{memo,jdbcType=VARCHAR},
             </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
             <if test="status != null">
                 status_ = #{status,jdbcType=INTEGER},
             </if>
             <if test="certificateType != null">
-                certificate_type_ = #{certificateType},
+                certificate_type_ = #{certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-                update_time_ = NOW()
         </set>
         where id_ = #{id,jdbcType=INTEGER} and tenant_id_ = #{tenantId}
     </update>
@@ -277,16 +282,12 @@
                 <if test="degree.memo != null">
                     memo_ = #{degree.memo,jdbcType=VARCHAR},
                 </if>
-                <if test="degree.createTime != null">
-                    create_time_ = #{degree.createTime},
-                </if>
                 <if test="degree.status != null">
                     status_ = #{degree.status,jdbcType=INTEGER},
                 </if>
 	            <if test="degree.certificateType != null">
-	                certificate_type_ = #{degree.certificateType},
+	                certificate_type_ = #{degree.certificateType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 	            </if>
-                    update_time_ = NOW()
             </set>
             where id_ = #{degree.id,jdbcType=INTEGER} and tenant_id_ = #{degree.tenantId}
         </foreach>
@@ -334,4 +335,11 @@
     <select id="findByByOrderId" resultMap="DegreeRegistration">
         SELECT * FROM degree_registration WHERE order_no_ = #{orderNo}
     </select>
+
+    <select id="selectByDegreeId" resultMap="DegreeRegistration">
+        SELECT *
+        FROM degree_registration
+        WHERE degree_id_ = #{degreeId}
+          AND status_ = 1
+    </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/degree/DegreeNewsController.java

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.entity.DegreeNews;
 import com.ym.mec.biz.dal.vo.DegreeNewsVo;
 import com.ym.mec.biz.dal.wrapper.DegreeNewsWrapper;
 import com.ym.mec.biz.service.DegreeNewsService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
@@ -30,22 +31,21 @@ public class DegreeNewsController extends BaseController {
 
     @Autowired
     private DegreeNewsService degreeNewsService;
+    @Autowired
+    private SysUserService sysUserService;
 
 	@ApiOperation(value = "详情", notes = "考级资讯表-根据详情ID查询单条, 传入id")
     @GetMapping("/detail/{id}")
     public HttpResponseResult<DegreeNews> detail(@PathVariable("id") Long id) {
-    
     	DegreeNews wrapper = degreeNewsService.detail(id);
-        
         return succeed(wrapper);
 	}
     
     @ApiOperation(value = "查询分页", notes = "考级资讯表- 传入 DegreeNewsWrapper.DegreeNewsQuery") 
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<DegreeNewsVo>> page(@RequestBody DegreeNewsWrapper.DegreeNewsQuery query) {
-        
+        query.setOrganId(sysUserService.getUser().getOrganId());
         IPage<DegreeNewsVo> pages = degreeNewsService.selectPage(QueryInfo.getPage(query), query);
-
         return succeed(QueryInfo.pageInfo(pages));
 	}