From d3f11759e6b32d7e9e63e0f7b0cc4b6874aea020 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 28 八月 2023 11:14:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 0383b98..351ab4a 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -58,9 +58,9 @@
private String maktx;
/**
- * 鎵瑰彿
+ * 搴忓垪鐮�
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value= "搴忓垪鐮�")
private String batch;
/**
@@ -268,6 +268,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
+ */
+ @ApiModelProperty(value= "涓婃灦鍖哄煙")
+ @TableField("mat_type")
+ private Integer matType;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
@@ -357,5 +364,20 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getMatType$() {
+ if (this.matType == null) {
+ return "";
+ }
+ switch (this.matType) {
+ case 1:
+ return "鍗曞搧鍖�";
+ case 2:
+ return "楂橀娣锋斁鍖�";
+ case 3:
+ return "浣庨娣锋斁鍖�";
+ default:
+ return "";
+ }
+ }
}
--
Gitblit v1.9.1