From f8b251573040d2762507909a02f274a6cf4d751c Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: 星期四, 23 一月 2025 14:40:27 +0800
Subject: [PATCH] 特种作业非煤缴费版本优化
---
exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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..8d11c9a 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) {
@@ -146,14 +147,14 @@
*/
@PostMapping("/editNonCoalStu")
@ApiOperation(value = "修改非煤缴费学员")
- public AjaxResult editNonCoalStu(@RequestBody NonCoalPayStudent nonCoalPayStudent) {
+ public AjaxResult editNonCoalStu(@Validated @RequestBody NonCoalPayStudent nonCoalPayStudent) {
return toAjax(nonCoalPayStudentService.updateNonCoalPayStudent(nonCoalPayStudent));
}
/**
* 删除【请填写功能名称】
*/
- @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);
@@ -191,4 +194,16 @@
}
+ @PostMapping("/sendOrder")
+ @ApiOperation(value = "生成财政订单")
+ @Anonymous
+ @RepeatSubmit
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", dataTypeClass = Long.class, value = "个人缴费学员数据id,团队缴费数据id", required = true),
+ @ApiImplicitParam(name = "payType", dataTypeClass = String.class, value = "1个人2是团队", required = true),
+ })
+ public AjaxResult sendOrder(@RequestParam("id") Long id, @RequestParam("payType") String payType) {
+ return success(nonCoalPayStudentService.sendOrder(id, payType));
+ }
+
}
--
Gitblit v1.9.2