From ea219f4389c52d0bac442c7a351767160c9814c5 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Mon, 10 Mar 2025 16:26:20 +0800
Subject: [PATCH] 缴费修改
---
exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalCategoryController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalCategoryController.java b/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalCategoryController.java
index 87c7c2e..a4e8fe1 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalCategoryController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalCategoryController.java
@@ -1,9 +1,13 @@
package com.gkhy.exam.pay.controller;
+import com.gkhy.exam.pay.dto.rep.CategoryCount;
+import com.gkhy.exam.pay.dto.rep.NonCategoryCount;
+import com.gkhy.exam.pay.dto.req.CountReq;
import com.gkhy.exam.pay.entity.CoalCategory;
import com.gkhy.exam.pay.entity.CoalTicket;
import com.gkhy.exam.pay.entity.NonCoalCategory;
import com.gkhy.exam.pay.service.CoalCategoryService;
+import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -15,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.stream.Collectors;
@RestController
@Api(tags = "煤矿工种类别管理")
@@ -27,9 +32,9 @@
/**
* 查询煤矿工种类别列表
*/
- @PostMapping("/list")
+ @GetMapping("/list")
@ApiOperation(value = "查询煤矿工种类别列表")
- public TableDataInfo list(@RequestBody CoalCategory coalCategory) {
+ public TableDataInfo list(CoalCategory coalCategory) {
startPage();
List<CoalCategory> list = coalCategoryService.selectCoalCategoryList(coalCategory);
return getDataTable(list);
@@ -98,4 +103,27 @@
public AjaxResult ticketList(){
return success(coalCategoryService.ticketList());
}
+
+ /**
+ * 工种缴费统计
+ */
+ @GetMapping("/count")
+ @ApiOperation(value = "工种缴费统计")
+ public TableDataInfo count(CountReq countReq){
+ List<CategoryCount> categoryCounts = coalCategoryService.countCategory(countReq);
+ int pageNum = countReq.getPageNum(); // 当前页码
+ int pageSize = countReq.getPageSize(); // 每页大小
+ List<CategoryCount> pagedList = categoryCounts.stream()
+ .skip((pageNum - 1) * pageSize) // 跳过前面的数据
+ .limit(pageSize) // 限制当前页的数据量
+ .collect(Collectors.toList());
+
+ // 封装分页结果
+ TableDataInfo dataTable = new TableDataInfo();
+ dataTable.setCode(HttpStatus.SUCCESS);
+ dataTable.setMsg("查询成功");
+ dataTable.setRows(pagedList); // 当前页数据
+ dataTable.setTotal(categoryCounts.size()); // 总数据量
+ return dataTable;
+ }
}
--
Gitblit v1.9.2