From 04aeda48634ff70d08d9fb7fac4d60d4c96b6992 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期一, 23 九月 2024 08:15:24 +0800 Subject: [PATCH] 原片仓储代码功能编写:基础逻辑、代码规范、添加/修改字段,移除无用的方法,新增表连接查询mapper --- hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java index 91489d1..be97a9b 100644 --- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java +++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java @@ -1,9 +1,6 @@ package com.mes.rawglasstask.entity.request; -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.fasterxml.jackson.annotation.JsonFormat; -import com.mes.rawglasstask.entity.RawGlassStorageTask; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -16,24 +13,23 @@ /** * 浠诲姟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 璋冨害 */ - private List<Integer> enableState; + private List<Integer> taskState; /** * 浠诲姟鐘舵�� 1 鏂板缓 2 鎵ц涓� 3 瀹屾垚 */ - private List<Integer> enableType; + private List<Integer> taskType; /** * 寮�濮嬫椂闂� */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date createTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date beginDate; /** * 缁撴潫鏃堕棿 */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date patternQuantity; - + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date endDate; } -- Gitblit v1.8.0