修复无标签项目显示
This commit is contained in:
+12
-2
@@ -20,7 +20,7 @@ class ProjectExport {
|
||||
|
||||
static void main(String[] args) {
|
||||
List<List<Integer>> mergeData = new ArrayList<>()
|
||||
def sort = ["建行项目", "基础建设", "非农行项目", "农行项目"];
|
||||
def sort = ["建行项目", "基础建设", "非农行项目", "农行项目", null];
|
||||
def result = []
|
||||
|
||||
List<Project> projects = ApiUtil.listProject();
|
||||
@@ -40,7 +40,17 @@ class ProjectExport {
|
||||
}
|
||||
}
|
||||
// 获取项目总工时
|
||||
List<Task> tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime)
|
||||
int limitStart = 0
|
||||
List<Task> tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime, limitStart, 50)
|
||||
List<Task> 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) {
|
||||
|
||||
+14
-7
@@ -22,7 +22,7 @@ class ScoreExport {
|
||||
List<List<Integer>> mergeData = new ArrayList<>()
|
||||
def sortedResult = []
|
||||
sortedResult << ['项目类别', '工时', '所属项目', '项目经理']
|
||||
def sort = ["建行项目", "基础建设", "非农行项目", "农行项目"];
|
||||
def sort = ["建行项目", "基础建设", "非农行项目", "农行项目", null];
|
||||
def result = []
|
||||
List<Project> projects = ApiUtil.listProject();
|
||||
for (Project project : projects) {
|
||||
@@ -40,11 +40,18 @@ class ScoreExport {
|
||||
ret[0] = label.getName()
|
||||
}
|
||||
}
|
||||
if (project.getName() == "建行楼盘数据治理项目") {
|
||||
println('建行楼盘数据治理项目')
|
||||
}
|
||||
// 获取项目下任务
|
||||
List<Task> tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime)
|
||||
int limitStart = 0
|
||||
List<Task> tasks = ApiUtil.listTaskByProject(project.getId(), startTime, endTime, limitStart, 50)
|
||||
List<Task> 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++) {
|
||||
// 找到该项目下该负责人,则加工时
|
||||
|
||||
@@ -236,12 +236,12 @@ public class ApiUtil {
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
public static List<Task> listTaskByProject(String projectId, String startTime, String endTime) {
|
||||
public static List<Task> listTaskByProject(String projectId, 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("projectId", projectId);
|
||||
body.put("createtimeStart", startTime);
|
||||
body.put("createtimeEnd", endTime);
|
||||
@@ -335,9 +335,10 @@ public class ApiUtil {
|
||||
|
||||
public static void main(String[] args) {
|
||||
//List<Project> 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"));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user