考级报名考级列表增加过滤关闭的

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

@@ -78,7 +78,7 @@ public class DegreeRegistration {
     /**
      * 考级费用
      */
-    @ApiModelProperty(value = "收费标准",required = false)
+    @ApiModelProperty(value = "考级费用",required = false)
     private BigDecimal money;
 
     /**

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

@@ -0,0 +1,39 @@
+package com.ym.mec.web.controller;
+
+
+import com.ym.mec.biz.dal.dao.DegreeRegistrationDao;
+import com.ym.mec.biz.dal.dao.SporadicChargeInfoDao;
+import com.ym.mec.biz.dal.page.DegreeQueryInfo;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RequestMapping("degree")
+@Api(tags = "考级报名服务")
+@RestController
+public class DegreeController extends BaseController { ;
+
+    @Autowired
+    private DegreeRegistrationService degreeRegistrationService;
+
+
+    @ApiOperation(value = "查询收费列表")
+    @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/ExportController.java

@@ -84,6 +84,8 @@ public class ExportController extends BaseController {
     private TeacherAttendanceService teacherAttendanceService;
     @Autowired
     private TeacherCourseRewardService teacherCourseRewardService;
+    @Autowired
+    private DegreeRegistrationService degreeRegistrationService;
 
     @ApiOperation(value = "导出教师考勤列表")
     @PostMapping("export/queryTeacherAttendances")
@@ -1565,4 +1567,52 @@ public class ExportController extends BaseController {
         }
     }
 
+
+    @ApiOperation(value = "考级报名导出")
+    @RequestMapping("export/degreeRegistration")
+    @PreAuthorize("@pcs.hasPermissions('export/degreeRegistration')")
+    public void queryPage(DegreeQueryInfo queryInfo,HttpServletResponse response) throws IOException {
+        queryInfo.setStatus(2);
+        queryInfo.setSort("create_time_");
+        queryInfo.setOrder("ASC");
+        queryInfo.setRows(65000);
+        PageInfoDegree<DegreeRegistration> pageList = degreeRegistrationService.getPageList(queryInfo);
+        if (pageList.getTotal() <= 0) {
+            response.setStatus(500);
+            response.setContentType("Content-Type: application/json;charset=UTF-8");
+            response.getOutputStream().write("{\"data\": null, \"code\": 500, \"status\": false, \"msg\": \"没有可导出的记录\"}".getBytes());
+            response.flushBuffer();
+            return;
+        }
+        OutputStream outputStream = response.getOutputStream();
+        try {
+            for (DegreeRegistration row : pageList.getRows()) {
+                if(row.getGender().equals(1)){
+                    row.setGender("男");
+                } else {
+                    row.setGender("女");
+                }
+            }
+
+            String[] header = {"名字", "性别", "身份证号", "城市", "学校", "乐器", "考试级别", "乐理级别", "乐理级别证书", "家长联系电话", "考级费用", "乐理费用", "备注"};
+            String[] body = {"name", "gender", "idcard", "city", "school", "subject", "level", "theoryLevel", "theoryCert", "mobile", "money", "theoryMoney", "memo"};
+            HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList.getRows());
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
+            response.flushBuffer();
+            outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (outputStream != null) {
+                try {
+                    outputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 }

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

@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Map;
 
 @RequestMapping("eduDegree")
-@Api(tags = "级报名服务")
+@Api(tags = "教务端考级报名服务")
 @RestController
 public class EduDegreeController extends BaseController {