diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java index fbcbe42..e828d18 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/EntrustController.java @@ -517,7 +517,8 @@ public class EntrustController extends BladeController { List list = examineService.list(lambdaQueryWrapper); if (CollectionUtils.isNotEmpty(list)) { for (Examine examine : list) { - if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { + // 2022年10月11日20:31:27 感觉没必要,而且影响前端数据展示 +// if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId()); if (examineItem != null) { examine.setExamineItemName(examineItem.getName()); @@ -537,7 +538,7 @@ public class EntrustController extends BladeController { examine.setExamineByName(user.getName()); } } - } +// } } entrust.setExamines(list); } @@ -568,7 +569,7 @@ public class EntrustController extends BladeController { if (examines != null && examines.size() > 0) { List examineList = new ArrayList<>(); for (Examine examine : examines) { - if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { +// if (examine.getExperieNum() != null && !"".equals(examine.getExperieNum())) { ExamineItem examineItem = examineItemService.getById(examine.getExamineItemId()); if (examineItem != null) { examine.setExamineItemName(examineItem.getName()); @@ -589,7 +590,7 @@ public class EntrustController extends BladeController { } } examineList.add(examine); - } +// } } eTask.setExamines(examineList); if (eTask.getSimpleReceiver() != null && !eTask.getSimpleReceiver().equals("")) { @@ -619,12 +620,12 @@ public class EntrustController extends BladeController { taskBlueprint.setTaskIssuedBy(user1.getName()); } } - + // 待分样 if ("1".equals(entrust.getEntrustStatus())) { map.put("entrust", entrust); return R.data(map); } - //待计划 + // 待计划 if ("2".equals(entrust.getEntrustStatus())) { map.put("entrust", entrust); map.put("simple", simpleList);