From 1e98b447d4daf4f932b5992887272d296a23fe13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Tue, 11 May 2021 15:48:15 +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 --- .../shenjian/statistics/ProjectExport.groovy | 14 +++++++++++-- .../shenjian/statistics/ScoreExport.groovy | 21 ++++++++++++------- .../fangjia/script/statistics/ApiUtil.java | 13 ++++++------ 3 files changed, 33 insertions(+), 15 deletions(-) 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 f1914cadd..33ffdfee3 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 @@ -20,7 +20,7 @@ class ProjectExport { static void main(String[] args) { List> mergeData = new ArrayList<>() - def sort = ["建行项目", "基础建设", "非农行项目", "农行项目"]; + def sort = ["建行项目", "基础建设", "非农行项目", "农行项目", null]; def result = [] List projects = ApiUtil.listProject(); @@ -40,7 +40,17 @@ class ProjectExport { } } // 获取项目总工时 - List tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime) + int limitStart = 0 + List tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime, limitStart, 50) + List tempTasks = tasks; + + while (tasks != null && tempTasks != null && tasks.size() == 50) { + tempTasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime, limitStart, 50) + limitStart += 50 + if (CollectionUtils.isNotEmpty(tempTasks)) { + tasks.addAll(tempTasks) + } + } Double totalTime = 0D; if (CollectionUtils.isNotEmpty(tasks)) { for (Task task: tasks) { 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 f5a7287a6..ce333aaa7 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 @@ -22,7 +22,7 @@ class ScoreExport { List> mergeData = new ArrayList<>() def sortedResult = [] sortedResult << ['项目类别', '工时', '所属项目', '项目经理'] - def sort = ["建行项目", "基础建设", "非农行项目", "农行项目"]; + def sort = ["建行项目", "基础建设", "非农行项目", "农行项目", null]; def result = [] List projects = ApiUtil.listProject(); for (Project project : projects) { @@ -40,11 +40,18 @@ class ScoreExport { ret[0] = label.getName() } } - if (project.getName() == "建行楼盘数据治理项目") { - println('建行楼盘数据治理项目') - } // 获取项目下任务 - List tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime) + int limitStart = 0 + List tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime, limitStart, 50) + List tempTasks = tasks; + + while (tasks != null && tempTasks != null && tasks.size() == 50) { + tempTasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime, limitStart, 50) + limitStart += 50 + if (CollectionUtils.isNotEmpty(tempTasks)) { + tasks.addAll(tempTasks) + } + } if (CollectionUtils.isNotEmpty(tasks)) { for (Task task: tasks) { // 获取计划时间在当月的任务 @@ -53,8 +60,8 @@ class ScoreExport { ) { TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) boolean find = false - if (taskDetail.getResponse().getName() == '裴银银') { - println('裴银银') + if (taskDetail.getResponse().getName() == '穆良书' && taskDetail.getName() == "模型级联算法方案设计") { + println('穆良书') } for (int i = 4; i < sortedResult[0].size(); i++) { // 找到该项目下该负责人,则加工时 diff --git a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java index 1de09a0c9..40cdb1790 100644 --- a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java +++ b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/ApiUtil.java @@ -236,12 +236,12 @@ public class ApiUtil { * * @return */ - public static List listTaskByProject(String projectId, String startTime, String endTime) { + public static List listTaskByProject(String projectId, String startTime, String endTime, int limitStart, int limitNum) { List tasks = null; try { JSONObject body = new JSONObject(); - body.put("limitStart", "0"); - body.put("limitNum", "50"); + body.put("limitStart", limitStart); + body.put("limitNum", limitNum); body.put("projectId", projectId); body.put("createtimeStart", startTime); body.put("createtimeEnd", endTime); @@ -335,9 +335,10 @@ public class ApiUtil { public static void main(String[] args) { //List projects = ApiUtil.listProject(); - System.out.println(ApiUtil.listTaskByProject("457f11e89aad42b6a7bb289e8341ac04", "2021-04-01", "2021-05-15")); - System.out.println(ApiUtil.listTaskByProject("41bdf23cbf634035b694f92ba72b067f", "2021-04-01", "2021-05-15")); - //System.out.println(ApiUtil.getTaskDetail("3bbb043ad0b44ea2a1213e725274e3ad")); + System.out.println(ApiUtil.listTaskByProject("e7caf92da7be4c529c8733cbb196173e", "2021-04-01", "2021-05-15", 0, 50)); + ApiUtil.listProjectLabel("e7caf92da7be4c529c8733cbb196173e"); + //System.out.println(ApiUtil.getTaskDetail("d08c7c2c852048aebc8aa59d48cfbd21")); + //System.out.println(ApiUtil.getTaskDetail("d08c7c2c852048aebc8aa59d48cfbd21")); //System.out.println(ApiUtil.listTaskByPerson("2021-04-01 00:00:00", "2021-04-30 23:59:59")); } }