V13

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/UnionTotalController.java

@@ -3,7 +3,9 @@ package com.ruoyi.cai.controller;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.cai.domain.Union;
 import com.ruoyi.cai.domain.UnionTotal;
+import com.ruoyi.cai.service.UnionService;
 import com.ruoyi.cai.service.UnionTotalService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.List;
 
 /**
  * 工会每日收益
@@ -34,6 +37,7 @@ import java.time.format.DateTimeFormatter;
 public class UnionTotalController extends BaseController {
 
     private final UnionTotalService unionTotalService;
+    private final UnionService unionService;
 
     /**
      * 查询工会每日收益列表
@@ -41,10 +45,16 @@ public class UnionTotalController extends BaseController {
     @SaCheckPermission("cai:unionTotal:list")
     @GetMapping("/list")
     public TableDataInfo<UnionTotal> list(UnionTotal bo, PageQuery pageQuery) {
-        Page<UnionTotal> page = unionTotalService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<UnionTotal> page = unionTotalService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(UnionTotal::getCountDate));
         return TableDataInfo.build(page);
     }
 
+    @GetMapping("/unionList")
+    public R<List<Union>> unionList() {
+        List<Union> list = unionService.list(Wrappers.<Union>lambdaQuery().last("limit 200"));
+        return R.ok(list);
+    }
+
     @Log(title = "刷新工会每日收益", businessType = BusinessType.DELETE)
     @GetMapping("/refreshData")
     public R<Void> refreshData(String date) {