Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/controller/LeagueMembersManageController.java

@@ -246,15 +246,15 @@ public class LeagueMembersManageController {
         return RT.ok(leagueMembersManageService.deleteRubAndHand(ids));
     }
 
-//    @PostMapping("/league-members-import-template")
+    @PostMapping("/league-members-template-download")
+    @ApiOperation(value = "团员信息导入模板下载")
+    @XjrLog(value = "团员信息导入模板下载")
+    public ResponseEntity<byte[]> leagueMembersTemplateDownload() throws IOException {
+//    @GetMapping("/league-members-import-template")
 //    @ApiOperation(value = "团员信息导入模板下载")
 //    @XjrLog(value = "团员信息导入模板下载")
 //    public ResponseEntity<byte[]> leagueMembersImportTemplate() throws IOException {
-    @GetMapping("/league-members-import-template")
-    @ApiOperation(value = "团员信息导入模板下载")
-    @XjrLog(value = "团员信息导入模板下载")
-    public ResponseEntity<byte[]> leagueMembersImportTemplate() throws IOException {
-        ByteArrayOutputStream bot = leagueMembersManageService.leagueMembersImportTemplate();
+        ByteArrayOutputStream bot = leagueMembersManageService.leagueMembersTemplateDownload();
 
         String fileName = "团员信息导入模板";
         fileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8);
@@ -272,14 +272,14 @@ public class LeagueMembersManageController {
         return RT.ok("全部成功", true);
     }
 
-//    @PostMapping("/league-members-export-query")
-//    @ApiOperation(value = "团员信息条件导出")
-//    @XjrLog(value = "团员信息条件导出")
-//    public ResponseEntity<byte[]> leagueMembersExportQuery(@Valid @RequestBody LeagueMembersExportQueryListDto dto) {
-    @GetMapping("/league-members-export-query")
+    @PostMapping("/league-members-export-query")
     @ApiOperation(value = "团员信息条件导出")
     @XjrLog(value = "团员信息条件导出")
-    public ResponseEntity<byte[]> leagueMembersExportQuery(@Valid LeagueMembersExportQueryDto dto) throws IOException {
+    public ResponseEntity<byte[]> leagueMembersExportQuery(@Valid @RequestBody LeagueMembersExportQueryDto dto) throws IOException {
+//    @GetMapping("/league-members-export-query")
+//    @ApiOperation(value = "团员信息条件导出")
+//    @XjrLog(value = "团员信息条件导出")
+//    public ResponseEntity<byte[]> leagueMembersExportQuery(@Valid LeagueMembersExportQueryDto dto) throws IOException {
         ByteArrayOutputStream bot = leagueMembersManageService.textbookSubscriptionExportQuery(dto);
 
         String fileName = "团员信息列表";

src/main/java/com/xjrsoft/module/student/service/ILeagueMembersManageService.java

@@ -25,7 +25,7 @@ public interface ILeagueMembersManageService extends MPJBaseService<LeagueMember
 
     Boolean deleteRubAndHand(List<Long> ids);
 
-    ByteArrayOutputStream leagueMembersImportTemplate() throws IOException;
+    ByteArrayOutputStream leagueMembersTemplateDownload() throws IOException;
 
     String leagueMembersImport(MultipartFile file) throws IOException, IllegalAccessException;
 

src/main/java/com/xjrsoft/module/student/service/impl/LeagueMembersManageServiceImpl.java

@@ -99,7 +99,7 @@ public class LeagueMembersManageServiceImpl extends MPJBaseServiceImpl<LeagueMem
     }
 
     @Override
-    public ByteArrayOutputStream leagueMembersImportTemplate() throws IOException {
+    public ByteArrayOutputStream leagueMembersTemplateDownload() throws IOException {
         // 开始写入
         Workbook workbook = new XSSFWorkbook();
         // 创建一个工作表(sheet)