Commit fd5c12ec by huluobin

采购订单时间显示

parent 1c370996
...@@ -3,6 +3,7 @@ package com.gogirl.domain.order.purchase; ...@@ -3,6 +3,7 @@ package com.gogirl.domain.order.purchase;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.*;
...@@ -64,21 +65,27 @@ public class PurchaseOrder implements Serializable { ...@@ -64,21 +65,27 @@ public class PurchaseOrder implements Serializable {
private Integer status; private Integer status;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime; private Date createTime;
@ApiModelProperty(value = "待采购时间") @ApiModelProperty(value = "待采购时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date waitPurchaseTime; private Date waitPurchaseTime;
@ApiModelProperty(value = "确认采购时间") @ApiModelProperty(value = "确认采购时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date purchaseTime; private Date purchaseTime;
@ApiModelProperty(value = "入库时间") @ApiModelProperty(value = "入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date inStoreTime; private Date inStoreTime;
@ApiModelProperty(value = "出库时间") @ApiModelProperty(value = "出库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date outStoreTime; private Date outStoreTime;
@ApiModelProperty(value = "收货时间") @ApiModelProperty(value = "收货时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date receiveTime; private Date receiveTime;
@ApiModelProperty(value = "收货人id") @ApiModelProperty(value = "收货人id")
......
...@@ -640,6 +640,9 @@ public class Test { ...@@ -640,6 +640,9 @@ public class Test {
marketService.achievementReCalc(13175); marketService.achievementReCalc(13175);
} }
/**
* 重算2020订单完整度
*/
@org.junit.Test @org.junit.Test
public void reCalcOrderDataIntegrity() { public void reCalcOrderDataIntegrity() {
...@@ -658,5 +661,4 @@ public class Test { ...@@ -658,5 +661,4 @@ public class Test {
}); });
} }
} }
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