From 3b75c8cf561035c41d25d5b8765a7c89375ca264 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 12 五月 2024 08:00:32 +0800
Subject: [PATCH] 各bug修复；
---
performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 151 insertions(+), 5 deletions(-)
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 b7d09b5..dde83c3 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
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,6 +14,7 @@
import com.yuanchu.mom.pojo.PerformanceShift;
import com.yuanchu.mom.service.EnumService;
import com.yuanchu.mom.service.PerformanceShiftService;
+import com.yuanchu.mom.utils.JackSonUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -91,7 +93,7 @@
}
@Override
- public IPage<PerformanceShiftMapDto> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory) {
+ public Map<String, Object> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory) {
IPage<PerformanceShiftMapDto> mapIPage = baseMapper.performanceShiftPage(page, time, userName, laboratory);
List<Enums> shiftType = enumService.selectEnumByCategory("鐝绫诲瀷");
List<Map<String, Object>> mapYearIPage = baseMapper.performanceShiftYearPage(time, userName, laboratory);
@@ -117,10 +119,7 @@
}
hashMap.put("id", shiftTimeAndShift[2]);
hashMap.put("shift", shiftTimeAndShift[1]);
- DateTime parse = DateUtil.parse(shiftTimeAndShift[0]);
- hashMap.put("weekly", DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1)));
hashMap.put("time", shiftTimeAndShift[0]);
- hashMap.put("headerTime", getWeek(shiftTimeAndShift[0]));
map.add(hashMap);
}
int totalYearAttendance = 0;
@@ -145,7 +144,26 @@
i.setList(map);
i.setShiftTime(null);
});
- return mapIPage;
+ // 鑾峰彇header鏃堕棿
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ DateTimeFormatter formatters = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ // 灏嗗瓧绗︿覆鏃堕棿杞崲涓� LocalDateTime 绫诲瀷鏃堕棿
+ LocalDateTime localDateTime = LocalDateTime.parse(time, formatters);
+ LocalDate firstDayOfMonth = localDateTime.toLocalDate().withDayOfMonth(1);
+ LocalDate lastDayOfMonth = localDateTime.toLocalDate().with(TemporalAdjusters.lastDayOfMonth());
+ List<LocalDateTime> localDateTimesBetween = getLocalDateTimesBetween(firstDayOfMonth.atStartOfDay(), lastDayOfMonth.atStartOfDay());
+ List<Object> list1 = new ArrayList<>();
+ for (LocalDateTime dateTime : localDateTimesBetween) {
+ Map<Object, Object> hashMap = new HashMap<>();
+ DateTime parse = DateUtil.parse(dateTime.format(formatter));
+ hashMap.put("weekly", DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1)));
+ hashMap.put("headerTime", getWeek(dateTime.format(formatters)));
+ list1.add(hashMap);
+ }
+ Map<String, Object> resultMap = new HashMap<>();
+ resultMap.put("page", mapIPage);
+ resultMap.put("headerList", list1);
+ return resultMap;
}
@Override
@@ -153,6 +171,107 @@
baseMapper.update(new PerformanceShift(), Wrappers.<PerformanceShift>lambdaUpdate()
.eq(PerformanceShift::getId, performanceShift.getId())
.set(PerformanceShift::getShift, performanceShift.getShift()));
+ }
+
+ @Override
+ public IPage<Map<String, Object>> performanceShiftPageYear(Page<Object> page, String time, String userName, String laboratory) {
+ IPage<Map<String, Object>> mapYearIPage = baseMapper.performanceShiftYear(page, time, userName, laboratory);
+ List<Enums> shiftType = enumService.selectEnumByCategory("鐝绫诲瀷");
+ mapYearIPage.setRecords(annualAttendanceProcessing(mapYearIPage.getRecords(), shiftType));
+ return mapYearIPage;
+ }
+
+ // 骞村垎椤典笌瀵煎嚭鍏卞悓浣跨敤
+ public List<Map<String, Object>> annualAttendanceProcessing(List<Map<String, Object>> mapYearList, List<Enums> shiftType){
+ for (Map<String, Object> map : mapYearList) {
+ Map<String, Object> resultMap = new LinkedHashMap<>();
+ Map<String, Object> hashMapYear = new LinkedHashMap<>();
+ int totalYearAttendance = 0;
+ // 涓�骞�12涓湀
+ for (int i = 1; i < 13; i++) {
+ Map<String, Object> hashMapMonth = new LinkedHashMap<>();
+ int totalMonthAttendance = 0;
+ for (Enums enums : shiftType) {
+ if (!hashMapYear.containsKey(enums.getLabel())) {
+ hashMapYear.put(enums.getLabel(), 0);
+ }
+ // 鏈�
+ if (ObjectUtils.isNotEmpty(map.get("month_str")) && map.get("work_time").equals(i)) {
+ String charArray = map.get("month_str").toString();
+ int count = countOccurrences(charArray, i + "锛�" + enums.getValue());
+ hashMapMonth.put(enums.getLabel(), count);
+ hashMapYear.put(enums.getLabel(), Integer.parseInt(hashMapYear.get(enums.getLabel()).toString()) + count );
+ if (enums.getValue().equals("0") || enums.getValue().equals("1") || enums.getValue().equals("2")) {
+ totalMonthAttendance += count;
+ totalYearAttendance += count;
+ }
+ }
+ // 绌烘暟鎹�
+ else {
+ map.put("work_time", i);
+ hashMapMonth.put(enums.getLabel(), 0);
+ }
+ }
+ hashMapMonth.put("totalMonthAttendance", totalMonthAttendance);
+ hashMapYear.put("totalYearAttendance", totalYearAttendance);
+ resultMap.put(i + "", hashMapMonth);
+ }
+ map.remove("month_str");
+ map.remove("year_str");
+ map.put("year", hashMapYear);
+ map.put("month", resultMap);
+ }
+ return mapYearList;
+ }
+
+ public static int countOccurrences(String str, String target) {
+ int count = 0;
+ int index = 0;
+ while ((index = str.indexOf(target, index))!= -1) {
+ count++;
+ index += target.length();
+ }
+ return count;
+ }
+
+ public List<List<Object>> dataRequiredForProcessingIntoExcel(List<Map<String, Object>> list, List<Enums> enums) throws Exception {
+ 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).get("account"));
+ excelRowList.add(list.get(i).get("name"));
+ Map<String, Object> year = JackSonUtil.unmarshal(JackSonUtil.marshal(list.get(i).get("year")), Map.class);
+ excelRowList.add(year.get("totalYearAttendance"));
+ enums.forEach(j -> {
+ excelRowList.add(year.get(j.getLabel()));
+ });
+ Map<String, Map<String, Object>> month = JackSonUtil.unmarshal(JackSonUtil.marshal(list.get(i).get("month")), Map.class);
+ for (int j = 1; j < 13; j++) {
+ Object totalMonthAttendance = month.get(j + "").get("totalMonthAttendance");
+ excelRowList.add(totalMonthAttendance);
+ for (Enums anEnum : enums) {
+ excelRowList.add(month.get(j + "").get(anEnum.getLabel()));
+ }
+ }
+ data.add(excelRowList);
+ }
+ return data;
+ }
+
+ @Override
+ public Map<Object, Object> exportToExcel(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));
+ 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;
}
// 鑾峰彇涓や釜localDateTime鐨勬瘡涓�澶�
@@ -203,4 +322,31 @@
return "鏈煡";
}
}
+
+ /**
+ * 杩斿洖琛ㄥご
+ *
+ * 澶栧眰List浠ｈ〃琛屽唴灞� List浠ｈ〃鍒� 鐩稿悓鐨勫垪鏁版嵁浼氳涓诲姩鍚堝苟
+ * 鏋勯�犲弻鍒楄〃澶�
+ * @return List<List<String>>
+ */
+ private static List<List<String>> getHeader(String month, 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, "鍑哄嫟"));
+ // 骞� header
+ for (Enums anEnum : enums) {
+ line.add(Arrays.asList("鑰冨嫟姹囨��", month, anEnum.getLabel()));
+ }
+ // 鏈坔eader
+ for (int i = 1; i < 13; i++) {
+ line.add(Arrays.asList("鍑哄嫟璇︽儏", i + " 鏈�", "鍑哄嫟"));
+ for (Enums anEnum : enums) {
+ line.add(Arrays.asList("鍑哄嫟璇︽儏", i + " 鏈�", anEnum.getLabel()));
+ }
+ }
+ return line;
+ }
}
--
Gitblit v1.9.3