diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index d1cd610..2e63c5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -100,7 +100,19 @@ public class BabyBuildController extends BaseController { @RequestMapping(value = "/queryBabyBuildById/{id}", method = RequestMethod.GET) @ResponseBody public BaseObjectResponse queryBabyBuildById(@PathVariable("id") String id) { - return babyBookbuildingFacade.queryBabyBuildById(id); + return babyBookbuildingFacade.queryBabyBuildById(id,true); + } + + + /** + * 预建档查询 + * @param id + * @return + */ + @RequestMapping(value = "/queryBabyTempBuildById/{id}", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse queryBabyTempBuildById(@PathVariable("id") String id) { + return babyBookbuildingFacade.queryBabyTempBuildById(id,false); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 294245c..9bb75ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1291,11 +1291,19 @@ public class BabyBookbuildingFacade { * @param id * @return */ - public BaseObjectResponse queryBabyBuildById(String id) { + public BaseObjectResponse queryBabyBuildById(String id,boolean isBuild) { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setId(id); - babyQuery.setYn(YnEnums.YES.getId()); + if (isBuild) + { + babyQuery.setYn(YnEnums.YES.getId()); + } + else + { + babyQuery.setFmDataStatu(true); + } + BabyBuildResult result = new BabyBuildResult(); List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); if (models != null && models.size() > 0) { @@ -3995,4 +4003,8 @@ public class BabyBookbuildingFacade { } return ""; } + + public BaseObjectResponse queryBabyTempBuildById(String id,boolean isBuild) { + return queryBabyBuildById(id,isBuild); + } } \ No newline at end of file