From 56c9cd32e5728799118562c1ce0fe25fd7caaadb Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期三, 22 一月 2025 10:38:59 +0800
Subject: [PATCH] 特种作业非煤缴费版本导入优化

---
 exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java b/exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java
index 94161ca..86139f4 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java
@@ -2,6 +2,7 @@
 
 import com.gkhy.exam.pay.dto.rep.NonCoalPayPageRepDto;
 import com.gkhy.exam.pay.dto.req.NonCoalPayReqDto;
+import com.gkhy.exam.pay.dto.req.NonCoalPayStuImport;
 import com.gkhy.exam.pay.dto.req.NonCoalPayStudentReqDto;
 import com.gkhy.exam.pay.dto.req.NonCoalPayTypeEditReqDto;
 import com.gkhy.exam.pay.entity.NonCoalPay;
@@ -124,7 +125,7 @@
     /**
      * 删除非煤缴费管理
      */
-    @DeleteMapping("/id")
+    @DeleteMapping("/{id}")
     @ApiOperation(value = "删除非煤缴费管理")
     @ApiImplicitParam(name = "id", dataTypeClass = Long.class, value = "id", required = true)
     public AjaxResult remove(@PathVariable Long id) {
@@ -153,7 +154,7 @@
     /**
      * 删除【请填写功能名称】
      */
-    @DeleteMapping("/delNonCalStu/id")
+    @DeleteMapping("/delNonCalStu/{id}")
     @ApiOperation(value = "删除非煤缴费学员")
     @ApiImplicitParam(name = "id", dataTypeClass = Long.class, value = "id", required = true)
     public AjaxResult delNonCalStu(@PathVariable Long id) {
@@ -162,9 +163,11 @@
 
 
     @PostMapping("/stuImportData")
+    @ApiOperation(value = "导入学员")
+    @ApiImplicitParam(name = "nonCoalPayId", dataTypeClass = Long.class, value = "nonCoalPayId", required = true)
     public AjaxResult importData(MultipartFile file, Long nonCoalPayId) throws Exception {
-        ExcelUtil<NonCoalPayStudent> util = new ExcelUtil<NonCoalPayStudent>(NonCoalPayStudent.class);
-        List<NonCoalPayStudent> nonCoalPayStudents = util.importExcel(file.getInputStream());
+        ExcelUtil<NonCoalPayStuImport> util = new ExcelUtil<NonCoalPayStuImport>(NonCoalPayStuImport.class);
+        List<NonCoalPayStuImport> nonCoalPayStudents = util.importExcel(file.getInputStream());
         String operName = getUsername();
         String message = nonCoalPayStudentService.importData(nonCoalPayStudents, operName, nonCoalPayId);
         return success(message);

--
Gitblit v1.9.2