From 6f4f866484c956cfbe3de3d4d60a723d4f2ba6c7 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 17:03:24 +0800 Subject: [PATCH] no message --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 26 +++++++++++++++++++++----- 1 files changed, 21 insertions(+), 5 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java index 2bb3cf0..5954226 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java @@ -1,21 +1,18 @@ package com.vincent.rsf.server.manager.entity; -import com.baomidou.mybatisplus.annotation.TableLogic; import java.text.SimpleDateFormat; import java.util.Date; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.fasterxml.jackson.annotation.JsonFormat; import com.vincent.rsf.server.system.constant.DictTypeCode; import com.vincent.rsf.server.system.entity.DictData; import com.vincent.rsf.server.system.service.DictDataService; import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; -import java.text.SimpleDateFormat; -import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -25,7 +22,6 @@ import com.vincent.rsf.server.system.service.UserService; import com.vincent.rsf.server.system.entity.User; import java.io.Serializable; -import java.util.Date; import java.util.Objects; @Data @@ -60,6 +56,12 @@ @ApiModelProperty("婧愮紪鐮�") private Long source; + + @ApiModelProperty("婧愬崟鍙�") + private String sourceCode; + + @ApiModelProperty("婧愪富鍗旾D") + private Long sourceId; @ApiModelProperty("鍗曟嵁ID") private Long orderId; @@ -97,6 +99,18 @@ */ @ApiModelProperty(value= "鏁伴噺") private Double anfme; + + /** + * 鎵ц鏁伴噺 + */ + @ApiModelProperty("搴撳瓨鏁伴噺") + private Double workQty; + + /** + * 瀹屾垚鏁伴噺 + */ + @ApiModelProperty("瀹屾垚鏁伴噺") + private Double qty; /** * 搴撳瓨鎵规 @@ -151,6 +165,7 @@ */ @ApiModelProperty(value= "娣诲姞鏃堕棿") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date createTime; /** @@ -164,6 +179,7 @@ */ @ApiModelProperty(value= "淇敼鏃堕棿") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date updateTime; /** -- Gitblit v1.9.1