From e20f9c22f1aad5c996753994ea40ea109a848ef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Wed, 12 May 2021 10:56:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4=E4=BC=A0?= =?UTF-8?q?=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/temp/shenjian/dingding/DingTalkUtils.groovy | 4 ++-- .../script/temp/shenjian/dingding/TaskExport.groovy | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/DingTalkUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/DingTalkUtils.groovy index 5dda32688..00e7644b8 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/DingTalkUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/DingTalkUtils.groovy @@ -18,7 +18,7 @@ class DingTalkUtils { String monthStartTime = DateUtils.formatDateByPattern(now, "yyyy-MM-dd HH:mm:ss") String endTime = DateUtils.formatDateByPattern(DateUtils.getLastDayOfMonth(now), "yyyy-MM-dd") + " 23:59:59" ScoreExport.export(startTime, monthStartTime, endTime) - ProjectExport.export(monthStartTime, monthStartTime, endTime) - TaskExport.export(endTime, monthStartTime, endTime) + ProjectExport.export(startTime, monthStartTime, endTime) + TaskExport.export(startTime, monthStartTime, endTime) } } \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy index 632d6ecb9..a86e1a959 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy @@ -101,8 +101,14 @@ public class TaskExport { } def total = [] total[2] = "小计" - total[3] = map.get(result[result.size() - 1][0]).get("totalScore") - total[4] = map.get(result[result.size() - 1][0]).get("workTime") + if (map.get(result[result.size() - 1][0]) != null) { + total[3] = map.get(result[result.size() - 1][0]).get("totalScore") + total[4] = map.get(result[result.size() - 1][0]).get("workTime") + } else { + total[3] = 0 + total[4] = 0 + print("无该信息" + result[result.size() - 1][0]) + } result << total for (Map info : map.values()) {