From fb5aa087eaf6a68cf7ea8114beb270551016e7dd Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期二, 29 七月 2025 11:27:45 +0800 Subject: [PATCH] 添加定型指派设备 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java index eeb9e90..11282e0 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java @@ -1,24 +1,23 @@ package org.jeecg.modules.mdc.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; - import cn.hutool.core.date.DatePattern; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableLogic; -import lombok.Data; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; +import org.jeecg.common.constant.CommonConstant; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; /** * @Description: andon_order @@ -64,6 +63,7 @@ */ @Excel(name = "瀹夌伅浜�", width = 15) @ApiModelProperty(value = "瀹夌伅浜�") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String operator; /** * 鍛煎彨鍘熷洜 @@ -84,6 +84,7 @@ */ @Excel(name = "鍝嶅簲浜�", width = 15) @ApiModelProperty(value = "鍝嶅簲浜�") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String responder; /** * 鍝嶅簲鏃堕棿 @@ -98,6 +99,7 @@ */ @Excel(name = "澶勭悊浜�", width = 15) @ApiModelProperty(value = "澶勭悊浜�") + @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") private String processor; /** * 澶勭悊瀹屾垚鏃堕棿 @@ -138,7 +140,7 @@ @Excel(name = "鍒犻櫎鏍囪", width = 15) @ApiModelProperty(value = "鍒犻櫎鏍囪") @TableLogic - private Integer delFlag; + private Integer delFlag = CommonConstant.DEL_FLAG_0; /** * 鍒涘缓浜� */ -- Gitblit v1.9.3