diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index ff9f33e..ace1b4e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -8683,17 +8683,39 @@ public class ViewFacade { public BaseObjectResponse getCheckList(String id) { BaseObjectResponse br = new BaseObjectResponse(); - BabyCheckModelQuery babyCheckModel = new BabyCheckModelQuery(); - babyCheckModel.setBuildId(id); - babyCheckModel.setYn(YnEnums.YES.getId()); - babyCheckModel.setSort("created asc"); + List checkListResults = new LinkedList<>(); - List babyCheckList = babyCheckService.queryBabyCheckListRecord(babyCheckModel); - if (CollectionUtils.isNotEmpty(babyCheckList)) { - for (BabyCheckModel babyCheck : babyCheckList) { - checkListResults.add(getBabyCheckListResult(babyCheck)); + + BabyModel babyModel = babyBookbuildingService.queryBabyBuildById(id); + + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setMcertNo(babyModel.getMcertNo()); + List babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + List buildIds = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(babyModels)) + { + for (BabyModel model : babyModels) + { + buildIds.add(model.getId()); + } + } + + if (CollectionUtils.isNotEmpty(buildIds)) + { + BabyCheckModelQuery babyCheckModel = new BabyCheckModelQuery(); + String[] strings = new String[buildIds.size()]; + babyCheckModel.setBuildIds(buildIds.toArray(strings)); + babyCheckModel.setYn(YnEnums.YES.getId()); + babyCheckModel.setSort("created asc"); + + List babyCheckList = babyCheckService.queryBabyCheckListRecord(babyCheckModel); + if (CollectionUtils.isNotEmpty(babyCheckList)) { + for (BabyCheckModel babyCheck : babyCheckList) { + checkListResults.add(getBabyCheckListResult(babyCheck)); + } } } + br.setData(checkListResults); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功");