From 66058f0a7152bc5c70f5d4348486c827e46977f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Mon, 10 May 2021 18:46:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=BB=E5=8A=A1=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shenjian/statistics/TaskExport.groovy | 104 +++++------------- .../fangjia/script/statistics/ApiUtil.java | 4 +- .../script/statistics/TaskPersonDTO.java | 31 ++++++ 3 files changed, 61 insertions(+), 78 deletions(-) create mode 100644 projects/fangjia-script/src/main/java/com/fangjia/script/statistics/TaskPersonDTO.java 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 f2e64dd9e..196e9950b 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 @@ -3,6 +3,7 @@ import com.fangjia.script.statistics.Project import com.fangjia.script.statistics.ProjectLabel import com.fangjia.script.statistics.Task import com.fangjia.script.statistics.TaskDetail +import com.fangjia.script.statistics.TaskPersonDTO import org.apache.commons.collections.CollectionUtils /** @@ -14,89 +15,40 @@ import org.apache.commons.collections.CollectionUtils class TaskExport { static final String time = "2021年4月1日-2021年4月30日"; - static final String startTime = "2021-04-01" - static final String endTime = "2021-04-30" + static final String startTime = "2021-04-01 00:00:00" + static final String endTime = "2021-04-30 23:59:59" static void main(String[] args) { - def sortedResult = [] - sortedResult << ['项目类别', '工时', '所属项目', '项目经理'] - def sort = ["建行项目", "基础建设", "非农行项目", "农行项目"]; + List list = new ArrayList<>() def result = [] - List projects = ApiUtil.listProject(); - for (Project project : projects) { + result << ['姓名', '所属项目', '参与任务', '任务绩效值', '投入时间(天)'] + List tasks = ApiUtil.listTaskByPerson(startTime, endTime) + for (Task task: tasks) { + TaskDetail taskDetail = ApiUtil.getTaskDetail(task.getId()) + + 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)) + + list.add(dto) + } + + Collections.sort(list) + + for (TaskPersonDTO dto : list) { def ret = [] - List labels = ApiUtil.listProjectLabel(project.getId()) - ret[2] = project.getName() - for (ProjectLabel label : labels) { - if ("商务负责人" == label.getGroups().getName()) { - if (ret[3] == null) { - ret[3] = label.getName() - } else { - ret[3] = ret[3] + "、" + label.getName() - } - } else if ("项目类别" == label.getGroups().getName()) { - ret[0] = label.getName() - } - } - // 获取项目下任务 - List tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime) - Double totalTime = 0D; - 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 (!find) { - sortedResult[0][sortedResult[0].size()] = taskDetail.getResponse().getName() - ret[ret.size()] = Double.valueOf(taskDetail.getFlowConten()) - } - } - } + ret[0] = dto.name; + ret[1] = dto.project; + ret[2] = dto.taskName; + ret[3] = dto.score; + ret[4] = dto.workTime; result << ret } - def allTotal = [] - for (def label : sort) { - def total = [] - for (def ret : result) { - if (ret[0] == label) { - sortedResult << ret - for (int i = 4; i < ret.size(); i++) { - if (total[i] == null) { - total[i] = ret[i] == null ? 0 : Double.valueOf(ret[i]) - } else { - total[i] += (ret[i] == null ? 0 : Double.valueOf(ret[i])) - } - } - } - } - total[1] = 0 - total[2] = "小计" - sortedResult << total - for (int i = 4; i < total.size(); i++) { - if (allTotal[i] == null) { - allTotal[i] = total[i] == null ? 0 : Double.valueOf(total[i]) - } else { - allTotal[i] += total[i] == null ? 0 : Double.valueOf(total[i]) - } - total[1] += total[i] == null ? 0 : Double.valueOf(total[i]) - } - } - allTotal[2] = "人员绩效总计" - sortedResult << allTotal - - com.fangjia.script.util.ExcelUtils.write("F:\\数据\\绩效\\绩效统计.xlsx", sortedResult, "绩效统计"); + com.fangjia.script.util.ExcelUtils.write("F:\\数据\\绩效\\任务统计.xlsx", result, "任务统计"); } } 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 33c96ae42..10a2f60f4 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 @@ -335,8 +335,8 @@ public class ApiUtil { public static void main(String[] args) { //List projects = ApiUtil.listProject(); - //System.out.println(ApiUtil.listTaskByProject("ecd77309ab1c4b83b54ee87b8ddd4f98", "2021-04-01", "2021-04-30")); + System.out.println(ApiUtil.listTaskByProject("d00fcb9c5307499eab8f9798a23f6360", "2021-04-01", "2021-04-30")); //System.out.println(ApiUtil.getTaskDetail("3bbb043ad0b44ea2a1213e725274e3ad")); - System.out.println(ApiUtil.listTaskByPerson("2021-04-01", "2021-04-30")); + //System.out.println(ApiUtil.listTaskByPerson("2021-04-01 00:00:00", "2021-04-30 23:59:59")); } } diff --git a/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/TaskPersonDTO.java b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/TaskPersonDTO.java new file mode 100644 index 000000000..d22c4a364 --- /dev/null +++ b/projects/fangjia-script/src/main/java/com/fangjia/script/statistics/TaskPersonDTO.java @@ -0,0 +1,31 @@ +package com.fangjia.script.statistics; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author shenjian + * @since 2021/5/10 + */ +@NoArgsConstructor +@Data +public class TaskPersonDTO implements Comparable { + + private String name; + private String project; + private String taskName; + private Double score; + private Double workTime; + + @Override + public int compareTo(TaskPersonDTO o2) { + if (this.getName().equals(o2.getName())) { + if (this.getProject() != null) { + return this.getProject().compareTo(o2.getProject()); + } + } else { + return this.getName().compareTo(o2.getName()); + } + return 0; + } +}