From 6f8ece5da1b0cb8d247a18dcc444d3ed43aad2c4 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 25 二月 2025 16:32:45 +0800
Subject: [PATCH] 煤矿缴费修改

---
 exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

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 ef7bfca..d0d98a9 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
@@ -69,27 +69,27 @@
      */
     @Override
     public List<CoalPayRepDto> selectCoalPayList(CoalPayReq coalPay) {
-        List<CoalPayRepDto> coalPayRepDtos = new ArrayList<>();
-        List<CoalPay> coalPays = coalPayMapper.selectCoalPayList(coalPay);
-        for (CoalPay pay : coalPays) {
-            CoalPayRepDto coalPayRepDto = new CoalPayRepDto();
-            BeanUtils.copyProperties(pay, coalPayRepDto);
+//        List<CoalPayRepDto> coalPayRepDtos = new ArrayList<>();
+        List<CoalPayRepDto> coalPays = coalPayMapper.selectCoalPayList(coalPay);
+        for (CoalPayRepDto pay : coalPays) {
+//            CoalPayRepDto coalPayRepDto = new CoalPayRepDto();
+//            BeanUtils.copyProperties(pay, coalPayRepDto);
             //部门数据
             SysDept sysDept = sysDeptMapper.selectDeptById(pay.getDeptId());
-            coalPayRepDto.setDeptName(sysDept.getDeptName());
+            pay.setDeptName(sysDept.getDeptName());
             //工种数据
             List<CoalCategory> coalCategories = coalCategoryMapper.selectByCoalPayId(pay.getId());
-            coalPayRepDto.setCoalCategoryList(coalCategories);
+            pay.setCoalCategoryList(coalCategories);
             //学员数据
             List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayId(pay.getId());
             List<CoalPayStudent> havePay = coalPayStudents.stream()
                     .filter(stu -> stu.getPayStatus() != null && stu.getPayStatus() == 1)
                     .collect(Collectors.toList());
-            coalPayRepDto.setTotalNum(coalPayStudents.size());
-            coalPayRepDto.setHavePayNum(havePay.size());
-            coalPayRepDtos.add(coalPayRepDto);
+            pay.setTotalNum(coalPayStudents.size());
+            pay.setHavePayNum(havePay.size());
+//            coalPayRepDtos.add(coalPayRepDto);
         }
-        return coalPayRepDtos;
+        return coalPays;
     }
 
     @Override

--
Gitblit v1.9.2