优化时间问题

This commit is contained in:
沈健
2021-05-11 13:39:54 +08:00
parent dbcf202d22
commit 87c938d283
4 changed files with 66 additions and 36 deletions
@@ -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<List<Integer>> 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())
}
}
}
}
@@ -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<List<Integer>> mergeData = new ArrayList<>()
@@ -43,23 +44,28 @@ class ScoreExport {
List<Task> 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())
// 获取计划时间在当月的任务
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
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
}
find = true
}
}
// 未找到,新增姓名
if (!find) {
sortedResult[0][sortedResult[0].size()] = taskDetail.getResponse().getName()
ret[ret.size()] = Double.valueOf(taskDetail.getFlowConten())
// 未找到,新增姓名
if (!find) {
sortedResult[0][sortedResult[0].size()] = taskDetail.getResponse().getName()
ret[ret.size()] = Double.valueOf(taskDetail.getFlowConten())
}
}
}
}
@@ -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<List<Integer>> mergeData = new ArrayList<>()
List<TaskPersonDTO> list = new ArrayList<>()
def result = []
result << ['姓名', '所属项目', '参与任务', '任务绩效值', '投入时间(天)']
List<Task> tasks = ApiUtil.listTaskByPerson(startTime, endTime)
int limitStart = 0
List<Task> tasks = new ArrayList<>()
List<Task> 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)
@@ -270,12 +270,12 @@ public class ApiUtil {
/**
* 获取人员任务列表
*/
public static List<Task> listTaskByPerson(String startTime, String endTime) {
public static List<Task> listTaskByPerson(String startTime, String endTime, int limitStart, int limitNum) {
List<Task> 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", "");