From 83324b143ef52bdfeaffda31e13d9c4ac829a163 Mon Sep 17 00:00:00 2001
From: zhangluping <1801075613@qq.com>
Date: Sat, 28 Dec 2024 17:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/demo/controller/DetailYController.java  |  7 +++++++
 .../java/com/example/demo/mapper/DetailYMapper.java     | 17 +++++++++++++++++
 .../example/demo/serviceImpl/DetailYServiceImpl.java    | 12 ++++++++++++
 .../java/com/example/demo/sevice/DetailYService.java    |  6 ++++++
 4 files changed, 42 insertions(+)

diff --git a/src/main/java/com/example/demo/controller/DetailYController.java b/src/main/java/com/example/demo/controller/DetailYController.java
index a4c756f..a9b4430 100644
--- a/src/main/java/com/example/demo/controller/DetailYController.java
+++ b/src/main/java/com/example/demo/controller/DetailYController.java
@@ -3,6 +3,8 @@ package com.example.demo.controller;
 
 import com.example.demo.domain.entity.Detail;
 import com.example.demo.domain.entity.DetailY;
+import com.example.demo.domain.entity.UserDetailExport;
+import com.example.demo.domain.vo.DetailExport;
 import com.example.demo.domain.vo.Page;
 import com.example.demo.domain.vo.Result;
 import com.example.demo.sevice.DetailService;
@@ -50,4 +52,9 @@ public class DetailYController {
             return Result.success(detailYService.selectgold(page.getPageNum(), page.getPageSize(), page.getDetailYgold()));
         }
     }
+    @PostMapping("/searchAll")
+    public Result searchAll(@RequestBody DetailExport detailExport) {
+        return Result.success(detailYService.searchAll(detailExport));
+    }
+
 }
diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java
index 371bc1b..36d16b4 100644
--- a/src/main/java/com/example/demo/mapper/DetailYMapper.java
+++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java
@@ -3,6 +3,7 @@ package com.example.demo.mapper;
 import com.example.demo.domain.entity.DetailY;
 import com.example.demo.domain.entity.UserDetailExport;
 import com.example.demo.domain.vo.DetailYgold;
+import com.example.demo.domain.vo.DetailExport;
 import org.apache.ibatis.annotations.*;
 
 import java.util.List;
@@ -104,4 +105,20 @@ public interface DetailYMapper {
 
     @Select("SELECT COUNT(*) FROM detail_y")
     int getTotalCount();
+
+    @Select({
+            "<script>",
+            "SELECT d.detaily_id,u.name,d.jwcode,u.area,d.consume_platform,d.update_type,d.recharge_coin,d.task_coin," +
+                    "d.free_coin,d.create_admin,d.create_time",
+            "FROM detail_y d",
+            "LEFT JOIN user u on d.jwcode = u.jwcode ",
+            "<where>",
+            "<if test='jwcode!=null'>AND d.jwcode=#{jwcode}</if>",
+            "<if test='area'>AND u.area=#{area}</if>",
+            "<if test='startDate != null and endDate != null'>AND create_time BETWEEN #{startDate} AND #{endDate}</if>",
+            "</where>",
+            "ORDER BY detaily_id desc",
+            "</script>"
+    })
+    List<UserDetailExport> searchAll(DetailExport detailExport);
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
index c50ce53..8ae86e2 100644
--- a/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/DetailYServiceImpl.java
@@ -1,6 +1,8 @@
 package com.example.demo.serviceImpl;
 
 import com.example.demo.domain.entity.DetailY;
+import com.example.demo.domain.entity.UserDetailExport;
+import com.example.demo.domain.vo.DetailExport;
 import com.example.demo.domain.vo.DetailYgold;
 import com.example.demo.mapper.DetailYMapper;
 import com.example.demo.sevice.DetailYService;
@@ -52,4 +54,14 @@ public class DetailYServiceImpl implements DetailYService {
         List<DetailY> list = detailYMapper.select(detailY);
         return new PageInfo<>(list);
     }
+
+    @Override
+    public List<UserDetailExport> searchAll(DetailExport detailExport) {
+        return detailYMapper.searchAll(detailExport);
+    }
+
+//    @Override
+//    public List<UserDetailExport> searchAll(UserDetailExport userDetailExport) {
+//        return detailYMapper.searchExport();
+//    }
 }
diff --git a/src/main/java/com/example/demo/sevice/DetailYService.java b/src/main/java/com/example/demo/sevice/DetailYService.java
index ff1ec46..7117272 100644
--- a/src/main/java/com/example/demo/sevice/DetailYService.java
+++ b/src/main/java/com/example/demo/sevice/DetailYService.java
@@ -1,13 +1,19 @@
 package com.example.demo.sevice;
 
 import com.example.demo.domain.entity.DetailY;
+import com.example.demo.domain.entity.UserDetailExport;
+import com.example.demo.domain.vo.DetailExport;
 import com.example.demo.domain.vo.DetailYgold;
 import com.github.pagehelper.PageInfo;
 
+import java.util.List;
+
 public interface DetailYService {
     int add(DetailY detailY);
     DetailY getCount(DetailY detailY);
     DetailYgold getgold(DetailYgold detailYgold);
     PageInfo<DetailYgold> selectgold(int pageNum, int pageSize, DetailYgold detailYgold);
     PageInfo<DetailY> getDetailByPage(int pageNum, int pageSize, DetailY detailY);
+
+    List<UserDetailExport> searchAll(DetailExport detailExport);
 }