咨询建议列表

gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/ProblemManageApiServiceImpl.java

@@ -18,6 +18,7 @@ import com.gic.evaluate.service.ProblemImgService;
 import com.gic.evaluate.service.ProblemManageApiService;
 import com.gic.evaluate.service.ProblemReplyService;
 import com.gic.evaluate.service.ProblemService;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -81,6 +82,14 @@ public class ProblemManageApiServiceImpl implements ProblemManageApiService {
             replyList = new ArrayList<>(replyList);
         }
         replyList.add(0, problemReplyDTO);
+
+        if (CollectionUtils.isNotEmpty(replyList)) {
+            for (ProblemReplyDTO replyDTO : replyList) {
+                List<TabProblemImg> imgList = this.problemImgService.listImageByProblemReplyId(replyDTO.getProblemReplyId());
+                replyDTO.setImgList(Optional.ofNullable(imgList).orElse(Collections.emptyList()).stream().map(TabProblemImg::getImgUrl).collect(Collectors.toList()));
+            }
+        }
+
         problemDTO.setReplyList(replyList);
         return EnterpriseServiceResponse.success(problemDTO);
     }

gic-evaluate-web/src/main/java/com/gic/evaluate/web/controller/EvaluateManagerController.java

@@ -13,6 +13,7 @@ import com.gic.evaluate.qo.EvaluateQO;
 import com.gic.evaluate.service.EvaluateManageApiService;
 import com.gic.evaluate.web.vo.UserReplyVO;
 import com.gic.store.service.StoreWidgetApiService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -41,6 +42,12 @@ public class EvaluateManagerController {
             ServiceResponse<List<Integer>> serviceResponse = storeWidgetApiService.listStoreIdByStoreWidgetId(UserDetailUtils.getUserDetail().getEnterpriseId(), evaluateQO.getStoreWidgetId());
             evaluateQO.setStoreIdList(serviceResponse.getResult());
         }
+        if (StringUtils.isNotBlank(evaluateQO.getStartTime())) {
+            evaluateQO.setStartTime(evaluateQO.getStartTime() + " 00:00:00");
+        }
+        if (StringUtils.isNotBlank(evaluateQO.getEndTime())) {
+            evaluateQO.setEndTime(evaluateQO.getEndTime() + " 23:59:59");
+        }
         ServiceResponse<Page<EvaluateDTO>> serviceResponse = evaluateManageApiService.listEvaluateForManage(evaluateQO);
         return ResultControllerUtils.commonResult(serviceResponse);
     }