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

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

@@ -143,6 +143,18 @@ 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;
     }

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

@@ -166,6 +166,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/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/DegreeRegistrationMapper.xml

@@ -88,7 +88,7 @@
             <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">
@@ -100,6 +100,9 @@
             <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>