jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 91a655aaaae85a4a8176d392afb4930cb1ea73d7

Authored by zhangchao
2 parents ee09297ffa 2716fccccc
Exists in dev

Merge branch 'dev' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform into dev

Showing 5 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReviewDao.java View file @ 91a655a
... ... @@ -9,5 +9,7 @@
9 9 List<ReviewModel> queryMsgList(MongoQuery created);
10 10  
11 11 void reviewAdd(ReviewModel reviewModel);
  12 +
  13 + List<ReviewModel> reviewQuery1List(MongoQuery created);
12 14 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReviewDaoImpl.java View file @ 91a655a
... ... @@ -19,5 +19,10 @@
19 19 public void reviewAdd(ReviewModel reviewModel) {
20 20 save(reviewModel);
21 21 }
  22 +
  23 + @Override
  24 + public List<ReviewModel> reviewQuery1List(MongoQuery created) {
  25 + return find(created.convertToMongoQuery());
  26 + }
22 27 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CourseEvalService.java View file @ 91a655a
... ... @@ -105,5 +105,14 @@
105 105 public void reviewAdd(ReviewModel reviewModel) {
106 106 reviewDao.reviewAdd(reviewModel);
107 107 }
  108 +
  109 + public List<ReviewModel> reviewQuery1List(ReviewQuery reviewQuery1) {
  110 + MongoQuery query = reviewQuery1.convertToQuery();
  111 + if (StringUtils.isNotEmpty(reviewQuery1.getNeed())) {
  112 + reviewQuery1.mysqlBuild(msgDao.queryMsgListCount(reviewQuery1.convertToQuery()));
  113 + query.start(reviewQuery1.getOffset()).end(reviewQuery1.getLimit());
  114 + }
  115 + return reviewDao.reviewQuery1List(query.addOrder(Sort.Direction.DESC, "created"));
  116 + }
108 117 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java View file @ 91a655a
... ... @@ -414,6 +414,27 @@
414 414 return courseFacade.reviewAdd(reviewModel,getUserId(request));
415 415 }
416 416  
  417 + /*
  418 + * 进行回复
  419 + * */
  420 + @RequestMapping(method = RequestMethod.POST, value = "/reviewAddContent")
  421 + @ResponseBody
  422 + public BaseResponse reviewAddContent(@RequestBody ReviewModel reviewModel, HttpServletRequest request) {
  423 + return courseFacade.reviewAddContent(reviewModel,getUserId(request));
  424 + }
  425 +
  426 + /*
  427 + * 查询当前用户评价和回复
  428 + * */
  429 + @RequestMapping(method = RequestMethod.GET, value = "/reviewUserList")
  430 + @ResponseBody
  431 + @TokenRequired
  432 + public BaseResponse reviewUserList(
  433 + @RequestParam(required = false) String couresId,
  434 + @RequestParam(required = false) String id,
  435 + HttpServletRequest request) {
  436 + return courseFacade.reviewUserList(couresId,id,getUserId(request));
  437 + }
417 438  
418 439 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ 91a655a
... ... @@ -1323,5 +1323,57 @@
1323 1323 objectResponse.setErrormsg("成功");
1324 1324 return objectResponse;
1325 1325 }
  1326 +
  1327 + public BaseResponse reviewAddContent(ReviewModel reviewModel, Integer userId) {
  1328 + BaseResponse objectResponse = new BaseResponse();
  1329 + Date day=new Date();
  1330 + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  1331 + String format = df.format(day);
  1332 + reviewModel.setCreateDate(format);
  1333 + reviewModel.setYn(YnEnums.YES.getId());
  1334 + //操作人为当前用户id
  1335 + reviewModel.setReviewId(userId.toString());
  1336 + reviewModel.setParentId(reviewModel.getParentId());
  1337 +
  1338 +
  1339 + courseEvalService.reviewAdd(reviewModel);
  1340 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  1341 + objectResponse.setErrormsg("成功");
  1342 + return objectResponse;
  1343 + }
  1344 +
  1345 + public BaseResponse reviewUserList(String couresId, String id, Integer userId) {
  1346 + ReviewQuery reviewQuery = new ReviewQuery();
  1347 + reviewQuery.setYn(YnEnums.YES.getId());
  1348 + reviewQuery.setNeed("true");
  1349 + reviewQuery.setCouresId(couresId);
  1350 + reviewQuery.setReviewId(userId.toString());
  1351 + BaseListResponse objectResponse = new BaseListResponse();
  1352 + List<ReviewModel> models = courseEvalService.reviewList(reviewQuery);
  1353 +
  1354 + ReviewQuery reviewQuery1 = new ReviewQuery();
  1355 + List<ReviewModel> models1 = courseEvalService.reviewQuery1List(reviewQuery1);
  1356 +
  1357 +
  1358 + List<ReviewModel> matchingModels = new ArrayList<>(); // 创建用于存放匹配数据的新集合
  1359 +
  1360 + if (!models.isEmpty()) {
  1361 + matchingModels.add(models.get(0)); // 将models集合中的第一条数据添加到匹配集合中
  1362 + }
  1363 +
  1364 + if (!models1.isEmpty()) {
  1365 + int index = models1.size() > 1 ? 1 : 0; // 如果models1集合中有多个数据，则获取第二条数据，否则获取第一条数据
  1366 + matchingModels.add(models1.get(index)); // 将models1集合中的数据添加到匹配集合中
  1367 + }
  1368 +
  1369 +
  1370 + objectResponse.setData(matchingModels);
  1371 + objectResponse.setPageInfo(reviewQuery.getPageInfo());
  1372 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  1373 + objectResponse.setErrormsg("成功");
  1374 + return objectResponse;
  1375 +
  1376 +
  1377 + }
1326 1378 }