From d1b5c9361e57318fa56fbb236fb2cc9e2111d029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Tue, 11 May 2021 16:03:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../temp/shenjian/statistics/DingTalkUtils.groovy | 3 +-- .../temp/shenjian/statistics/ProjectExport.groovy | 10 +++++++++- .../script/temp/shenjian/statistics/ScoreExport.groovy | 8 ++++++-- .../script/temp/shenjian/statistics/TaskExport.groovy | 4 ++++ 4 files changed, 20 insertions(+), 5 deletions(-) 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 index f49025b41..19efb9171 100644 --- 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 @@ -1,3 +1,4 @@ + /** * 钉钉接口调用工具类 * @@ -6,8 +7,6 @@ */ class DingTalkUtils { - final String key = "ding0243a5c51f1f4aa8"; - static void main(String[] args) { } 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/statistics/ProjectExport.groovy index 33ffdfee3..8c8dc6f64 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/statistics/ProjectExport.groovy @@ -19,8 +19,12 @@ class ProjectExport { static final String endTime = "2021-05-15 23:59:59" static void main(String[] args) { + export() + } + + public static void export() { List> mergeData = new ArrayList<>() - def sort = ["建行项目", "基础建设", "非农行项目", "农行项目", null]; + def sort = ["建行项目", "基础建设", "非农行项目", "农行项目"]; def result = [] List projects = ApiUtil.listProject(); @@ -59,6 +63,10 @@ class ProjectExport { || (org.apache.commons.lang3.StringUtils.isBlank(task.getPlanBeginTime()) && task.getCreateDate() < monthEndTime) ) { TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) + if (taskDetail == null) { + print("当前任务taskDetail为空:" + task) + continue; + } // 先取绩效,不存在则取工时 if (taskDetail.getFlowConten() != null) { totalTime += Double.valueOf(taskDetail.getFlowConten()) 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/statistics/ScoreExport.groovy index ce333aaa7..dcef469bd 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/statistics/ScoreExport.groovy @@ -11,7 +11,7 @@ import org.apache.commons.collections.CollectionUtils * @author shenjian * @since 2021/5/10 */ -class ScoreExport { +public class ScoreExport { static final String time = "2021年4月1日-2021年4月30日"; static final String startTime = "2021-04-01 00:00:00" @@ -19,10 +19,14 @@ class ScoreExport { static final String endTime = "2021-05-15 23:59:59" static void main(String[] args) { + export() + } + + static void export() { List> mergeData = new ArrayList<>() def sortedResult = [] sortedResult << ['项目类别', '工时', '所属项目', '项目经理'] - def sort = ["建行项目", "基础建设", "非农行项目", "农行项目", null]; + def sort = ["建行项目", "基础建设", "非农行项目", "农行项目"]; def result = [] List projects = ApiUtil.listProject(); for (Project project : projects) { 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/statistics/TaskExport.groovy index 182b34019..fc5bf1190 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/statistics/TaskExport.groovy @@ -20,6 +20,10 @@ class TaskExport { static final String endTime = "2021-05-15 23:59:59" static void main(String[] args) { + export() + } + + static void export() { List> mergeData = new ArrayList<>() List list = new ArrayList<>() def result = []