志愿者订单新增实际开始与实际结束时间

leromro-core/src/main/java/com/leromro/core/domain/vo/AppSecoundOrderInfoVO.java

@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 
 @Data
@@ -78,6 +79,12 @@ public class AppSecoundOrderInfoVO {
     @ApiModelProperty("预计结束时间")
     private LocalTime workEndTime;
 
+    @ApiModelProperty("服务实际开始时间")
+    private LocalDateTime serviceStartTime;
+
+    @ApiModelProperty("服务实际结束时间")
+    private LocalDateTime serviceEndTime;
+
     @ApiModelProperty("单次服务数量")
     private Long singleQuantity;
 
@@ -147,4 +154,7 @@ public class AppSecoundOrderInfoVO {
     @TableField("out_trade_no")
     @ApiModelProperty("业务单号")
     private String outTradeNo;
+
+    @ApiModelProperty("头像")
+    private String avatar;
 }

leromro-core/src/main/resources/mapper/core/SecondOrdersMapper.xml

@@ -530,10 +530,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             lso.second_order_id,lso.order_status,lso.volunteer_settlement_status,lso.volunteer_review,lso.volunteer_picture,lso.user_review
                 ,lso.user_picture,lso.work_date,lso.work_start_time,lso.work_end_time,lso.single_quantity,lso.work_number,lso.service_duration,
             lso.province_code,lso.province_name,lso.city_code,lso.city_name,lso.district_code,lso.district_name,lso.latitude,lso.longitude,lso.out_trade_no
-                ,lso.clothing_score,lso.ability_score,lso.quality_score,lso.protocol_score,lvi.business_tier_name businessTireName,lmo.client_telephone as clientPhoneNumber,lmo.client_name clientName,lso.remark,lso.score,
+                ,lso.clothing_score,lso.ability_score,lso.quality_score,lso.protocol_score,lvi.business_tier_name businessTireName,lmo.client_telephone as clientPhoneNumber,
+            lso.service_start_time,lso.service_end_time,lmo.client_name clientName,lso.remark,lso.score,
             CONCAT( IFNULL(lso.province_name, ''),IFNULL(lso.city_name, ''), IFNULL(lso.district_name, ''), IFNULL(lso.address, '') ) AS address,
             (select sd.dept_name from sys_dept sd where sd.dept_id = lso.area_distribution_id) as areaDistributionName,
-            (select sd.dept_name from  sys_dept sd where sd.dept_id = lso.service_center_id) as  serviceCenterName
+            (select sd.dept_name from  sys_dept sd where sd.dept_id = lso.service_center_id) as  serviceCenterName,
+            (select su.avatar from sys_user su where su.user_id = lmo.user_id) as avatar
         from (l_second_order lso left join l_volunteer_info lvi on lso.volunteer_info_id = lvi.volunteer_info_id )left join l_main_orders lmo on lmo.main_order_id = lso.main_order_id
         where lso.second_order_id = #{secondOrderId}
     </select>