From fe891f627a483eb6298f12eca60cf7f274e31c88 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 20 八月 2025 16:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/andon/dto/AndonOrdeDto.java | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 151 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/andon/dto/AndonOrdeDto.java b/src/main/java/org/jeecg/modules/andon/dto/AndonOrdeDto.java
new file mode 100644
index 0000000..413a18e
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/andon/dto/AndonOrdeDto.java
@@ -0,0 +1,151 @@
+package org.jeecg.modules.andon.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+@Data
+public class AndonOrdeDto {
+ /**涓婚敭*/
+ @TableId(type = IdType.ASSIGN_ID)
+ @ApiModelProperty(value = "涓婚敭")
+ private String id;
+ /**鍒涘缓浜�*/
+ @ApiModelProperty(value = "鍒涘缓浜�")
+ private String createBy;
+ /**鍒涘缓鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
+ private Date createTime;
+ /**鏇存柊浜�*/
+ @ApiModelProperty(value = "鏇存柊浜�")
+ private String updateBy;
+ /**鏇存柊鏃ユ湡*/
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏇存柊鏃ユ湡")
+ private Date updateTime;
+ /**鍒犻櫎鏍囪*/
+
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag;
+ /**浜х嚎ID*/
+
+ @ApiModelProperty(value = "浜х嚎ID")
+ @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name")
+ private String factoryId;
+ /**瀹夌伅绫诲瀷*/
+
+ @ApiModelProperty(value = "瀹夌伅绫诲瀷")
+ @Dict(dictTable = "andon_button_config", dicCode = "id", dicText = "button_name")
+ private String buttonId;
+ /**瀹夌伅浜�*/
+
+ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+ @ApiModelProperty(value = "瀹夌伅浜�")
+ private String operator;
+ /**瀹夌伅鏃堕棿*/
+
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "瀹夌伅鏃堕棿")
+ private Date operateTime;
+ /**瀹夌伅绛夌骇*/
+
+ @Dict(dicCode = "andon_level")
+ @ApiModelProperty(value = "瀹夌伅绛夌骇")
+ private String andonLevel;
+ /**鍝嶅簲浜�*/
+ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+
+ @ApiModelProperty(value = "鍝嶅簲浜�")
+ private String responder;
+ /**鍝嶅簲鏃堕棿*/
+
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍝嶅簲鏃堕棿")
+ private Date responseTime;
+ /**澶勭悊浜�*/
+ @Dict(dictTable = "sys_user", dicCode = "id", dicText = "username")
+
+ @ApiModelProperty(value = "澶勭悊浜�")
+ private String processor;
+ /**澶勭悊瀹屾垚鏃堕棿*/
+
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "澶勭悊瀹屾垚鏃堕棿")
+ private Date processTime;
+ /**瀹夌伅鐘舵��*/
+
+ @Dict(dicCode = "order_status")
+ @ApiModelProperty(value = "瀹夌伅鐘舵��")
+ private String orderStatus;
+ /**闂鎻忚堪*/
+
+ @ApiModelProperty(value = "闂鎻忚堪")
+ private String problemDescreption;
+ /**澶勭悊缁撴灉鎻忚堪*/
+
+ @ApiModelProperty(value = "澶勭悊缁撴灉鎻忚堪")
+ private String resolutionDescreption;
+ @ApiModelProperty(value = "涓�绾у搷搴斾汉openId")
+ private String responderOpenId;
+
+ @ApiModelProperty(value = "浜岀骇鍝嶅簲浜簅penId")
+ private String secondResponderOpenId;
+
+ @ApiModelProperty(value = "涓夌骇鍝嶅簲浜簅penId")
+ private String thirdResponderOpenId;
+
+
+
+ @ApiModelProperty(value = "涓夌骇鍝嶅簲浜�")
+ private String thirdResponder;
+
+
+
+ @ApiModelProperty(value = "浜岀骇鍝嶅簲浜�")
+ private String secondResponder;
+ /**浜х嚎鍚嶇О*/
+ @ApiModelProperty(value = "浜х嚎鍚嶇О")
+ private String factoryName;
+
+ /**浜х嚎鍚嶇О*/
+ @ApiModelProperty(value = "宸ュ巶鍚嶇О")
+ private String parentFactoryName;
+
+ /**涓�绾у搷搴旀椂闀�*/
+ @ApiModelProperty(value = "涓�绾у搷搴旀椂闀�")
+ private Integer upgradeResponseDuration;
+
+
+ /**鎸夐挳鍚嶇О*/
+ @ApiModelProperty(value = "鎸夐挳鍚嶇О")
+ private String buttonName;
+
+
+
+ /**
+ * 瀹夌伅浜哄悕绉�
+ */
+ @ApiModelProperty(value = "瀹夌伅浜哄悕绉�")
+ private String operatorName;
+
+ /**浜岀骇鍝嶅簲鏃堕暱*/
+ @ApiModelProperty(value = "浜岀骇鍝嶅簲鏃堕暱")
+ private Integer secondUpgradeResponseDuration;
+
+ /**涓夌骇绾у搷搴旀椂闀�*/
+ @ApiModelProperty(value = "涓夌骇鍝嶅簲鏃堕暱")
+ private Integer thirdUpgradeResponseDuration;
+}
--
Gitblit v1.9.3