chengxiaowen 1 mês atrás
pai
commit
f38c9c5733

+ 5 - 0
src/main/java/com/poteviohealth/cgp/statistics/model/outdto/OrderCostWebOutDTO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author QIN
  * @Date 2019/7/16 19:08
@@ -69,6 +71,9 @@ public class OrderCostWebOutDTO {
     @ApiModelProperty(value = "下单时间")
     private String orderTime;
 
+    @ApiModelProperty(value = "工单开始时间")
+    private String startTime;
+
     @ApiModelProperty(value = "工单结束时间")
     private String endTime;
 

+ 1 - 1
src/main/resources/mapper/statistics/OrderMapper.xml

@@ -372,7 +372,7 @@
             o.employee_name,
             o.service_name,
             DATE_FORMAT(o.order_time,'%Y-%m-%d %H:%i') AS orderTime,
-            DATE_FORMAT(o.end_time,'%Y-%m-%d %H:%i') AS endTime,
+            DATE_FORMAT(o.end_time,'%Y-%m-%d %H:%i') AS endTime,DATE_FORMAT(o.start_time,'%Y-%m-%d %H:%i') AS startTime,
             case when o.revenue_status = 1 then '未核算' else '已核算' end  as revenueStatusStr,
             TRUNCATE (o.sign_price/ 100.0, 2 ) AS signPrice,
             o.man_hour,