1.订单服务人员评价（待联调）

2.订单用户评价（待联调）

hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOrderController.java

@@ -12,8 +12,11 @@ import io.hmit.common.validator.group.DefaultGroup;
 import io.hmit.common.validator.group.UpdateGroup;
 import io.hmit.entity.UserEntity;
 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.StaffFinishDTO;
 import io.hmit.modules.serviceOrder.service.PensionOrderDocumentService;
+import io.hmit.modules.serviceOrder.service.PensionOrderEvaluationService;
 import io.hmit.modules.serviceOrder.service.PensionOrderService;
 import io.hmit.service.UserService;
 import io.swagger.annotations.Api;
@@ -46,6 +49,9 @@ public class PensionOrderController {
     @Autowired
     private PensionOrderDocumentService pensionOrderDocumentService;
 
+    @Autowired
+    private PensionOrderEvaluationService pensionOrderEvaluationService;
+
     @Login
     @GetMapping("page")
     @ApiOperation("全部订单(志愿者)")
@@ -211,16 +217,18 @@ public class PensionOrderController {
      * 服务人员完成订单接口
      */
     @Login
-    @GetMapping("staffFinishedOrder")
+    @PostMapping("staffFinishedOrder")
     @ApiOperation(value = "服务人员完成订单接口(服务人员)")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "订单ID", paramType = "query", required = true, dataType="long") ,
-            @ApiImplicitParam(name = "content", value = "描述服务内容", paramType = "query", required = true, dataType="String") ,
-            @ApiImplicitParam(name = "location", value = "经纬定位", paramType = "query", required = true, dataType="String")
-    })
-    public Result staffFinishedOrder(@ApiIgnore @LoginUser UserEntity user,
-                                                   @ApiIgnore @RequestParam Map<String, Object> params){
-        pensionOrderService.staffFinishedOrder(params, user.getId());
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "id", value = "订单ID", paramType = "query", required = true, dataType="long") ,
+//            @ApiImplicitParam(name = "content", value = "描述服务内容", paramType = "query", required = true, dataType="String") ,
+//            @ApiImplicitParam(name = "images", value = "图片", allowMultiple = true, paramType = "query", dataType="String") ,
+//            @ApiImplicitParam(name = "voice", value = "语音", allowMultiple = true, paramType = "query", dataType="String") ,
+//            @ApiImplicitParam(name = "roleId", value = "用户角色", paramType = "query", dataType="String") ,
+//            @ApiImplicitParam(name = "location", value = "经纬定位", paramType = "query", dataType="String")
+//    })
+    public Result staffFinishedOrder(StaffFinishDTO dto){
+        pensionOrderService.staffFinishedOrder(dto);
         return new Result();
     }
 
@@ -296,13 +304,14 @@ public class PensionOrderController {
         data.setStaffImages(pensionOrderDocumentService.findByOrderIdAndRemark(id, "1"));
         data.setStaffVoiceMessage(pensionOrderDocumentService.findStaffVoiceId(id));
         data.setUserImages(pensionOrderDocumentService.findByOrderIdAndRemark(id, "3"));
+        data.setPensionOrderEvaluationDTO(pensionOrderEvaluationService.findByOrderId(id));
         return new Result<PensionOrderDTO>().ok(data);
     }
 
     @Login
     @PostMapping("reservationOrder")
     @ApiOperation("预约保存")
