|
@@ -1,13 +1,8 @@
|
|
|
package com.poteviohealth.cgp.statistics.model.outdto;
|
|
package com.poteviohealth.cgp.statistics.model.outdto;
|
|
|
|
|
|
|
|
-import com.poteviohealth.cgp.order.mapstruct.transform.DateTransfrom;
|
|
|
|
|
-import com.poteviohealth.cgp.order.mapstruct.transform.LongTransfrom;
|
|
|
|
|
import io.swagger.annotations.ApiModel;
|
|
import io.swagger.annotations.ApiModel;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
import lombok.Data;
|
|
import lombok.Data;
|
|
|
-import org.mapstruct.Mapper;
|
|
|
|
|
-
|
|
|
|
|
-import java.util.Date;
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* @Author QIN
|
|
* @Author QIN
|
|
@@ -17,33 +12,17 @@ import java.util.Date;
|
|
|
**/
|
|
**/
|
|
|
@Data
|
|
@Data
|
|
|
@ApiModel(value="成本调整查询出参")
|
|
@ApiModel(value="成本调整查询出参")
|
|
|
-@Mapper(uses = {LongTransfrom.class, DateTransfrom.class})
|
|
|
|
|
public class OrderCostWebOutDTO {
|
|
public class OrderCostWebOutDTO {
|
|
|
|
|
|
|
|
- @ApiModelProperty(value="id")
|
|
|
|
|
- private Long orderCostId;
|
|
|
|
|
-
|
|
|
|
|
- @ApiModelProperty(value = "订单逻辑主键id")
|
|
|
|
|
- private Long orderId;
|
|
|
|
|
-
|
|
|
|
|
@ApiModelProperty(value = "订单号")
|
|
@ApiModelProperty(value = "订单号")
|
|
|
private String sn;
|
|
private String sn;
|
|
|
|
|
|
|
|
- @ApiModelProperty(value = "服务人员Id")
|
|
|
|
|
- private Integer employeeId;
|
|
|
|
|
-
|
|
|
|
|
@ApiModelProperty(value = "服务人员名称")
|
|
@ApiModelProperty(value = "服务人员名称")
|
|
|
private String employeeName;
|
|
private String employeeName;
|
|
|
|
|
|
|
|
- @ApiModelProperty(value = "服务方Id")
|
|
|
|
|
- private Integer serviceStationId;
|
|
|
|
|
-
|
|
|
|
|
@ApiModelProperty(value = "服务驿站名称")
|
|
@ApiModelProperty(value = "服务驿站名称")
|
|
|
private String serviceStationName;
|
|
private String serviceStationName;
|
|
|
|
|
|
|
|
- @ApiModelProperty(value = "归属驿站Id")
|
|
|
|
|
- private Integer stationId;
|
|
|
|
|
-
|
|
|
|
|
@ApiModelProperty(value = "归属驿站")
|
|
@ApiModelProperty(value = "归属驿站")
|
|
|
private String stationName;
|
|
private String stationName;
|
|
|
|
|
|
|
@@ -75,19 +54,7 @@ public class OrderCostWebOutDTO {
|
|
|
private String money;
|
|
private String money;
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "核算日期")
|
|
@ApiModelProperty(value = "核算日期")
|
|
|
- private Date revenueDate;
|
|
|
|
|
-
|
|
|
|
|
- @ApiModelProperty(value = "核算人")
|
|
|
|
|
- private String revenueUser;
|
|
|
|
|
-
|
|
|
|
|
- @ApiModelProperty(value = "调整状态:1:未调整;2:已调整")
|
|
|
|
|
- private Integer costStatus;
|
|
|
|
|
-
|
|
|
|
|
- @ApiModelProperty(value = "调整状态:1:未调整;2:已调整")
|
|
|
|
|
- private String costStatusStr;
|
|
|
|
|
-
|
|
|
|
|
- @ApiModelProperty(value = "核算状态:1:未核算;2:已核算")
|
|
|
|
|
- private Integer revenueStatus;
|
|
|
|
|
|
|
+ private String revenueDate;
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "核算状态:1:未核算;2:已核算")
|
|
@ApiModelProperty(value = "核算状态:1:未核算;2:已核算")
|
|
|
private String revenueStatusStr;
|
|
private String revenueStatusStr;
|
|
@@ -99,13 +66,10 @@ public class OrderCostWebOutDTO {
|
|
|
private String settlementAttribution;
|
|
private String settlementAttribution;
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "下单时间")
|
|
@ApiModelProperty(value = "下单时间")
|
|
|
- private Date orderTime;
|
|
|
|
|
|
|
+ private String orderTime;
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "工单结束时间")
|
|
@ApiModelProperty(value = "工单结束时间")
|
|
|
- private Date endTime;
|
|
|
|
|
-
|
|
|
|
|
- @ApiModelProperty(value = "完成时间")
|
|
|
|
|
- private Date finishTime;
|
|
|
|
|
|
|
+ private String endTime;
|
|
|
|
|
|
|
|
@ApiModelProperty(value = "类型名称")
|
|
@ApiModelProperty(value = "类型名称")
|
|
|
private String categoryName;
|
|
private String categoryName;
|