From 960ddab080d2434277bb75c188e2f7380856997e Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Fri, 07 Mar 2025 14:33:53 +0800
Subject: [PATCH] 煤矿修改
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java | 2 +-
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayStudentServiceImpl.java | 12 +++---------
exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayStudentController.java | 5 ++---
exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java | 2 +-
4 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayStudentController.java b/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayStudentController.java
index 5402826..9921a1c 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayStudentController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayStudentController.java
@@ -30,10 +30,9 @@
*/
@GetMapping("/studentList/{coalPayId}")
@ApiOperation(value = "缴费信息对应学员信息")
- public TableDataInfo list(@PathVariable Long coalPayId) {
- startPage();
+ public AjaxResult list(@PathVariable Long coalPayId) {
List<CoalPayStudent> list = coalPayStudentService.selectCoalPayStudentList(coalPayId);
- return getDataTable(list);
+ return success(list);
}
/**
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java b/exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java
index 8f970d5..a3fc956 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/controller/PayFeesController.java
@@ -15,7 +15,7 @@
import java.util.Map;
@RestController
-@Api(tags = "缴费通知")
+@Api(tags = "缴费通知--弃用")
@RequestMapping("/pay/payFees")
public class PayFeesController extends BaseController {
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
index 6964111..7fde0db 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
@@ -163,7 +163,7 @@
@Override
public AjaxResult deleteCoalPayByIds(Long[] ids) {
for (Long id : ids) {
- List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayId(id);
+ List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayIdAndPayStatus(id,1);
if (!CollectionUtils.isEmpty(coalPayStudents)) {
throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "已有学员完成缴费，请勿删除");
}
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayStudentServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayStudentServiceImpl.java
index 90039df..48ec04b 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayStudentServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayStudentServiceImpl.java
@@ -104,15 +104,8 @@
}
}
- char c = idCard.charAt(idCard.length() - 1);
- if (Character.isDigit(c)){
- int genderDigit = Character.getNumericValue(c);
- if (genderDigit % 2 == 1) {
- coalPayStudent.setSex(0L);
- } else {
- coalPayStudent.setSex(1L);
- }
- }
+ idCard = idCard.trim();
+ coalPayStudent.setSex((idCard.charAt(idCard.length() - 2) - '0') % 2 == 0 ? 1L : 0L);
coalPayStudent.setPayStatus(0L);
coalPayStudent.setCreateBy(loginUser.getUsername());
coalPayStudent.setCreateTime(new Date());
@@ -121,6 +114,7 @@
}
// 根据身份证号去重
List<CoalPayStudent> distinctStudents = coalPayStudents.stream()
+ .filter(student -> student.getIdCard()!=null)
.collect(Collectors.toMap(
CoalPayStudent::getIdCard, // 使用身份证号作为键
student -> student, // 使用学生对象作为值
--
Gitblit v1.9.2