Merge branch 'zx_saas_2022_degree' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -133,8 +133,8 @@ public class DegreeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "结束日期",required = false)
     private String endTime;
 
-    @ApiModelProperty(value = "状态 reg-报名 pay-已缴费",required = false)
-    private String status;
+    @ApiModelProperty(value = "0-未支付 1-支付中 2-已支付 2-已退费",required = false)
+    private Integer status;
 
     public String getDegreeType() {
         return degreeType;
@@ -296,11 +296,11 @@ public class DegreeQueryInfo extends QueryInfo {
         this.endTime = endTime;
     }
 
-    public String getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 

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

@@ -50,11 +50,8 @@
             <if test="organId != null">
                 AND FIND_IN_SET(organ_id_,#{organId})
             </if>
-            <if test="status != null and status=='reg'">
-                AND <![CDATA[status_ <= 1]]>
-            </if>
-            <if test="status != null and status=='pay'">
-                AND status_ = 2
+            <if test="status != null">
+                AND status_ = #{status}
             </if>
             <if test="degreeType != null">
                 AND degree_type_ = #{degreeType}