3 コミット 95ab2d1999 ... d221f8c805

作者 SHA1 メッセージ 日付
  wutt d221f8c805 修改for循环中的查询语句 5 年 前
  wutt 2bb3e49890 Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper 5 年 前
  wutt 9c1a64ab83 修改for循环中的查询语句 5 年 前

+ 5 - 3
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -120,7 +120,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             style.setDataFormat(HSSFDataFormat.getBuiltinFormat("yy/mm/dd hh:mm"));
             //新增数据行 并且装填数据
             int rowNum = 1;
-            for (Map<String, Object> map : reportMapper.getAllReportByDate(date)) {
+            List<Map<String, Object>> allReportByDate = reportMapper.getAllReportByDate(date);
+            for (Map<String, Object> map : allReportByDate) {
                 HSSFRow row = sheet.createRow(rowNum);
                 row.createCell(0).setCellValue(rowNum);
                 row.createCell(1).setCellValue((String) map.get("name"));
@@ -167,10 +168,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             //以下区间被认为是工作时间
             Integer[] workType = {-1, 0, 1, 2, 3, 4, 5};
             //工作时间筛选
-            for (TimeCalculation timeCalculation : timeCalculationMapper.selectList(new QueryWrapper<TimeCalculation>()
+            List<TimeCalculation> timeCalculations = timeCalculationMapper.selectList(new QueryWrapper<TimeCalculation>()
                     .eq("date", LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy-MM-dd")))
                     .eq("user_id", userId)
-                    .in("action_type", workType))) {
+                    .in("action_type", workType));
+            for (TimeCalculation timeCalculation : timeCalculations) {
                 totalWorkingTime += timeCalculation.getDuration();
             }
             //把总秒数转为double后换算为小时并保留两位小数

+ 3 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ScreenshotServiceImpl.java

@@ -236,10 +236,11 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
         Map<String, Object> resultMap = new HashMap<>();
         List<String> srcList = new ArrayList<>();
         List<Object> dataList = new ArrayList<>();
-        for (Screenshot screenshot : screenshotMapper.selectList(new QueryWrapper<Screenshot>()
+        List<Screenshot> screenshots = screenshotMapper.selectList(new QueryWrapper<Screenshot>()
                 .eq("date_str", LocalDate.now(ZoneOffset.of("+8")))
                 .eq("uid", userId)
-                .orderByDesc("indate"))) {
+                .orderByDesc("indate"));
+        for (Screenshot screenshot : screenshots) {
             srcList.add(screenshot.getPicUrl());
             Map<String, Object> map = new HashMap<>();
             map.put("time", screenshot.getIndate().toLocalTime());

+ 3 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/TimeCalculationServiceImpl.java

@@ -106,8 +106,9 @@ public class TimeCalculationServiceImpl extends ServiceImpl<TimeCalculationMappe
                 //然后根据日期和用户id获取到所有的记录 然后手动累加在一起
                 Long[] timeArray = {0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L, 0L};
                 //其他 编程 上网 文档 设计 美工 运营 看小说 影视娱乐 听音乐
-                for (Map<String, Object> dataMap : timeCalculationMapper
-                        .getTodayStatistics((String) userMap.get("id"), date, companyId)) {
+                List<Map<String, Object>> tatistics = timeCalculationMapper
+                        .getTodayStatistics((String) userMap.get("id"), date, companyId);
+                for (Map<String, Object> dataMap : tatistics) {
                     timeArray[(int) dataMap.get("type") + 1] += (Long) dataMap.get("duration");
                 }
                 Long[] resultArray = new Long[6];