From e8717e29eed1d17c780ea240c5224ff58867b326 Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期二, 04 六月 2024 11:58:21 +0800 Subject: [PATCH] 2024-6-4 班次调整 --- performance-server/src/main/java/com/yuanchu/mom/service/impl/PerformanceShiftServiceImpl.java | 269 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 215 insertions(+), 54 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 b0f4c58..db37821 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,7 +3,6 @@ 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; @@ -14,17 +13,20 @@ 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; +import org.springframework.util.ObjectUtils; +import java.math.BigDecimal; 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.*; -import java.util.stream.Collectors; /** * <p> @@ -40,11 +42,10 @@ @Autowired private EnumService enumService; - public List<PerformanceShift> list = new ArrayList<>(); - @Transactional(rollbackFor = Exception.class) @Override public void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto) { + List<PerformanceShift> list = new ArrayList<>(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); String formattedDateTime = performanceShiftAddDto.getStartWeek().format(formatter); String[] splitUserId = performanceShiftAddDto.getUserId().split(","); @@ -58,22 +59,21 @@ LocalDate lastDayOfMonth = performanceShiftAddDto.getEndWeek().toLocalDate().with(TemporalAdjusters.lastDayOfMonth()); List<LocalDateTime> localDateTimesBetween = getLocalDateTimesBetween(firstDayOfMonth.atStartOfDay(), lastDayOfMonth.atStartOfDay()); localDateTimesBetween.forEach(i -> { - for (String s : splitUserId) { - PerformanceShift performanceShift = new PerformanceShift(); - performanceShift.setUserId(Integer.valueOf(s)); - performanceShift.setWorkTime(i); - performanceShift.setShift(""); - list.add(performanceShift); - } + PerformanceShift performanceShift = new PerformanceShift(); + performanceShift.setUserId(Integer.valueOf(userId)); + performanceShift.setWorkTime(i); + performanceShift.setShift(""); + list.add(performanceShift); if (list.size() >= 1000) { baseMapper.insertBatchSomeColumn(list); list.clear(); } }); - if (!list.isEmpty()) { - baseMapper.insertBatchSomeColumn(list); - } } + } + if (!list.isEmpty()) { + baseMapper.insertBatchSomeColumn(list); + list.clear(); } // 鍐嶆鏇存柊 List<LocalDateTime> datesBetween = getLocalDateTimesBetween(performanceShiftAddDto.getStartWeek(), performanceShiftAddDto.getEndWeek()); @@ -99,30 +99,40 @@ List<Map<String, Object>> mapYearIPage = baseMapper.performanceShiftYearPage(time, userName, laboratory); mapIPage.getRecords().forEach(i -> { String[] shiftTimes = i.getShiftTime().split(";"); - int totalAttendance = 0; - List<Object> map = new ArrayList<>(); + double totalAttendance = 0; + 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())) { 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); + BigDecimal bigDecimal = new BigDecimal(i.getMonthlyAttendance().get(enums.getLabel()).toString()); + i.getMonthlyAttendance().put(enums.getLabel(), bigDecimal.add(new BigDecimal("1"))); + } + // 鍗婏紝鍙﹀鍗婂ぉ绠楃粰鏃� + if (shiftTimeAndShift[1].equals("5") && enums.getValue().equals("0")) { + BigDecimal bigDecimal = new BigDecimal(i.getMonthlyAttendance().get(enums.getLabel()).toString()); + i.getMonthlyAttendance().put(enums.getLabel(), bigDecimal.add(new BigDecimal("0.5"))); } } - if (shiftTimeAndShift[1].equals("1") || shiftTimeAndShift[1].equals("2") || shiftTimeAndShift[1].equals("0")) { + // 鏃╋紝涓紝澶滐紝宸� + if (shiftTimeAndShift[1].equals("1") || shiftTimeAndShift[1].equals("2") || shiftTimeAndShift[1].equals("0") || shiftTimeAndShift[1].equals("6")) { i.getMonthlyAttendance().put("totalAttendance", totalAttendance += 1); + } + // 鍗� + if (shiftTimeAndShift[1].equals("5")) { + i.getMonthlyAttendance().put("totalAttendance", totalAttendance += 0.5); } hashMap.put("id", shiftTimeAndShift[2]); hashMap.put("shift", shiftTimeAndShift[1]); hashMap.put("time", shiftTimeAndShift[0]); map.add(hashMap); } - int totalYearAttendance = 0; + double totalYearAttendance = 0; Map<String, Object> hashMap = new HashMap<>(); for (Map<String, Object> record : mapYearIPage) { if (record.get("user_id").toString().equals(i.getUserId())) { @@ -131,12 +141,21 @@ hashMap.put(enums.getLabel(), 0); } if (enums.getValue().equals(record.get("shift"))) { - Integer num = (Integer) hashMap.get(enums.getLabel()); - hashMap.put(enums.getLabel(), num += 1); + BigDecimal num = new BigDecimal(hashMap.get(enums.getLabel()).toString()); + hashMap.put(enums.getLabel(), num.add(new BigDecimal("1"))); + } + // 鍗婏紝鍙﹀鍗婂ぉ绠楃粰鏃� + if (record.get("shift").equals("5") && enums.getValue().equals("0")) { + BigDecimal bigDecimal = new BigDecimal(hashMap.get(enums.getLabel()).toString()); + hashMap.put(enums.getLabel(), bigDecimal.add(new BigDecimal("0.5"))); } } - if (record.get("shift").equals("1") || record.get("shift").equals("2") || record.get("shift").equals("0")) { + if (record.get("shift").equals("1") || record.get("shift").equals("2") || record.get("shift").equals("0") || record.get("shift").equals("6")) { hashMap.put("totalAttendance", totalYearAttendance += 1); + } + // 鍗� + if (record.get("shift").equals("5")) { + hashMap.put("totalAttendance", totalYearAttendance += 0.5); } } } @@ -182,34 +201,44 @@ } // 骞村垎椤典笌瀵煎嚭鍏卞悓浣跨敤 - public List<Map<String, Object>> annualAttendanceProcessing(List<Map<String, Object>> mapYearList, List<Enums> shiftType){ + 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 HashMap<>(); + Map<String, Object> resultMap = new LinkedHashMap<>(); Map<String, Object> hashMapYear = new LinkedHashMap<>(); - int totalYearAttendance = 0; + double 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); + double totalMonthAttendance = 0; + for (Enums shift : shiftType) { + // 鍒濆鍖栬祴鍊� + if (!hashMapYear.containsKey(shift.getLabel())) { + hashMapYear.put(shift.getLabel(), 0); } // 鏈� - if (ObjectUtils.isNotEmpty(map.get("month_str")) && map.get("work_time").equals(i)) { + if (!ObjectUtils.isEmpty(map.get("month_str"))) { 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")) { + int count = countOccurrences(charArray, i + "锛�" + shift.getValue()); + hashMapMonth.put(shift.getLabel(), count); + hashMapYear.put(shift.getLabel(), new BigDecimal(hashMapYear.get(shift.getLabel()).toString()).add(new BigDecimal(count))); + // 鏃╋紝涓紝澶滐紝宸� + if (shift.getValue().equals("0") || shift.getValue().equals("1") || shift.getValue().equals("2") || shift.getValue().equals("6")) { totalMonthAttendance += count; totalYearAttendance += count; + } +// 鍗婏紝鍙﹀鍗婂ぉ绠楃粰鏃� + if (shift.getValue().equals("5")) { + BigDecimal multiply = new BigDecimal("0.5").multiply(new BigDecimal(count)).setScale(1, BigDecimal.ROUND_CEILING); + hashMapMonth.put(shiftType.get(0).getLabel(), new BigDecimal(hashMapMonth.get(shiftType.get(0).getLabel()).toString()).add(multiply)); + hashMapYear.put(shiftType.get(0).getLabel(), new BigDecimal(hashMapYear.get(shiftType.get(0).getLabel()).toString()).add(multiply)); + totalMonthAttendance += multiply.doubleValue(); + totalYearAttendance += multiply.doubleValue(); } } // 绌烘暟鎹� else { map.put("work_time", i); - hashMapMonth.put(enums.getLabel(), 0); + hashMapMonth.put(shift.getLabel(), 0); } } hashMapMonth.put("totalMonthAttendance", totalMonthAttendance); @@ -227,34 +256,106 @@ public static int countOccurrences(String str, String target) { int count = 0; int index = 0; - while ((index = str.indexOf(target, index))!= -1) { + while ((index = str.indexOf(target, index)) != -1) { count++; index += target.length(); } return count; } - public void dataRequiredForProcessingIntoExcel(List<Map<String, Object>> list){ - Map<Object, List<Map<String, Object>>> userId = list.stream().collect(Collectors.groupingBy(i -> i.get("user_id"))); - userId.forEach((k, v) -> { - System.out.println(k); - System.out.println("============="); - System.out.println(v); - }); + 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 -> { + if (!j.getValue().equals("5")) { + 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) { + if (!anEnum.getValue().equals("5")) { + 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) { + 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); - dataRequiredForProcessingIntoExcel(mapYearList); - map.put("data", mapYearList); + 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(";"); + double 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])) { + BigDecimal bigDecimal = new BigDecimal(i.getMonthlyAttendance().get(enums.getLabel()).toString()); + i.getMonthlyAttendance().put(enums.getLabel(), bigDecimal.add(new BigDecimal("1"))); + } + // 鍗婏紝鍙﹀鍗婂ぉ绠楃粰鏃� + if (shiftTimeAndShift[1].equals("5") && enums.getValue().equals("0")) { + BigDecimal bigDecimal = new BigDecimal(i.getMonthlyAttendance().get(enums.getLabel()).toString()); + i.getMonthlyAttendance().put(enums.getLabel(), bigDecimal.add(new BigDecimal("0.5"))); + } + } + // 鏃╋紝涓紝澶滐紝宸� + if (shiftTimeAndShift[1].equals("1") || shiftTimeAndShift[1].equals("2") || shiftTimeAndShift[1].equals("0") || shiftTimeAndShift[1].equals("6")) { + i.getMonthlyAttendance().put("totalAttendance", totalAttendance += 1); + } + // 鍗� + if (shiftTimeAndShift[1].equals("5")) { + i.getMonthlyAttendance().put("totalAttendance", totalAttendance += 0.5); + } + 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; } @@ -309,26 +410,86 @@ /** * 杩斿洖琛ㄥご - * + * <p> * 澶栧眰List浠h〃琛屽唴灞� List浠h〃鍒� 鐩稿悓鐨勫垪鏁版嵁浼氳涓诲姩鍚堝苟 * 鏋勯�犲弻鍒楄〃澶� - * @return List<List<String>> + * + * @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("鍑哄嫟璇︽儏", year, "鍑哄嫟")); // 骞� header for (Enums anEnum : enums) { - line.add(Arrays.asList("鑰冨嫟姹囨��", month, anEnum.getLabel())); + if (!anEnum.getValue().equals("5")) { + line.add(Arrays.asList("鑰冨嫟姹囨��", year, 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())); + if (!anEnum.getValue().equals("5")) { + line.add(Arrays.asList("鍑哄嫟璇︽儏", i + " 鏈�", anEnum.getLabel())); + } } } 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(list.get(i).getMonthlyAttendance().get(enums.get(6).getLabel())); // 宸� + 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; + } } -- Gitblit v1.9.3