Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/FacilityUsedRecordController.java

@@ -67,7 +67,7 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) Integer page) throws Exception {
        List<FacilityUsedRecord> facilityUsedRecordList = facilityUsedRecordService.search(fields, filters, sorts, page, size);
        int count = (int)facilityUsedRecordService.getCount(filters);
        int count = (int) facilityUsedRecordService.getCount(filters);
        return success(facilityUsedRecordList, count, page, size);
    }
@@ -195,6 +195,7 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) Integer page) throws Exception {
        String filters = "createUser=" + userId;
        sorts = "-createTime";
        List<FacilityUsedRecord> facilityUsedRecordList = facilityUsedRecordService.search("", filters, sorts, page, size);
        for (FacilityUsedRecord record : facilityUsedRecordList) {
            //根据设施编码获取关联服务的名称
@@ -211,7 +212,7 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
                record.setNavigationServiceEvaluationFlag("已评价");
            }
        }
        int count = (int)facilityUsedRecordService.getCount(filters);
        int count = (int) facilityUsedRecordService.getCount(filters);
        return success(facilityUsedRecordList, count, page, size);
    }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/FeedBackController.java

@@ -79,7 +79,7 @@ public class FeedBackController extends EnvelopRestEndpoint {
    }
    @ApiOperation(value = "管理员根据id获取/或回复意见反馈,需改变意见反馈回复状态")
    @GetMapping(value = HealthyHouseMapping.HealthyHouse.FeedBack.UPDATE_FEEDBACKS_BY_ID)
    @PostMapping(value = HealthyHouseMapping.HealthyHouse.FeedBack.UPDATE_FEEDBACKS_BY_ID)
    public ObjEnvelop<FeedBack> getFeedBackAndUpdate(
            @ApiParam(name = "id", value = "意见反馈ID(必要)", defaultValue = "")
            @RequestParam(value = "id", required = true) String id,

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/NavigationServiceEvaluationController.java

@@ -46,8 +46,8 @@ public class NavigationServiceEvaluationController extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "页码", defaultValue = "1")
            @RequestParam(value = "page", required = false) Integer page) throws Exception {
        List<NavigationServiceEvaluation> navigationServiceEvaluationList = navigationServiceEvaluationService.search(fields, filters, sorts, page, size);
        int count = (int)navigationServiceEvaluationService.getCount(filters);
        return success(navigationServiceEvaluationList,count, page, size);
        int count = (int) navigationServiceEvaluationService.getCount(filters);
        return success(navigationServiceEvaluationList, count, page, size);
    }
    @ApiOperation(value = "创建/更新（id存在）服务评价")
@@ -55,7 +55,17 @@ public class NavigationServiceEvaluationController extends EnvelopRestEndpoint {
    public ObjEnvelop<NavigationServiceEvaluation> createNavigationServiceEvaluation(
            @ApiParam(name = "navigationServiceEvaluation", value = "服务评价JSON结构")
            @RequestBody NavigationServiceEvaluation navigationServiceEvaluation) throws IOException {
        navigationServiceEvaluation = navigationServiceEvaluationService.save(navigationServiceEvaluation);
        //判断该导航记录是否已经评价
        NavigationServiceEvaluation navi = navigationServiceEvaluationService.findByUseRecordId(navigationServiceEvaluation.getUseRecordId());
        if (null != navi) {
            navi.setScore(navigationServiceEvaluation.getScore());
            navi.setRemark(navigationServiceEvaluation.getRemark());
            navigationServiceEvaluation = navigationServiceEvaluationService.save(navi);
        } else {
            navigationServiceEvaluation = navigationServiceEvaluationService.save(navigationServiceEvaluation);
        }
        return success(navigationServiceEvaluation);
    }