-    public Result reservationOrder(@ApiIgnore @LoginUser UserEntity user,@RequestBody ReservationDTO dto){
+    public Result reservationOrder(@ApiIgnore @LoginUser UserEntity user, ReservationDTO dto){
 
         PensionOrderDTO data = new PensionOrderDTO().assemblePensionOrder(dto,user);
         data.setCommunityId(user.getCommunityId());

hmit-api/src/main/java/io/hmit/modules/serviceOrder/controller/PensionOrderEvaluationController.java

 package io.hmit.modules.serviceOrder.controller;
 
+import io.hmit.annotation.Login;
 import io.hmit.common.constant.Constant;
 import io.hmit.common.page.PageData;
 import io.hmit.common.utils.Result;
@@ -59,9 +60,10 @@ public class PensionOrderEvaluationController {
         return new Result<PensionOrderEvaluationDTO>().ok(data);
     }
 
+    @Login
     @PostMapping
     @ApiOperation("保存")
-    public Result save(@RequestBody PensionOrderEvaluationDTO dto){
+    public Result save(PensionOrderEvaluationDTO dto){
 
         pensionOrderEvaluationService.save(dto);
 

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dao/PensionOrderEvaluationDao.java

 package io.hmit.modules.serviceOrder.dao;
 
 import io.hmit.common.dao.BaseDao;
+import io.hmit.modules.serviceOrder.dto.PensionOrderEvaluationDTO;
 import io.hmit.modules.serviceOrder.entity.PensionOrderEvaluationEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -12,5 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PensionOrderEvaluationDao extends BaseDao<PensionOrderEvaluationEntity> {
-	
+
+    PensionOrderEvaluationDTO findByOrderId(Long orderId);
+
 }
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrderDTO.java

@@ -125,6 +125,10 @@ public class PensionOrderDTO implements Serializable {
 	@ApiModelProperty(value = "服务人员语音")
 	private PensionOrderDocumentDTO staffVoiceMessage;
 
+	@JsonInclude(JsonInclude.Include.NON_NULL)
+	@ApiModelProperty(value = "订单评价信息")
+	private PensionOrderEvaluationDTO pensionOrderEvaluationDTO;
+
 	public PensionOrderDTO assemblePensionOrder(ReservationDTO reservationDTO, UserEntity user){
 		PensionOrderDTO pensionOrder = new PensionOrderDTO();
 		pensionOrder.setOrderNum("");

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOrderEvaluationDTO.java

@@ -38,7 +38,10 @@ public class PensionOrderEvaluationDTO implements Serializable {
 	@ApiModelProperty(value = "评价内容")
 	private String content;
 
-	@ApiModelProperty(value = "评价文件地址")
+	@ApiModelProperty(value = "评价文件地址（返回）")
+	private String file;
+
+	@ApiModelProperty(value = "评价文件地址（上传）")
 	private String[] files;
 
 	@ApiModelProperty(value = "创建者")

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/StaffFinishDTO.java

+package io.hmit.modules.serviceOrder.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description :
+ * @Author : Shen Yuanfeng
+ * @Date: 2021/3/12 8:31
+ */
+
+@Data
+@ApiModel(value = "服务人员完成订单传值")
+public class StaffFinishDTO {
+    @ApiModelProperty(value = "订单所属的服务id")
+    private Long orderId;
+
+    @ApiModelProperty(value = "描述服务内容")
+    private String content;
+
+    @ApiModelProperty(value = "定位坐标")
+    private String location;
+
+    @ApiModelProperty(value = "服务人员评论照片")
+    private String[] images;
+
+    @ApiModelProperty(value = "服务人员语音")
+    private String[] voice;
+
+    @ApiModelProperty(value = "角色id")
+    private Long roleId;
+
+}

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/PensionOrderEvaluationService.java

@@ -12,4 +12,6 @@ import io.hmit.modules.serviceOrder.entity.PensionOrderEvaluationEntity;
  */
 public interface PensionOrderEvaluationService extends CrudService<PensionOrderEvaluationEntity, PensionOrderEvaluationDTO> {
 
+    PensionOrderEvaluationDTO findByOrderId(Long orderId);
+
 }
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/PensionOrderService.java

@@ -4,6 +4,7 @@ import io.hmit.common.page.PageData;
 import io.hmit.common.service.CrudService;
 import io.hmit.modules.serviceOrder.dto.PensionOrderDTO;
 import io.hmit.modules.serviceOrder.dto.PensionOrderEvaluationDTO;
+import io.hmit.modules.serviceOrder.dto.StaffFinishDTO;
 import io.hmit.modules.serviceOrder.entity.PensionOrderEntity;
 
 import java.util.Map;
@@ -62,5 +63,5 @@ public interface PensionOrderService extends CrudService<PensionOrderEntity, Pen
     Boolean elderFamilyCancel(Long id, String reason);
 
     //服务人员完结订单
-    void staffFinishedOrder(Map<String, Object> params, Long userId);
+    void staffFinishedOrder(StaffFinishDTO dto);
 }

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOrderEvaluationServiceImpl.java

@@ -7,6 +7,7 @@ import io.hmit.modules.serviceOrder.dto.PensionOrderEvaluationDTO;
 import io.hmit.modules.serviceOrder.entity.PensionOrderEvaluationEntity;
 import io.hmit.modules.serviceOrder.service.PensionOrderEvaluationService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -30,5 +31,11 @@ public class PensionOrderEvaluationServiceImpl extends CrudServiceImpl<PensionOr
         return wrapper;
     }
 
+    @Autowired
+    private PensionOrderEvaluationDao dao;
 
+    @Override
+    public PensionOrderEvaluationDTO findByOrderId(Long orderId) {
+        return dao.findByOrderId(orderId);
+    }
 }
\ No newline at end of file

hmit-api/src/main/java/io/hmit/modules/serviceOrder/service/impl/PensionOrderServiceImpl.java

@@ -215,15 +215,18 @@ public class PensionOrderServiceImpl extends CrudServiceImpl<PensionOrderDao, Pe
     }
 
     @Override
-    public void staffFinishedOrder(Map<String, Object> params, Long userId) {
-        Long orderId = Long.parseLong(params.get("id").toString());
-        String location = params.get("location").toString();
-        String content = params.get("content").toString();
-        PensionOrderEntity pensionOrderEntity = pensionOrderDao.selectById(orderId);
+    public void staffFinishedOrder(StaffFinishDTO dto) {
+        if (null != dto.getImages()) {
+            saveFilesToDB(dto.getOrderId(), dto.getImages(), dto.getRoleId());
+        }
+        if (null != dto.getVoice()) {
+            saveFilesToDB(dto.getOrderId(), dto.getVoice(), dto.getRoleId());
+        }
+        PensionOrderEntity pensionOrderEntity = pensionOrderDao.selectById(dto.getOrderId());
         pensionOrderEntity.setStatus(4);
         pensionOrderEntity.setStatusName(Constant.OrderStatus.WAIT_EVALUATE.getMessage());
-        pensionOrderEntity.setContent(content);
-        pensionOrderEntity.setLocation(location);
+        pensionOrderEntity.setContent(dto.getContent());
+        pensionOrderEntity.setLocation(dto.getLocation());
         update(ConvertUtils.sourceToTarget(pensionOrderEntity, PensionOrderDTO.class));
     }
 

hmit-api/src/main/resources/mapper/serviceOrder/PensionOrderEvaluationDao.xml

@@ -14,5 +14,9 @@
         <result property="createDate" column="create_date"/>
     </resultMap>
 
+    <select id="findByOrderId" resultType="io.hmit.modules.serviceOrder.dto.PensionOrderEvaluationDTO">
+        SELECT * FROM pension_order_evaluation
+        WHERE order_id = #{orderId}
+    </select>
 
 </mapper>