|
@@ -364,7 +364,8 @@ public class WmPackageManager {
|
|
|
|
|
|
// 获取任务类型
|
|
|
List<WmTaskType> taskTypes = taskTypeService.listParentTaskType();
|
|
|
- Map<String, WmTaskType> taskTypeName2EntityMap = taskTypes.stream().collect(Collectors.toMap(WmTaskType::getTaskTypeName, Function.identity(), (v1, v2) -> v2));
|
|
|
+ Map<String, WmTaskType> taskTypeName2EntityMap = taskTypes.stream()
|
|
|
+ .collect(Collectors.toMap(WmTaskType::getTaskTypeName, Function.identity(), (v1, v2) -> v2));
|
|
|
|
|
|
// 获取完成的任务数量
|
|
|
List<WmTask> tasks = taskService.listPkgTasks(pkgId.toString());
|
|
@@ -577,6 +578,7 @@ public class WmPackageManager {
|
|
|
int tt12submit = 0;
|
|
|
int tt13submit = 0;
|
|
|
int tt1submit = 0;
|
|
|
+ int tt2submit = 0;
|
|
|
int tt5submit = 0;
|
|
|
int tt3submit = 0;
|
|
|
int tt4submit = 0;
|
|
@@ -627,6 +629,10 @@ public class WmPackageManager {
|
|
|
tt1submit++;
|
|
|
}
|
|
|
|
|
|
+ if (StrUtil.equals(taskTypeId, "2")) {
|
|
|
+ tt2submit++;
|
|
|
+ }
|
|
|
+
|
|
|
if (StrUtil.equals(taskTypeId, "5")) {
|
|
|
tt5submit++;
|
|
|
}
|
|
@@ -658,6 +664,7 @@ public class WmPackageManager {
|
|
|
model.setTt12submit(String.valueOf(tt12submit));
|
|
|
model.setTt13submit(String.valueOf(tt13submit));
|
|
|
model.setTt1submit(String.valueOf(tt1submit));
|
|
|
+ model.setTt2submit(String.valueOf(tt2submit));
|
|
|
model.setTt5submit(String.valueOf(tt5submit));
|
|
|
model.setTt3submit(String.valueOf(tt3submit));
|
|
|
model.setTt4submit(String.valueOf(tt4submit));
|
|
@@ -679,6 +686,7 @@ public class WmPackageManager {
|
|
|
int tt12dist = 0;
|
|
|
int tt13dist = 0;
|
|
|
int tt1dist = 0;
|
|
|
+ int tt2dist = 0;
|
|
|
int tt5dist = 0;
|
|
|
int tt3dist = 0;
|
|
|
int tt4dist = 0;
|
|
@@ -726,6 +734,10 @@ public class WmPackageManager {
|
|
|
tt1dist += packageTaskTypeQty.getQty();
|
|
|
}
|
|
|
|
|
|
+ if (StrUtil.equals(taskTypeName, "区县学术会议")) {
|
|
|
+ tt2dist += packageTaskTypeQty.getQty();
|
|
|
+ }
|
|
|
+
|
|
|
if (StrUtil.equals(taskTypeName, "沙龙会")) {
|
|
|
tt5dist += packageTaskTypeQty.getQty();
|
|
|
}
|
|
@@ -758,6 +770,7 @@ public class WmPackageManager {
|
|
|
model.setTt12dist(String.valueOf(tt12dist));
|
|
|
model.setTt13dist(String.valueOf(tt13dist));
|
|
|
model.setTt1dist(String.valueOf(tt1dist));
|
|
|
+ model.setTt2dist(String.valueOf(tt2dist));
|
|
|
model.setTt5dist(String.valueOf(tt5dist));
|
|
|
model.setTt3dist(String.valueOf(tt3dist));
|
|
|
model.setTt4dist(String.valueOf(tt4dist));
|
|
@@ -778,6 +791,7 @@ public class WmPackageManager {
|
|
|
int tt12Checked = 0;
|
|
|
int tt13checked = 0;
|
|
|
int tt1checked = 0;
|
|
|
+ int tt2Checked = 0;
|
|
|
int tt5checked = 0;
|
|
|
int tt3checked = 0;
|
|
|
int tt4checked = 0;
|
|
@@ -846,6 +860,10 @@ public class WmPackageManager {
|
|
|
tt1checked++;
|
|
|
}
|
|
|
|
|
|
+ if (StrUtil.equals(taskTypeId, "2")) {
|
|
|
+ tt2Checked++;
|
|
|
+ }
|
|
|
+
|
|
|
if (StrUtil.equals(taskTypeId, "5")) {
|
|
|
tt5checked++;
|
|
|
}
|
|
@@ -878,6 +896,7 @@ public class WmPackageManager {
|
|
|
model.setTt12Checked(String.valueOf(tt12Checked));
|
|
|
model.setTt13checked(String.valueOf(tt13checked));
|
|
|
model.setTt1checked(String.valueOf(tt1checked));
|
|
|
+ model.setTt2checked(String.valueOf(tt2Checked));
|
|
|
model.setTt5checked(String.valueOf(tt5checked));
|
|
|
model.setTt3checked(String.valueOf(tt3checked));
|
|
|
model.setTt4checked(String.valueOf(tt4checked));
|