考级报名列表、导出

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

@@ -112,6 +112,13 @@ public class DegreeQueryInfo extends QueryInfo {
     private Integer status;
 
 
+    @ApiModelProperty(value = "开始日期（不包含时分秒）",required = false)
+    private String startTime;
+
+    @ApiModelProperty(value = "结束日期",required = false)
+    private String endTime;
+
+
     public Integer getId() {
         return id;
     }
@@ -255,4 +262,20 @@ public class DegreeQueryInfo extends QueryInfo {
     public void setTheoryCert(String theoryCert) {
         this.theoryCert = theoryCert;
     }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 }

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

@@ -63,15 +63,18 @@
             <if test="subject != null">
                 AND subject_= #{subject}
             </if>
-            <if test="subject != null">
-                AND subject_= #{subject}
-            </if>
             <if test="mobile != null">
                 AND mobile_= #{mobile}
             </if>
             <if test="level != null">
                 AND level_= #{level}
             </if>
+            <if test="startTime != null">
+                AND createTime >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                <![CDATA[AND createTime <= #{endTime}]]>
+            </if>
         </where>
     </sql>
 

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

@@ -26,7 +26,6 @@ public class DegreeController extends BaseController { ;
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('degree/queryPage')")
     public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
-        queryInfo.setStatus(2);
         queryInfo.setSort("create_time_");
         queryInfo.setOrder("DESC");
         return succeed(degreeRegistrationService.getPageList(queryInfo));

mec-web/src/main/java/com/ym/mec/web/controller/education/EduDegreeController.java

@@ -1,59 +1,28 @@
 package com.ym.mec.web.controller.education;
 
-
-import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
-import com.ym.mec.biz.dal.dao.SporadicChargeInfoDao;
-import com.ym.mec.biz.dal.entity.DegreeRegistration;
-import com.ym.mec.biz.dal.entity.SporadicChargeInfo;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.dal.enums.SporadicChargeTypeEnum;
 import com.ym.mec.biz.dal.page.DegreeQueryInfo;
-import com.ym.mec.biz.dal.page.SporadicChargeInfoQueryInfo;
 import com.ym.mec.biz.service.DegreeRegistrationService;
-import com.ym.mec.biz.service.SporadicChargeInfoService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
-import com.ym.mec.util.idcard.IdcardValidator;
-import com.ym.mec.util.validator.CommonValidator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 @RequestMapping("eduDegree")
 @Api(tags = "教务端考级报名服务")
 @RestController
 public class EduDegreeController extends BaseController {
 
     @Autowired
-    private StudentPaymentOrderService studentPaymentOrderService;
-
-    @Autowired
-    private DegreeRegistrationDao degreeRegistrationDao;
-
-    @Autowired
     private DegreeRegistrationService degreeRegistrationService;
 
-    @Autowired
-    private SporadicChargeInfoDao sporadicChargeInfoDao;
-
-    @Autowired
-    private SporadicChargeInfoService sporadicChargeInfoService;
-
 
     @ApiOperation(value = "查询收费列表")
     @GetMapping("/queryPage")
     public HttpResponseResult queryPage(DegreeQueryInfo queryInfo) {
-        queryInfo.setStatus(2);
         queryInfo.setSort("create_time_");
         queryInfo.setOrder("DESC");
         return succeed(degreeRegistrationService.getPageList(queryInfo));