Commit fde588e1 authored by mlchun's avatar mlchun

1.订单详情添加图片

parent f8574e3b
...@@ -13,12 +13,9 @@ import io.hmit.common.validator.group.DefaultGroup; ...@@ -13,12 +13,9 @@ import io.hmit.common.validator.group.DefaultGroup;
import io.hmit.common.validator.group.UpdateGroup; import io.hmit.common.validator.group.UpdateGroup;
import io.hmit.entity.UserEntity; import io.hmit.entity.UserEntity;
import io.hmit.modules.serviceOrder.dto.PensionOrderDTO; import io.hmit.modules.serviceOrder.dto.PensionOrderDTO;
import io.hmit.modules.serviceOrder.dto.PensionOrderEvaluationDTO;
import io.hmit.modules.serviceOrder.dto.ReservationDTO; import io.hmit.modules.serviceOrder.dto.ReservationDTO;
import io.hmit.modules.serviceOrder.dto.StaffFinishDTO; import io.hmit.modules.serviceOrder.dto.StaffFinishDTO;
import io.hmit.modules.serviceOrder.service.PensionOrderDocumentService; import io.hmit.modules.serviceOrder.service.*;
import io.hmit.modules.serviceOrder.service.PensionOrderEvaluationService;
import io.hmit.modules.serviceOrder.service.PensionOrderService;
import io.hmit.service.UserService; import io.hmit.service.UserService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -54,6 +51,9 @@ public class PensionOrderController { ...@@ -54,6 +51,9 @@ public class PensionOrderController {
@Autowired @Autowired
private PensionOrderEvaluationService pensionOrderEvaluationService; private PensionOrderEvaluationService pensionOrderEvaluationService;
@Autowired
private PensionServiceService pensionServiceService;
@Login @Login
@GetMapping("page") @GetMapping("page")
@ApiOperation("全部订单(志愿者)") @ApiOperation("全部订单(志愿者)")
...@@ -304,6 +304,7 @@ public class PensionOrderController { ...@@ -304,6 +304,7 @@ public class PensionOrderController {
data.setStaffVoiceMessage(pensionOrderDocumentService.findStaffVoiceId(id)); data.setStaffVoiceMessage(pensionOrderDocumentService.findStaffVoiceId(id));
data.setUserImages(pensionOrderDocumentService.findByOrderIdAndRemark(id, "3")); data.setUserImages(pensionOrderDocumentService.findByOrderIdAndRemark(id, "3"));
data.setPensionOrderEvaluationDTO(pensionOrderEvaluationService.findByOrderId(id)); data.setPensionOrderEvaluationDTO(pensionOrderEvaluationService.findByOrderId(id));
data.setIcon(pensionServiceService.get(data.getServiceId()).getDetailPicture());
return new Result<PensionOrderDTO>().ok(data); return new Result<PensionOrderDTO>().ok(data);
} }
......
package io.hmit.modules.serviceOrder.dao; package io.hmit.modules.serviceOrder.dao;
import io.hmit.common.dao.BaseDao; import io.hmit.common.dao.BaseDao;
import io.hmit.modules.serviceOrder.dto.PensionServiceDocumentDTO;
import io.hmit.modules.serviceOrder.entity.PensionServiceDocumentEntity; import io.hmit.modules.serviceOrder.entity.PensionServiceDocumentEntity;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
...@@ -12,5 +13,5 @@ import org.apache.ibatis.annotations.Mapper; ...@@ -12,5 +13,5 @@ import org.apache.ibatis.annotations.Mapper;
*/ */
@Mapper @Mapper
public interface PensionServiceDocumentDao extends BaseDao<PensionServiceDocumentEntity> { public interface PensionServiceDocumentDao extends BaseDao<PensionServiceDocumentEntity> {
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment