|
@@ -1434,6 +1434,11 @@ public class InitController {
|
|
|
Map<String, WmDaDrugEntDrugtable> drugtableMap =
|
|
|
drugs.stream().collect(Collectors.toMap(WmDaDrugEntDrugtable::getId, Function.identity()));
|
|
|
|
|
|
+ // 丛缓存中获取任务类型
|
|
|
+ List<WmTaskType> range = operations.range(CacheConstants.TASK_TYPE_KEY, 0, -1);
|
|
|
+ Map<String, WmTaskType> taskTypeMap =
|
|
|
+ range.stream().collect(Collectors.toMap(WmTaskType::getId, Function.identity()));
|
|
|
+
|
|
|
List<WmScorePackage> pkgs = wmScorePackageService.list();
|
|
|
|
|
|
Map<String, WmScorePackage> pkgMap =
|
|
@@ -1443,8 +1448,8 @@ public class InitController {
|
|
|
his.stream().collect(Collectors.groupingBy(SysCheckChainNodeCheckHistory::getTargetId));
|
|
|
|
|
|
List<WmTask> tasks = taskService.list();
|
|
|
- Map<String, WmTask> taskMap = tasks.stream()
|
|
|
- .collect(Collectors.toMap(WmTask::getId, Function.identity()));
|
|
|
+ Map<String, WmTask> taskMap =
|
|
|
+ tasks.stream().collect(Collectors.toMap(WmTask::getId, Function.identity()));
|
|
|
|
|
|
// 获取任务
|
|
|
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
@@ -1468,18 +1473,18 @@ public class InitController {
|
|
|
SysUser sysUser = userMap.get(Integer.parseInt(taskUserId));
|
|
|
|
|
|
if (sysUser != null) {
|
|
|
- model.setSalesName(sysUser.getRealname());
|
|
|
- SysDept dept = deptMap.get(sysUser.getDeptId());
|
|
|
- model.setVendorName(dept.getName());
|
|
|
+ model.setSalesName(sysUser.getRealname());
|
|
|
+ SysDept dept = deptMap.get(sysUser.getDeptId());
|
|
|
+ model.setVendorName(dept.getName());
|
|
|
} else {
|
|
|
model.setSalesName("");
|
|
|
model.setVendorName("");
|
|
|
}
|
|
|
|
|
|
-
|
|
|
model.setArea("");
|
|
|
model.setTaskContentId(task.getTaskContentId());
|
|
|
- model.setTaskType(task.getTaskTypeId());
|
|
|
+ WmTaskType wmTaskType = taskTypeMap.get(task.getTaskTypeId());
|
|
|
+ model.setTaskType(wmTaskType == null ? "" : wmTaskType.getTaskTypeName());
|
|
|
|
|
|
WmScorePackage wmScorePackage = pkgMap.get(task.getScorePackageId());
|
|
|
|
|
@@ -1589,7 +1594,8 @@ public class InitController {
|
|
|
.collect(Collectors.joining(StrPool.COMMA));
|
|
|
String result =
|
|
|
v.stream()
|
|
|
- .map(h -> h.getCheckResult() ? "通过" : "拒绝")
|
|
|
+// .map(h -> h.getCheckResult() ? "通过" : "拒绝")
|
|
|
+ .map(h -> h.getCheckResult() ? "1" : "0")
|
|
|
.collect(Collectors.joining(StrPool.COMMA));
|
|
|
String msg =
|
|
|
v.stream()
|