From 6a3591c42a84b36d24d75f4584f0eeb145bb4de7 Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期五, 15 三月 2024 15:00:24 +0800 Subject: [PATCH] xg --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java index a409c05..79a45b8 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java @@ -4,12 +4,12 @@ import java.io.UnsupportedEncodingException; import java.util.Date; import java.math.BigDecimal; -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 java.util.List; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.common.constant.CommonConstant; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -91,7 +91,7 @@ /**璁惧鍒ゅ畾缁撴灉*/ @Excel(name = "璁惧鍒ゅ畾缁撴灉", width = 15) @ApiModelProperty(value = "璁惧鍒ゅ畾缁撴灉") - private Integer judgmentResult; + private String judgmentResult; /**澶囨敞*/ @Excel(name = "澶囨敞", width = 15) @ApiModelProperty(value = "澶囨敞") @@ -120,9 +120,18 @@ @Excel(name = "delFlag", width = 15) @ApiModelProperty(value = "delFlag") @TableLogic - private Integer delFlag; + private Integer delFlag = CommonConstant.DEL_FLAG_0; /**璁惧妫�楠屽憳绛惧瓧锛堢洊绔狅級*/ @Excel(name = "璁惧妫�楠屽憳绛惧瓧锛堢洊绔狅級", width = 15) @ApiModelProperty(value = "璁惧妫�楠屽憳绛惧瓧锛堢洊绔狅級") private String equipmentInspectorSignUser; + + /** + * 鍗曟嵁id + */ + @TableField(exist = false) + private String receipts; + + @TableField(exist = false) + private List<PrecisionInspectionDetail> precisionInspectionDetailList; } -- Gitblit v1.9.3