考级报名列表、导出

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

@@ -106,11 +106,6 @@ public class DegreeQueryInfo extends QueryInfo {
      */
     private Date updateTime;
 
-    /**
-     * 0-未支付 1-支付中 2-支付中
-     */
-    private Integer status;
-
 
     @ApiModelProperty(value = "开始日期（不包含时分秒）",required = false)
     private String startTime;
@@ -118,6 +113,9 @@ public class DegreeQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "结束日期",required = false)
     private String endTime;
 
+    @ApiModelProperty(value = "状态 reg-报名 pay-已缴费",required = false)
+    private String status;
+
 
     public Integer getId() {
         return id;
@@ -231,14 +229,6 @@ public class DegreeQueryInfo extends QueryInfo {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public String getLevel() {
         return level;
     }
@@ -278,4 +268,12 @@ public class DegreeQueryInfo extends QueryInfo {
     public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }

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

@@ -39,8 +39,11 @@
 
     <sql id="queryPageSql">
         <where>
-            <if test="status != null">
-                AND status_= #{status}
+            <if test="status != null and status=='reg'">
+                <![CDATA[AND status_ <= 1]]>
+            </if>
+            <if test="status != null and status=='pay'">
+                AND status_ = 2
             </if>
             <if test="id != null">
                 AND id_ = #{id}

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

@@ -1586,7 +1586,7 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
             for (DegreeRegistration row : pageList.getRows()) {
-                if(row.getGender().equals(1)){
+                if(row.getGender().equals("1")){
                     row.setGender("男");
                 } else {
                     row.setGender("女");