From a8c32d7276c67703b3e29693ca028c9d849b2c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Tue, 11 May 2021 13:39:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shenjian/statistics/ProjectExport.groovy | 22 +++++---- .../shenjian/statistics/ScoreExport.groovy | 48 ++++++++++++------- .../shenjian/statistics/TaskExport.groovy | 40 +++++++++++----- .../fangjia/script/statistics/ApiUtil.java | 9 ++-- 4 files changed, 78 insertions(+), 41 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 317fd8fdb..f1914cadd 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 @@ -15,7 +15,8 @@ class ProjectExport { static final String time = "2021年4月1日-2021年4月30日"; static final String startTime = "2021-04-01 00:00:00" - static final String endTime = "2021-04-30 23:59:59" + static final String monthEndTime = "2021-04-30 23:59:59" + static final String endTime = "2021-05-15 23:59:59" static void main(String[] args) { List> mergeData = new ArrayList<>() @@ -43,12 +44,17 @@ class ProjectExport { Double totalTime = 0D; if (CollectionUtils.isNotEmpty(tasks)) { for (Task task: tasks) { - TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) - // 先取绩效,不存在则取工时 - if (taskDetail.getFlowConten() != null) { - totalTime += Double.valueOf(taskDetail.getFlowConten()) - } else { - totalTime += Double.valueOf(taskDetail.getWorkTime()) + // 获取计划时间在当月的任务 + if ((org.apache.commons.lang3.StringUtils.isNotBlank(task.getPlanBeginTime()) && monthEndTime > task.getPlanBeginTime()) + || (org.apache.commons.lang3.StringUtils.isBlank(task.getPlanBeginTime()) && task.getCreateDate() < monthEndTime) + ) { + TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) + // 先取绩效,不存在则取工时 + if (taskDetail.getFlowConten() != null) { + totalTime += Double.valueOf(taskDetail.getFlowConten()) + } else { + totalTime += Double.valueOf(taskDetail.getWorkTime()) + } } } } @@ -72,7 +78,7 @@ class ProjectExport { mergeData.add(mergeRowCel) } - com.fangjia.script.util.ExcelUtils.write("F:\\数据\\绩效\\项目统计.xlsx", sortedResult, "项目统计", mergeData); + com.fangjia.script.util.ExcelUtils.write("F:\\数据\\绩效\\统计.xlsx", sortedResult, "项目统计", mergeData); } } 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 710ebd395..f5a7287a6 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 @@ -15,7 +15,8 @@ class ScoreExport { static final String time = "2021年4月1日-2021年4月30日"; static final String startTime = "2021-04-01 00:00:00" - static final String endTime = "2021-04-30 23:59:59" + static final String monthEndTime = "2021-04-30 23:59:59" + static final String endTime = "2021-05-15 23:59:59" static void main(String[] args) { List> mergeData = new ArrayList<>() @@ -39,27 +40,38 @@ class ScoreExport { ret[0] = label.getName() } } + if (project.getName() == "建行楼盘数据治理项目") { + println('建行楼盘数据治理项目') + } // 获取项目下任务 List tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime) if (CollectionUtils.isNotEmpty(tasks)) { for (Task task: tasks) { - TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) - boolean find = false - for (int i = 4; i < sortedResult[0].size(); i++) { - // 找到该项目下该负责人,则加工时 - if (sortedResult[0][i] == taskDetail.getResponse().getName()) { - if (ret[i] == null) { - ret[i] = Double.valueOf(taskDetail.getFlowConten()) - } else { - ret[i] += Double.valueOf(taskDetail.getFlowConten()) - } - find = true + // 获取计划时间在当月的任务 + if ((org.apache.commons.lang3.StringUtils.isNotBlank(task.getPlanBeginTime()) && monthEndTime > task.getPlanBeginTime()) + || (org.apache.commons.lang3.StringUtils.isBlank(task.getPlanBeginTime()) && task.getCreateDate() < monthEndTime) + ) { + TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) + boolean find = false + if (taskDetail.getResponse().getName() == '裴银银') { + println('裴银银') + } + for (int i = 4; i < sortedResult[0].size(); i++) { + // 找到该项目下该负责人,则加工时 + if (sortedResult[0][i] == taskDetail.getResponse().getName()) { + if (ret[i] == null) { + ret[i] = Double.valueOf(taskDetail.getFlowConten()) + } else { + ret[i] += Double.valueOf(taskDetail.getFlowConten()) + } + find = true + } + } + // 未找到,新增姓名 + if (!find) { + sortedResult[0][sortedResult[0].size()] = taskDetail.getResponse().getName() + ret[sortedResult[0].size() - 1] = Double.valueOf(taskDetail.getFlowConten()) } - } - // 未找到,新增姓名 - if (!find) { - sortedResult[0][sortedResult[0].size()] = taskDetail.getResponse().getName() - ret[ret.size()] = Double.valueOf(taskDetail.getFlowConten()) } } } @@ -112,7 +124,7 @@ class ScoreExport { allTotal[2] = "人员绩效总计" sortedResult << allTotal - com.fangjia.script.util.ExcelUtils.write("F:\\数据\\绩效\\绩效统计.xlsx", sortedResult, "绩效统计", mergeData); + com.fangjia.script.util.ExcelUtils.write("F:\\数据\\绩效\\统计.xlsx", sortedResult, "绩效统计", mergeData); } } 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 7d05209bc..182b34019 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 @@ -16,25 +16,43 @@ class TaskExport { static final String time = "2021年4月1日-2021年4月30日"; static final String startTime = "2021-04-01 00:00:00" - static final String endTime = "2021-04-30 23:59:59" + static final String monthEndTime = "2021-04-30 23:59:59" + static final String endTime = "2021-05-15 23:59:59" static void main(String[] args) { List> mergeData = new ArrayList<>() List list = new ArrayList<>() def result = [] result << ['姓名', '所属项目', '参与任务', '任务绩效值', '投入时间(天)'] - List tasks = ApiUtil.listTaskByPerson(startTime, endTime) + int limitStart = 0 + List tasks = new ArrayList<>() + List tempTasks = tasks; + + while (tempTasks.isEmpty() || tempTasks.size() == 50) { + tempTasks = ApiUtil.listTaskByPerson(startTime, endTime, limitStart, 50) + limitStart += 50 + tasks.addAll(tempTasks) + } for (Task task: tasks) { - TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) + // 获取计划时间在当月的任务 + if ((org.apache.commons.lang3.StringUtils.isNotBlank(task.getPlanBeginTime()) && monthEndTime > task.getPlanBeginTime()) + || (org.apache.commons.lang3.StringUtils.isBlank(task.getPlanBeginTime()) && task.getCreateDate() < monthEndTime) + ) { + TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) + if (taskDetail == null) { + print("当前任务taskDetail为空:" + task) + continue; + } - TaskPersonDTO dto = new TaskPersonDTO() - dto.name = task.response.name - dto.project = "" - dto.taskName = task.name - dto.score = Double.valueOf(taskDetail.flowConten) - dto.workTime = com.fangjia.script.common.DataHandleUtils.getDoubleRound(0, Double.valueOf(taskDetail.workTime)) + TaskPersonDTO dto = new TaskPersonDTO() + dto.name = task.response.name + dto.project = "" + dto.taskName = task.name + dto.score = org.apache.commons.lang3.StringUtils.isBlank(taskDetail.flowConten) ? 0d : Double.valueOf(taskDetail.flowConten) + dto.workTime = com.fangjia.script.common.DataHandleUtils.getDoubleRound(0, Double.valueOf(taskDetail.workTime)) - list.add(dto) + list.add(dto) + } } Collections.sort(list) @@ -87,7 +105,7 @@ class TaskExport { mergeData.add(data) } - com.fangjia.script.util.ExcelUtils.write("F:\\数据\\绩效\\任务统计.xlsx", result, "任务统计", mergeData); + com.fangjia.script.util.ExcelUtils.write("F:\\数据\\绩效\\统计.xlsx", result, "任务统计", mergeData); } } 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 10a2f60f4..1de09a0c9 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 @@ -270,12 +270,12 @@ public class ApiUtil { /** * 鑾峰彇浜哄憳浠诲姟鍒楄〃 */ - public static List listTaskByPerson(String startTime, String endTime) { + public static List listTaskByPerson(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("userid", ""); body.put("type", ""); body.put("timezone", ""); @@ -335,7 +335,8 @@ public class ApiUtil { public static void main(String[] args) { //List projects = ApiUtil.listProject(); - System.out.println(ApiUtil.listTaskByProject("d00fcb9c5307499eab8f9798a23f6360", "2021-04-01", "2021-04-30")); + 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.listTaskByPerson("2021-04-01 00:00:00", "2021-04-30 23:59:59")); }