优化添加设备 功能

wuxw

2022-07-19 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54

 service-report/src/main/java/com/java110/report/api/ReportQuestionAnswerApi.java

@@ -1,16 +1,7 @@
package com.java110.report.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.reportOweFee.ReportOweFeeDto;
import com.java110.dto.userQuestionAnswerValue.UserQuestionAnswerValueDto;
import com.java110.po.reportOweFee.ReportOweFeePo;
import com.java110.report.bmo.reportOweFee.IDeleteReportOweFeeBMO;
import com.java110.report.bmo.reportOweFee.IGetReportOweFeeBMO;
import com.java110.report.bmo.reportOweFee.ISaveReportOweFeeBMO;
import com.java110.report.bmo.reportOweFee.IUpdateReportOweFeeBMO;
import com.java110.report.bmo.reportQuestionAnswer.IGetReportQuestionAnswerBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -28,7 +19,6 @@
    private IGetReportQuestionAnswerBMO getReportQuestionAnswerBMOImpl;



    /**
     * 微信删除消息模板
     *
@@ -38,13 +28,25 @@
     * @path /app/reportQuestionAnswer/queryUserQuestionAnswerValue
     */
    @RequestMapping(value = "/queryUserQuestionAnswerValue", method = RequestMethod.GET)
    public ResponseEntity<String> queryUserQuestionAnswerValue(@RequestParam(value = "communityId") String communityId,
                                                               @RequestParam(value = "page") int page,
                                                               @RequestParam(value = "row") int row) {
    public ResponseEntity<String> queryUserQuestionAnswerValue(
            @RequestHeader(value = "store-id",required = false) String storeId,
            @RequestParam(value = "communityId") String communityId,
            @RequestParam(value = "qaType",required = false) String qaType,
            @RequestParam(value = "startTime",required = false) String startTime,
            @RequestParam(value = "endTime",required = false) String endTime,
            @RequestParam(value = "titleId",required = false) String titleId,
            @RequestParam(value = "page") int page,
            @RequestParam(value = "row") int row) {
        UserQuestionAnswerValueDto userQuestionAnswerValueDto = new UserQuestionAnswerValueDto();
        userQuestionAnswerValueDto.setPage(page);
        userQuestionAnswerValueDto.setRow(row);
        userQuestionAnswerValueDto.setObjId(communityId);
        userQuestionAnswerValueDto.setObjIds(new String[]{storeId, communityId});
        userQuestionAnswerValueDto.setQaType(qaType);
        userQuestionAnswerValueDto.setStartTime(startTime);
        if(!StringUtil.isEmpty(endTime)){
            userQuestionAnswerValueDto.setEndTime(endTime+" 23:59:59");
        }
        userQuestionAnswerValueDto.setTitleId(titleId);
        return getReportQuestionAnswerBMOImpl.get(userQuestionAnswerValueDto);
    }
}