From e5de8ed3c298d846d29c37553ca091a047cb87ce Mon Sep 17 00:00:00 2001
From: nh <1311063310@qq.com>
Date: Sat, 30 Jan 2021 12:06:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=AE=BE=E7=BD=AE=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/wisenergy/mapper/WorkTimeOrderMapper.java     | 2 ++
 .../src/main/java/cn/wisenergy/mapper/WorkUserMapper.java | 5 +++++
 .../cn/wisenergy/service/impl/StatisticsServiceImpl.java  | 8 ++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java
index 9057ce5..9308dc1 100644
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java
+++ b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkTimeOrderMapper.java
@@ -49,6 +49,8 @@ public interface WorkTimeOrderMapper extends BaseMapper<WorkTimeOrder> {
     List<MonthlyWorkingHoursStatistics> statisticsByProjectType(@Param("userId") Integer userId, @Param("currentMonthFirstDay") Date currentMonthFirstDay);
 
     /**
+     * 获取用户在某月的工时、工时类型、工单日期
+     *
      * @param year
      * @param month
      * @param userIds
diff --git a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkUserMapper.java b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkUserMapper.java
index 64d82a8..777dd31 100644
--- a/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkUserMapper.java
+++ b/wisenergy-mapper/src/main/java/cn/wisenergy/mapper/WorkUserMapper.java
@@ -28,6 +28,11 @@ public interface WorkUserMapper extends BaseMapper<WorkUser> {
 
     Integer updateUserInfo(WorkUser user);
 
+    /**
+     * 获取用户主键、姓名、部门名称
+     * @param userIds
+     * @return
+     */
     List<StatisticsTableDto> getStatisticsTableDtos(List<Integer> userIds);
 
 }
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java
index 504d8ad..db253f5 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java
@@ -26,6 +26,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.VerticalAlignment;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -124,7 +125,6 @@ public class StatisticsServiceImpl implements StatisticsService {
                 }
             }
             statisticsTableDto.setDayWorkTimeAndTypeList(dayWorkTimeAndTypes1);
-
         }
         pageInfo.setList(statisticsTableDtos);
         return pageInfo;
@@ -251,6 +251,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         // 垂直、水平中心对齐
         cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
         cellStyle.setAlignment(HorizontalAlignment.CENTER);
+        cellStyle.setWrapText(true);
         // 第一列列宽
         sheet.setColumnWidth(1, EXCEL_WIDTH);
         // 创建一行
@@ -288,9 +289,12 @@ public class StatisticsServiceImpl implements StatisticsService {
                 } else {
                     HSSFCell emptyCell = row_i.createCell(timeAndType.getDay() + 2);
                     emptyCell.setCellValue(timeAndType.getType() + timeAndType.getWorkTime().toString());
-                    emptyCell.setCellStyle(cellStyle);
                 }
             }
+            // 给该行每个单元格设置单元格样式
+            for (Cell cell : row_i) {
+                cell.setCellStyle(cellStyle);
+            }
             // 换行
             i++;
         }
-- 
2.18.1