From efe541588cbb89992e54fcda03803557687c8521 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 23 Sep 2024 17:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/base/controller/TbTeamController.java | 17 ++++++++++++++++-
 .../main/java/com/bonus/base/domain/TbTeam.java |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbTeamController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbTeamController.java
index 554cc94..dde0fa3 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbTeamController.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbTeamController.java
@@ -1,15 +1,17 @@
 package com.bonus.base.controller;
 
-import com.bonus.base.domain.TbPeople;
 import com.bonus.base.domain.TbTeam;
 import com.bonus.base.service.TbTeamService;
 import com.bonus.base.vo.TbDeviceVo;
+import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -127,6 +129,19 @@ public class TbTeamController extends BaseController {
         return AjaxResult.success(tbTeamService.selectDeviceList(tbDeviceVo));
     }
 
+    /**
+     * 班组管理导出
+     * @param response
+     * @param tbTeam
+     */
+    @ApiOperation("班组管理导出")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TbTeam tbTeam) {
+        List<TbTeam> list = tbTeamService.queryByPage(tbTeam);
+        ExcelUtil<TbTeam> util = new ExcelUtil<>(TbTeam.class);
+        util.exportExcel(response, list, "班组管理导出");
+    }
+
     /**
      * 从北京电科院数据库获取班组列表
      * @return 查询结果
diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java
index b59d70c..08e04aa 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java
@@ -77,7 +77,7 @@ public class TbTeam implements Serializable {
     /**
      * 创建日期
      */
-    @Excel(name = "创建日期")
+    @Excel(name = "创建日期", dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
 
@@ -94,7 +94,7 @@ public class TbTeam implements Serializable {
     /**
      * 解散时间
      */
-    @Excel(name = "解散日期")
+    @Excel(name = "解散日期",  dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jsTime;