From e3853368e05aad326fdbb7e1057d23cb77918c7b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 14 五月 2024 02:25:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java | 32 ++++++
performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java | 2
performance-server/src/main/java/com/yuanchu/mom/utils/StyleYearUtils.java | 6
performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml | 20 ++++
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java | 110 ++++++++++++++++++++-
performance-server/src/main/java/com/yuanchu/mom/utils/StyleMonthUtils.java | 32 +++---
performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java | 4
performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java | 39 +++++--
performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java | 4
9 files changed, 206 insertions(+), 43 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
index 45a48c6..965ce6a 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
@@ -7,7 +7,8 @@
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
import com.yuanchu.mom.pojo.PerformanceShift;
import com.yuanchu.mom.service.PerformanceShiftService;
-import com.yuanchu.mom.utils.StyleUtils;
+import com.yuanchu.mom.utils.StyleMonthUtils;
+import com.yuanchu.mom.utils.StyleYearUtils;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -64,20 +65,32 @@
}
@ApiOperation(value = "缁╂晥绠＄悊-鐝-瀵煎嚭")
- @GetMapping("update")
- public void exportToExcel(@NotNull(message = "鏃堕棿涓嶈兘涓虹┖锛�") String time, String userName, String laboratory, HttpServletResponse response) throws Exception {
- Map<Object, Object> data = performanceShiftService.exportToExcel(time, userName, laboratory);
- // 璁剧疆鍗曞厓鏍兼牱寮�
- HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleUtils.getHeadStyle(), StyleUtils.getContentStyle());
- // 淇濆瓨鍒扮涓�涓猻heet涓�
+ @GetMapping("export")
+ public void exportToExcel(@NotNull(message = "鏃堕棿涓嶈兘涓虹┖锛�") String time, String userName, String laboratory, Boolean isMonth, HttpServletResponse response) throws Exception {
+ Map<Object, Object> data;
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
response.setHeader("requestType","excel");
response.setHeader("Access-Control-Expose-Headers", "requestType");
- EasyExcel.write(response.getOutputStream())
- .head((List<List<String>>) data.get("header"))
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 鑷�傚簲鍒楀
- .registerWriteHandler(horizontalCellStyleStrategy)
- .sheet("妯℃澘")
- .doWrite((Collection<?>) data.get("data"));
+ if (!isMonth) {
+ data = performanceShiftService.exportToYearExcel(time, userName, laboratory);
+ // 璁剧疆鍗曞厓鏍兼牱寮�
+ HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleYearUtils.getHeadStyle(), StyleYearUtils.getContentStyle());
+ // 淇濆瓨鍒扮涓�涓猻heet涓�
+ EasyExcel.write(response.getOutputStream())
+ .head((List<List<String>>) data.get("header"))
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) // 鑷�傚簲鍒楀
+ .registerWriteHandler(horizontalCellStyleStrategy)
+ .sheet("骞村害")
+ .doWrite((Collection<?>) data.get("data"));
+ } else {
+ data = performanceShiftService.exportToMonthExcel(time, userName, laboratory);
+ // 璁剧疆鍗曞厓鏍兼牱寮�
+ HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleMonthUtils.getHeadStyle(), StyleMonthUtils.getContentStyle());
+ EasyExcel.write(response.getOutputStream())
+ .head((List<List<String>>) data.get("header"))
+ .registerWriteHandler(horizontalCellStyleStrategy)
+ .sheet("鏈堝害")
+ .doWrite((Collection<?>) data.get("data"));
+ }
}
}
diff --git a/performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java b/performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java
index 6086e2f..359a16e 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/dto/PerformanceShiftMapDto.java
@@ -16,10 +16,12 @@
private String userId;
+ private String department;
+
private Map<String, Object> monthlyAttendance = new HashMap<>();
private Map<String, Object> sidebarAnnualAttendance = new HashMap<>();;
- private List<?> list = new ArrayList<>();
+ private List<Map<String, Object>> list = new ArrayList<>();
private List<Map<Object, Object>> headerList = new ArrayList<>();
}
diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
index 2623b39..39157fe 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
@@ -34,4 +34,6 @@
IPage<Map<String, Object>> performanceShiftYear(Page<Object> page, String time, String userName, String laboratory);
List<Map<String, Object>> performanceShiftYearList(String time, String userName, String laboratory);
+
+ List<PerformanceShiftMapDto> performanceShiftList(String time, String userName, String laboratory);
}
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java b/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
index e671f1a..8a4ec3a 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
@@ -26,5 +26,7 @@
IPage<Map<String, Object>> performanceShiftPageYear(Page<Object> page, String time, String userName, String laboratory);
- Map<Object, Object> exportToExcel(String time, String userName, String laboratory) throws Exception;
+ Map<Object, Object> exportToYearExcel(String time, String userName, String laboratory) throws Exception;
+
+ Map<Object, Object> exportToMonthExcel(String time, String userName, String laboratory);
}
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java b/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
index dde83c3..e6fa72e 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java
@@ -22,6 +22,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
@@ -100,10 +101,10 @@
mapIPage.getRecords().forEach(i -> {
String[] shiftTimes = i.getShiftTime().split(";");
int totalAttendance = 0;
- List<Object> map = new ArrayList<>();
+ List<Map<String, Object>> map = new ArrayList<>();
// 鍒嗗壊鏃ユ湡
for (String shiftTime : shiftTimes) {
- Map<Object, Object> hashMap = new HashMap<>();
+ Map<String, Object> hashMap = new HashMap<>();
String[] shiftTimeAndShift = shiftTime.split("锛�");
for (Enums enums : shiftType) {
if (!i.getMonthlyAttendance().containsKey(enums.getLabel())) {
@@ -260,16 +261,58 @@
}
@Override
- public Map<Object, Object> exportToExcel(String time, String userName, String laboratory) throws Exception {
+ public Map<Object, Object> exportToYearExcel(String time, String userName, String laboratory) throws Exception {
Map<Object, Object> map = new HashMap<>();
List<Enums> shiftType = enumService.selectEnumByCategory("鐝绫诲瀷");
DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// 灏嗗瓧绗︿覆鏃堕棿杞崲涓� LocalDateTime 绫诲瀷鏃堕棿
LocalDateTime localDateTime = LocalDateTime.parse(time, formatters);
- map.put("header", getHeader(localDateTime.getYear() + " 骞�", shiftType));
+ map.put("header", getYearHeader(localDateTime.getYear() + " 骞�", shiftType));
List<Map<String, Object>> mapYearList = baseMapper.performanceShiftYearList(time, userName, laboratory);
annualAttendanceProcessing(mapYearList, shiftType);
List<List<Object>> lists = dataRequiredForProcessingIntoExcel(mapYearList, shiftType);
+ map.put("data", lists);
+ return map;
+ }
+
+ @Override
+ public Map<Object, Object> exportToMonthExcel(String time, String userName, String laboratory) {
+ List<Enums> shiftType = enumService.selectEnumByCategory("鐝绫诲瀷");
+ List<PerformanceShiftMapDto> mapIPage = baseMapper.performanceShiftList(time, userName, laboratory);
+ mapIPage.forEach(i -> {
+ String[] shiftTimes = i.getShiftTime().split(";");
+ int totalAttendance = 0;
+ List<Map<String, Object>> map = new ArrayList<>();
+ // 鍒嗗壊鏃ユ湡
+ for (String shiftTime : shiftTimes) {
+ Map<String, Object> hashMap = new HashMap<>();
+ String[] shiftTimeAndShift = shiftTime.split("锛�");
+ for (Enums enums : shiftType) {
+ if (!i.getMonthlyAttendance().containsKey(enums.getLabel())) {
+ i.getMonthlyAttendance().put(enums.getLabel(), 0);
+ }
+ if (enums.getValue().equals(shiftTimeAndShift[1])) {
+ Integer num = (Integer) i.getMonthlyAttendance().get(enums.getLabel());
+ i.getMonthlyAttendance().put(enums.getLabel(), num += 1);
+ }
+ }
+ if (shiftTimeAndShift[1].equals("1") || shiftTimeAndShift[1].equals("2") || shiftTimeAndShift[1].equals("0")) {
+ i.getMonthlyAttendance().put("totalAttendance", totalAttendance += 1);
+ }
+ hashMap.put("id", shiftTimeAndShift[2]);
+ hashMap.put("shift", shiftTimeAndShift[1]);
+ hashMap.put("time", shiftTimeAndShift[0]);
+ map.add(hashMap);
+ }
+ i.setList(map);
+ i.setShiftTime(null);
+ });
+ Map<Object, Object> map = new HashMap<>();
+ DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ // 灏嗗瓧绗︿覆鏃堕棿杞崲涓� LocalDateTime 绫诲瀷鏃堕棿
+ LocalDateTime localDateTime = LocalDateTime.parse(time, formatters);
+ map.put("header", getMonthHeader(localDateTime, shiftType));
+ List<List<Object>> lists = dataRequiredForProcessingIntoExcelMonth(mapIPage, shiftType);
map.put("data", lists);
return map;
}
@@ -330,15 +373,15 @@
* 鏋勯�犲弻鍒楄〃澶�
* @return List<List<String>>
*/
- private static List<List<String>> getHeader(String month, List<Enums> enums){
+ private static List<List<String>> getYearHeader(String year, List<Enums> enums){
List<List<String>> line = new ArrayList<>();
line.add(Arrays.asList("鑰冨嫟姹囨��", "搴忓彿", "搴忓彿"));
line.add(Arrays.asList("鑰冨嫟姹囨��", "宸ュ彿", "宸ュ彿"));
line.add(Arrays.asList("鑰冨嫟姹囨��", "濮撳悕", "濮撳悕"));
- line.add(Arrays.asList("鍑哄嫟璇︽儏", month, "鍑哄嫟"));
+ line.add(Arrays.asList("鍑哄嫟璇︽儏", year, "鍑哄嫟"));
// 骞� header
for (Enums anEnum : enums) {
- line.add(Arrays.asList("鑰冨嫟姹囨��", month, anEnum.getLabel()));
+ line.add(Arrays.asList("鑰冨嫟姹囨��", year, anEnum.getLabel()));
}
// 鏈坔eader
for (int i = 1; i < 13; i++) {
@@ -349,4 +392,57 @@
}
return line;
}
+
+ private static List<List<String>> getMonthHeader(LocalDateTime localDateTimeYear, List<Enums> enums){
+ String year = localDateTimeYear.getYear() + " 骞翠汉鍛樼彮娆�";
+ List<List<String>> line = new ArrayList<>();
+ line.add(Arrays.asList(year, "搴忓彿", "搴忓彿", "搴忓彿"));
+ line.add(Arrays.asList(year, "濮撳悕", "濮撳悕", "濮撳悕"));
+ line.add(Arrays.asList(year, "瀹為獙瀹�", "瀹為獙瀹�", "瀹為獙瀹�"));
+ line.add(Arrays.asList(year, localDateTimeYear.getYear() + "", localDateTimeYear.getYear() + "", "鍑哄嫟"));
+ line.add(Arrays.asList(year, localDateTimeYear.getYear() + "", localDateTimeYear.getYear() + "", enums.get(3).getLabel()));
+ line.add(Arrays.asList(year, "骞�", "骞�", enums.get(4).getLabel()));
+ line.add(Arrays.asList(year, localDateTimeYear.getMonthValue() + "", localDateTimeYear.getMonthValue() + "", enums.get(0).getLabel()));
+ line.add(Arrays.asList(year, "鏈�", "鏈�", enums.get(1).getLabel()));
+ line.add(Arrays.asList(year, "", "", enums.get(2).getLabel()));
+ line.add(Arrays.asList(year, "鍛ㄦ", "鏄熸湡", "鍑哄樊"));
+ LocalDate firstDayOfMonth = localDateTimeYear.toLocalDate().withDayOfMonth(1);
+ LocalDate lastDayOfMonth = localDateTimeYear.toLocalDate().with(TemporalAdjusters.lastDayOfMonth());
+ List<LocalDateTime> timeList = getLocalDateTimesBetween(firstDayOfMonth.atStartOfDay(), lastDayOfMonth.atStartOfDay());
+ timeList.forEach(i -> {
+ int dayOfYear = i.getDayOfMonth();
+ Date from = Date.from(i.atZone(ZoneId.systemDefault()).toInstant());
+ String weekDay = getWeekDay(i.getDayOfWeek().getValue());
+ line.add(Arrays.asList(year, DateUtil.weekOfYear(DateUtil.offsetDay(from, 1)) + "", weekDay, dayOfYear + ""));
+ });
+ return line;
+ }
+
+ public List<List<Object>> dataRequiredForProcessingIntoExcelMonth(List<PerformanceShiftMapDto> list, List<Enums> enums) {
+ List<List<Object>> data = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ List<Object> excelRowList = new ArrayList<>();
+ excelRowList.add(i + 1);
+ excelRowList.add(list.get(i).getName());
+ excelRowList.add(list.get(i).getDepartment());
+ excelRowList.add(list.get(i).getMonthlyAttendance().get("totalAttendance"));
+ excelRowList.add(list.get(i).getMonthlyAttendance().get(enums.get(3).getLabel()));
+ excelRowList.add(list.get(i).getMonthlyAttendance().get(enums.get(4).getLabel()));
+ excelRowList.add(list.get(i).getMonthlyAttendance().get(enums.get(0).getLabel()));
+ excelRowList.add(list.get(i).getMonthlyAttendance().get(enums.get(1).getLabel()));
+ excelRowList.add(list.get(i).getMonthlyAttendance().get(enums.get(2).getLabel()));
+ excelRowList.add(0); // 鍑哄樊
+ for (Map<String, Object> o : list.get(i).getList()) {
+ String enumLabel = "";
+ for (Enums anEnum : enums) {
+ if (anEnum.getValue().equals(o.get("shift"))) {
+ enumLabel = anEnum.getLabel();
+ }
+ }
+ excelRowList.add(ObjectUtils.isEmpty(enumLabel) ? "鏃�" : enumLabel);
+ }
+ data.add(excelRowList);
+ }
+ return data;
+ }
}
diff --git a/performance-server/src/main/java/com/yuanchu/mom/utils/StyleUtils.java b/performance-server/src/main/java/com/yuanchu/mom/utils/StyleMonthUtils.java
similarity index 75%
copy from performance-server/src/main/java/com/yuanchu/mom/utils/StyleUtils.java
copy to performance-server/src/main/java/com/yuanchu/mom/utils/StyleMonthUtils.java
index dc8a300..7c443be 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/utils/StyleUtils.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/utils/StyleMonthUtils.java
@@ -4,7 +4,7 @@
import com.alibaba.excel.write.metadata.style.WriteFont;
import org.apache.poi.ss.usermodel.*;
-public class StyleUtils {
+public class StyleMonthUtils {
/**
* 鏍囬鏍峰紡
* @return
@@ -13,26 +13,26 @@
// 澶寸殑绛栫暐
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
// 鑳屾櫙棰滆壊
- headWriteCellStyle.setFillForegroundColor(IndexedColors.LIME.getIndex());
+ headWriteCellStyle.setFillForegroundColor(IndexedColors.WHITE.getIndex());
headWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND);
// 瀛椾綋
WriteFont headWriteFont = new WriteFont();
- headWriteFont.setFontName("浠垮畫");//璁剧疆瀛椾綋鍚嶅瓧
+ headWriteFont.setFontName("绛夌嚎");//璁剧疆瀛椾綋鍚嶅瓧
headWriteFont.setFontHeightInPoints((short)9);//璁剧疆瀛椾綋澶у皬
headWriteFont.setBold(true);//瀛椾綋鍔犵矖
- headWriteFont.setColor((short) 1);
+ headWriteFont.setColor((short) 0);
headWriteCellStyle.setWriteFont(headWriteFont); //鍦ㄦ牱寮忕敤搴旂敤璁剧疆鐨勫瓧浣�;
// 鏍峰紡
headWriteCellStyle.setBorderBottom(BorderStyle.THIN);//璁剧疆搴曡竟妗�;
- headWriteCellStyle.setBottomBorderColor((short) 1);//璁剧疆搴曡竟妗嗛鑹�;
+ headWriteCellStyle.setBottomBorderColor((short) 0);//璁剧疆搴曡竟妗嗛鑹�;
headWriteCellStyle.setBorderLeft(BorderStyle.THIN); //璁剧疆宸﹁竟妗�;
- headWriteCellStyle.setLeftBorderColor((short) 1);//璁剧疆宸﹁竟妗嗛鑹�;
+ headWriteCellStyle.setLeftBorderColor((short) 0);//璁剧疆宸﹁竟妗嗛鑹�;
headWriteCellStyle.setBorderRight(BorderStyle.THIN);//璁剧疆鍙宠竟妗�;
- headWriteCellStyle.setRightBorderColor((short) 1);//璁剧疆鍙宠竟妗嗛鑹�;
+ headWriteCellStyle.setRightBorderColor((short) 0);//璁剧疆鍙宠竟妗嗛鑹�;
headWriteCellStyle.setBorderTop(BorderStyle.THIN);//璁剧疆椤惰竟妗�;
- headWriteCellStyle.setTopBorderColor((short) 1); //璁剧疆椤惰竟妗嗛鑹�;
+ headWriteCellStyle.setTopBorderColor((short) 0); //璁剧疆椤惰竟妗嗛鑹�;
headWriteCellStyle.setWrapped(false); //璁剧疆鑷姩鎹㈣;
@@ -53,24 +53,24 @@
WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
// 杩欓噷闇�瑕佹寚瀹� FillPatternType 涓篎illPatternType.SOLID_FOREGROUND 涓嶇劧鏃犳硶鏄剧ず鑳屾櫙棰滆壊.澶撮粯璁や簡 FillPatternType鎵�浠ュ彲浠ヤ笉鎸囧畾
- contentWriteCellStyle.setFillForegroundColor(IndexedColors.LIGHT_GREEN.getIndex());
+// contentWriteCellStyle.setFillForegroundColor(IndexedColors.LIGHT_GREEN.getIndex());
contentWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND);
// 璁剧疆瀛椾綋
WriteFont contentWriteFont = new WriteFont();
- contentWriteFont.setFontHeightInPoints((short) 9);//璁剧疆瀛椾綋澶у皬
- contentWriteFont.setFontName("浠垮畫"); //璁剧疆瀛椾綋鍚嶅瓧
+ contentWriteFont.setFontHeightInPoints((short) 10);//璁剧疆瀛椾綋澶у皬
+ contentWriteFont.setFontName("绛夌嚎"); //璁剧疆瀛椾綋鍚嶅瓧
contentWriteCellStyle.setWriteFont(contentWriteFont);//鍦ㄦ牱寮忕敤搴旂敤璁剧疆鐨勫瓧浣�;
//璁剧疆鏍峰紡;
-// contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);//璁剧疆搴曡竟妗�;
-// contentWriteCellStyle.setBottomBorderColor((short) 1);//璁剧疆搴曡竟妗嗛鑹�;
+ contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);//璁剧疆搴曡竟妗�;
+ contentWriteCellStyle.setBottomBorderColor((short) 0);//璁剧疆搴曡竟妗嗛鑹�;
contentWriteCellStyle.setBorderLeft(BorderStyle.THIN); //璁剧疆宸﹁竟妗�;
- contentWriteCellStyle.setLeftBorderColor((short) 1);//璁剧疆宸﹁竟妗嗛鑹�;
+ contentWriteCellStyle.setLeftBorderColor((short) 0);//璁剧疆宸﹁竟妗嗛鑹�;
contentWriteCellStyle.setBorderRight(BorderStyle.THIN);//璁剧疆鍙宠竟妗�;
- contentWriteCellStyle.setRightBorderColor((short) 1);//璁剧疆鍙宠竟妗嗛鑹�;
+ contentWriteCellStyle.setRightBorderColor((short) 0);//璁剧疆鍙宠竟妗嗛鑹�;
contentWriteCellStyle.setBorderTop(BorderStyle.THIN);//璁剧疆椤惰竟妗�;
- contentWriteCellStyle.setTopBorderColor((short) 1); ///璁剧疆椤惰竟妗嗛鑹�;
+ contentWriteCellStyle.setTopBorderColor((short) 0); ///璁剧疆椤惰竟妗嗛鑹�;
contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);// 姘村钩灞呬腑
contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);// 鍨傜洿灞呬腑
diff --git a/performance-server/src/main/java/com/yuanchu/mom/utils/StyleUtils.java b/performance-server/src/main/java/com/yuanchu/mom/utils/StyleYearUtils.java
similarity index 97%
rename from performance-server/src/main/java/com/yuanchu/mom/utils/StyleUtils.java
rename to performance-server/src/main/java/com/yuanchu/mom/utils/StyleYearUtils.java
index dc8a300..a1c54b1 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/utils/StyleUtils.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/utils/StyleYearUtils.java
@@ -4,7 +4,7 @@
import com.alibaba.excel.write.metadata.style.WriteFont;
import org.apache.poi.ss.usermodel.*;
-public class StyleUtils {
+public class StyleYearUtils {
/**
* 鏍囬鏍峰紡
* @return
@@ -13,7 +13,7 @@
// 澶寸殑绛栫暐
WriteCellStyle headWriteCellStyle = new WriteCellStyle();
// 鑳屾櫙棰滆壊
- headWriteCellStyle.setFillForegroundColor(IndexedColors.LIME.getIndex());
+ headWriteCellStyle.setFillForegroundColor(IndexedColors.GREEN.getIndex());
headWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND);
// 瀛椾綋
@@ -53,7 +53,7 @@
WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
// 杩欓噷闇�瑕佹寚瀹� FillPatternType 涓篎illPatternType.SOLID_FOREGROUND 涓嶇劧鏃犳硶鏄剧ず鑳屾櫙棰滆壊.澶撮粯璁や簡 FillPatternType鎵�浠ュ彲浠ヤ笉鎸囧畾
- contentWriteCellStyle.setFillForegroundColor(IndexedColors.LIGHT_GREEN.getIndex());
+ contentWriteCellStyle.setFillForegroundColor(IndexedColors.GREY_25_PERCENT.getIndex());
contentWriteCellStyle.setFillPatternType(FillPatternType.SOLID_FOREGROUND);
// 璁剧疆瀛椾綋
diff --git a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
index 0b702be..697da8a 100644
--- a/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
+++ b/performance-server/src/main/resources/mapper/PerformanceShiftMapper.xml
@@ -6,6 +6,7 @@
<result column="name" property="name"/>
<result column="shift_time" property="shiftTime"/>
<result column="user_id" property="userId" />
+ <result column="department" property="department" />
</resultMap>
<select id="performanceShiftPage" resultMap="performanceShiftPageMap">
@@ -85,4 +86,23 @@
GROUP BY u.id
order by s.work_time
</select>
+
+ <select id="performanceShiftList" resultMap="performanceShiftPageMap">
+ SELECT
+ if(u.department is not null and u.department != '', CONCAT(u.name, '锛�', u.department, '锛�'), u.name) name,
+ GROUP_CONCAT(s.work_time, '锛�', s.shift, '锛�', s.id order by s.work_time SEPARATOR ';') AS shift_time, u.id user_id, u.department
+ FROM performance_shift s
+ LEFT JOIN user u on u.id = s.user_id
+ <where>
+ <if test="time != null and time != ''">
+ and DATE_FORMAT(s.work_time, '%Y-%m') = DATE_FORMAT(#{time}, '%Y-%m' )
+ </if>
+ <if test="userName != null and userName != ''">
+ and u.name like concat('%', #{userName}, '%')
+ </if>
+ <if test="laboratory != null and laboratory != ''">
+ </if>
+ </where>
+ GROUP BY u.id
+ </select>
</mapper>
diff --git a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
index 05a3381..7ff4ee0 100644
--- a/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
+++ b/system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java
@@ -1,14 +1,42 @@
package com.yuanchu.mom;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
+import com.yuanchu.mom.service.PerformanceShiftService;
+import com.yuanchu.mom.utils.StyleYearUtils;
import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
@SpringBootTest
class SystemRunApplicationTest {
+ @Autowired
+ private PerformanceShiftService performanceShiftService;
+
+ private static String fileName = "D:\\" + System.currentTimeMillis() + ".xlsx";
+
@Test
void contextLoads() throws Exception {
-
+ Map<Object, Object> data = performanceShiftService.exportToYearExcel("2024-05-01 00:00:00", null, null);
+ // 璁剧疆鍗曞厓鏍兼牱寮�
+ HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(StyleYearUtils.getHeadStyle(), StyleYearUtils.getContentStyle());
+ EasyExcel.write(fileName)
+ .head((List<List<String>>) data.get("header"))
+ .registerWriteHandler(horizontalCellStyleStrategy)
+ .sheet("鏈堝害")
+ .doWrite((Collection<?>) data.get("data"));
+// String url = "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?corpid=wwa423654b975441ac&corpsecret=J3fbMJoTn3LmrWDobvS5JpU8N0TvEbGkVl8OhvIsol0";
+// String s = HttpUtil.get(url);
+// System.out.println(s);
+// Map<String, Object> unmarshal = JSONObject.parseObject(s, Map.class);
+// String checkInRecords = "https://qyapi.weixin.qq.com/cgi-bin/checkin/getcheckindata?access_token=" + unmarshal.get("access_token");
+// String body = HttpRequest.post(checkInRecords).execute().body();
+// System.out.println(body);
}
-
}
--
Gitblit v1.9.3