jiangjiazhi / regional-platform

Commit 31465fc4b59b48484c6c04f303fb366b1489899b

Authored by gaohan over 1 year ago

Exists in dev

修改回复评价还展示和查询评价回复为空的问题

Showing 4 changed files with 33 additions and 3 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReviewDao.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReviewDaoImpl.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseEvalService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java

...	...	@@ -13,5 +13,7 @@
13	13	List<ReviewModel> reviewQuery1List(MongoQuery created);
14	14
15	15	List<ReviewModel> reviewList(MongoQuery created);
	16	+
	17	+ void reviewUpdate(MongoQuery id, ReviewModel reviewModel);
16	18	}

...	...	@@ -29,5 +29,10 @@
29	29	public List<ReviewModel> reviewList(MongoQuery created) {
30	30	return find(created.convertToMongoQuery());
31	31	}
	32	+
	33	+ @Override
	34	+ public void reviewUpdate(MongoQuery id, ReviewModel reviewModel) {
	35	+ update(id.convertToMongoQuery(),reviewModel);
	36	+ }
32	37	}

...	...	@@ -114,5 +114,9 @@
114	114	}
115	115	return reviewDao.reviewQuery1List(query.addOrder(Sort.Direction.DESC, "created"));
116	116	}
	117	+
	118	+ public void reviewUpdate(ReviewModel reviewModel) {
	119	+ reviewDao.reviewUpdate(new MongoQuery(new MongoCondition("id", reviewModel.getId(), MongoOper.IS)), reviewModel);
	120	+ }
117	121	}

...	...	@@ -1179,6 +1179,8 @@
1179	1179
1180	1180
1181	1181	courseEvalService.updateMsg(model);
	1182	+
	1183	+
1182	1184	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1183	1185	objectResponse.setErrormsg("成功");
1184	1186	return objectResponse;
1185	1187
1186	1188
...	...	@@ -1292,16 +1294,28 @@
1292	1294
1293	1295	public BaseResponse reviewList(Integer page, Integer limit, String couresId) {
1294	1296	ReviewQuery reviewQuery = new ReviewQuery();
	1297	+
1295	1298	reviewQuery.setYn(YnEnums.YES.getId());
1296	1299	reviewQuery.setNeed("true");
1297	1300	reviewQuery.setPage(page);
1298	1301	reviewQuery.setLimit(limit);
1299	1302	reviewQuery.setCouresId(couresId);
1300	1303	reviewQuery.setState(1);
	1304	+ reviewQuery.setParentId("0");
	1305	+
1301	1306	BaseListResponse objectResponse = new BaseListResponse();
1302	1307	List<ReviewModel> models = courseEvalService.reviewList(reviewQuery);
1303	1308
1304		- objectResponse.setData(models);
	1309	+ ArrayList<ReviewModel> objects = new ArrayList<>();
	1310	+
	1311	+ for (ReviewModel model : models) {
	1312	+ String id = model.getId();
	1313	+ String parentId = model.getParentId();
	1314	+ if (id!=parentId){
	1315	+ objects.add(model);
	1316	+ }
	1317	+ }
	1318	+ objectResponse.setData(objects);
1305	1319	objectResponse.setPageInfo(reviewQuery.getPageInfo());
1306	1320	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1307	1321	objectResponse.setErrormsg("成功");
1308	1322
1309	1323
...	...	@@ -1334,9 +1348,14 @@
1334	1348	reviewModel.setState(1);
1335	1349	//操作人为当前用户id
1336	1350	reviewModel.setParentId(reviewModel.getParentId());
	1351	+ reviewModel.setCouresId(reviewModel.getCouresId());
	1352	+ courseEvalService.reviewAdd(reviewModel);
1337	1353
	1354	+ ReviewModel reviewModelUpdate = new ReviewModel();
	1355	+ reviewModelUpdate.setId(reviewModel.getParentId());
	1356	+ reviewModelUpdate.setState(1);
	1357	+ courseEvalService.reviewUpdate(reviewModelUpdate);
1338	1358
1339		- courseEvalService.reviewAdd(reviewModel);
1340	1359	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
1341	1360	objectResponse.setErrormsg("成功");
1342	1361	return objectResponse;
...	...	@@ -1347,7 +1366,7 @@
1347	1366	reviewQuery.setYn(YnEnums.YES.getId());
1348	1367	reviewQuery.setNeed("true");
1349	1368	reviewQuery.setCouresId(couresId);
1350		- reviewQuery.setParentId(reviewId);
	1369	+ reviewQuery.setReviewId(reviewId);
1351	1370	BaseListResponse objectResponse = new BaseListResponse();
1352	1371
1353	1372	List<ReviewModel> models = courseEvalService.reviewList(reviewQuery);