From 14de7390895b098f60d27e45f57037f5e232effb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Wed, 12 May 2021 10:28:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=A9=E6=95=88=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shenjian/dingding/DingTalkUtils.groovy | 24 +++++++++++++++++++ .../ProjectExport.groovy | 10 ++++---- .../ScoreExport.groovy | 8 ++++--- .../TaskExport.groovy | 20 +++++++++------- .../shenjian/statistics/DingTalkUtils.groovy | 13 ---------- 5 files changed, 46 insertions(+), 29 deletions(-) create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/DingTalkUtils.groovy rename projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/{statistics => dingding}/ProjectExport.groovy (95%) rename projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/{statistics => dingding}/ScoreExport.groovy (96%) rename projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/{statistics => dingding}/TaskExport.groovy (90%) delete mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/DingTalkUtils.groovy 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 new file mode 100644 index 000000000..5dda32688 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/DingTalkUtils.groovy @@ -0,0 +1,24 @@ +package com.fangjia.script.temp.shenjian.dingding + +import com.fangjia.script.util.DateUtils + + +/** + * 钉钉接口调用工具类 + * + * @author shenjian + * @since 2021/5/8 + */ +class DingTalkUtils { + + static main(String[] args) { + Date now = DateUtils.parseFromTightByPattern("2021-04-01", "yyyy-MM-dd") ; + + String startTime = DateUtils.addMonth(now, -1) + " 00:00:00" + 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) + } +} \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ProjectExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/ProjectExport.groovy similarity index 95% rename from projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ProjectExport.groovy rename to projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/ProjectExport.groovy index 0a243b841..efd9a2e3b 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ProjectExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/ProjectExport.groovy @@ -1,3 +1,5 @@ +package com.fangjia.script.temp.shenjian.dingding + import com.fangjia.script.statistics.ApiUtil import com.fangjia.script.statistics.Project import com.fangjia.script.statistics.ProjectLabel @@ -18,13 +20,11 @@ class ProjectExport { static final String monthStartTime = "2021-04-01 00:00:00" static final String endTime = "2021-04-30 23:59:59" - static void main(String[] args) { - export() + static main(args) { + export(startTime, monthStartTime, endTime) } - - - static void export() { + static export(def startTime, def monthStartTime, def endTime) { List> mergeData = new ArrayList<>() def sort = ["建行项目", "基础建设", "非农行项目", "农行项目"]; def result = [] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ScoreExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/ScoreExport.groovy similarity index 96% rename from projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ScoreExport.groovy rename to projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/ScoreExport.groovy index 58285190c..511c72846 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/ScoreExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/ScoreExport.groovy @@ -1,3 +1,5 @@ +package com.fangjia.script.temp.shenjian.dingding + import com.fangjia.script.statistics.ApiUtil import com.fangjia.script.statistics.Project import com.fangjia.script.statistics.ProjectLabel @@ -18,11 +20,11 @@ public class ScoreExport { static final String monthStartTime = "2021-04-01 00:00:00" static final String endTime = "2021-04-30 23:59:59" - static void main(String[] args) { - export() + static main(args) { + export(startTime, monthStartTime, endTime) } - static void export() { + static void export(def startTime, def monthStartTime, def endTime) { List> mergeData = new ArrayList<>() def sortedResult = [] sortedResult << ['项目类别', '工时', '所属项目', '项目经理'] diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/TaskExport.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy similarity index 90% rename from projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/TaskExport.groovy rename to projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy index 664b98e00..632d6ecb9 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/TaskExport.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/dingding/TaskExport.groovy @@ -1,3 +1,5 @@ +package com.fangjia.script.temp.shenjian.dingding + import com.fangjia.script.statistics.ApiUtil import com.fangjia.script.statistics.Project import com.fangjia.script.statistics.ProjectLabel @@ -12,30 +14,32 @@ import org.apache.commons.collections.CollectionUtils * @author shenjian * @since 2021/5/10 */ -class TaskExport { +public class TaskExport { static final String time = "2021年4月1日-2021年4月30日"; static final String startTime = "2021-03-01 00:00:00" static final String monthStartTime = "2021-04-01 00:00:00" static final String endTime = "2021-04-30 23:59:59" - static void main(String[] args) { - export() + static main(args) { + export(startTime, monthStartTime, endTime) } - static void export() { + static void export(def startTime, def monthStartTime, def endTime) { List> mergeData = new ArrayList<>() List list = new ArrayList<>() def result = [] result << ['姓名', '所属项目', '参与任务', '任务绩效值', '投入时间(天)'] int limitStart = 0 - List tasks = new ArrayList<>() + List tasks = ApiUtil.listTaskByPerson(startTime, endTime, limitStart, 50) List tempTasks = tasks; - while (tempTasks.isEmpty() || tempTasks.size() == 50) { - tempTasks = ApiUtil.listTaskByPerson(startTime, endTime, limitStart, 50) + while (tasks != null && tempTasks != null && tempTasks.size() == 50) { limitStart += 50 - tasks.addAll(tempTasks) + tempTasks = ApiUtil.listTaskByPerson(startTime, endTime, limitStart, 50) + if (CollectionUtils.isNotEmpty(tempTasks)) { + tasks.addAll(tempTasks) + } } for (Task task: tasks) { // 获取计划时间在当月的任务 diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/DingTalkUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/DingTalkUtils.groovy deleted file mode 100644 index 19efb9171..000000000 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/shenjian/statistics/DingTalkUtils.groovy +++ /dev/null @@ -1,13 +0,0 @@ - -/** - * 钉钉接口调用工具类 - * - * @author shenjian - * @since 2021/5/8 - */ -class DingTalkUtils { - - static void main(String[] args) { - - } -} \ No newline at end of file