From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/PrecisionInspection.java | 24 ++++++++++++++++++------
1 files changed, 18 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..3aa8ed9 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;
@@ -84,6 +84,9 @@
@Excel(name = "鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰", width = 15)
@ApiModelProperty(value = "鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰")
private Integer meetProcessRequire;
+ @Excel(name = "鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰璇存槑", width = 15)
+ @ApiModelProperty(value = "鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰璇存槑")
+ private String meetProcessRequireRemark;
/**浣跨敤鍗曚綅鎶�鏈富绠�*/
@Excel(name = "浣跨敤鍗曚綅鎶�鏈富绠�", width = 15)
@ApiModelProperty(value = "浣跨敤鍗曚綅鎶�鏈富绠�")
@@ -91,7 +94,7 @@
/**璁惧鍒ゅ畾缁撴灉*/
@Excel(name = "璁惧鍒ゅ畾缁撴灉", width = 15)
@ApiModelProperty(value = "璁惧鍒ゅ畾缁撴灉")
- private Integer judgmentResult;
+ private String judgmentResult;
/**澶囨敞*/
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
@@ -120,9 +123,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