jiangjiazhi / regional-platform

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 27 additions and 3 deletions

...	...	@@ -100,7 +100,19 @@
100	100	@RequestMapping(value = "/queryBabyBuildById/{id}", method = RequestMethod.GET)
101	101	@ResponseBody
102	102	public BaseObjectResponse queryBabyBuildById(@PathVariable("id") String id) {
103		- return babyBookbuildingFacade.queryBabyBuildById(id);
	103	+ return babyBookbuildingFacade.queryBabyBuildById(id,true);
	104	+ }
	105	+
	106	+
	107	+ /**
	108	+ * 预建档查询
	109	+ * @param id
	110	+ * @return
	111	+ */
	112	+ @RequestMapping(value = "/queryBabyTempBuildById/{id}", method = RequestMethod.GET)
	113	+ @ResponseBody
	114	+ public BaseObjectResponse queryBabyTempBuildById(@PathVariable("id") String id) {
	115	+ return babyBookbuildingFacade.queryBabyTempBuildById(id,false);
104	116	}
105	117
106	118

...	...	@@ -1291,11 +1291,19 @@
1291	1291	* @param id
1292	1292	* @return
1293	1293	*/
1294		- public BaseObjectResponse queryBabyBuildById(String id) {
	1294	+ public BaseObjectResponse queryBabyBuildById(String id,boolean isBuild) {
1295	1295
1296	1296	BabyModelQuery babyQuery = new BabyModelQuery();
1297	1297	babyQuery.setId(id);
1298		- babyQuery.setYn(YnEnums.YES.getId());
	1298	+ if (isBuild)
	1299	+ {
	1300	+ babyQuery.setYn(YnEnums.YES.getId());
	1301	+ }
	1302	+ else
	1303	+ {
	1304	+ babyQuery.setFmDataStatu(true);
	1305	+ }
	1306	+
1299	1307	BabyBuildResult result = new BabyBuildResult();
1300	1308	List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
1301	1309	if (models != null && models.size() > 0) {
...	...	@@ -3994,6 +4002,10 @@
3994	4002	return basicConfig.getName();
3995	4003	}
3996	4004	return "";
	4005	+ }
	4006	+
	4007	+ public BaseObjectResponse queryBabyTempBuildById(String id,boolean isBuild) {
	4008	+ return queryBabyBuildById(id,isBuild);
3997	4009	}
3998	4010	}