From f9129a94e2b579cbfc70086458f4b05096e26677 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 28 七月 2025 10:12:22 +0800
Subject: [PATCH] 修复工作明细历史搜索条件精确匹配，字段映射
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 013ab54..605be35 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -137,7 +137,7 @@
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "1姣嶆墭鐩橈紝2瀛愭墭鐩�")
@TableField("plt_type")
private Integer pltType;
@@ -294,7 +294,7 @@
// Y:閿�鍞鍗曞嚭搴撲换鍔�
@ApiModelProperty(value= "")
@TableField("Pdc_type")
- private String PdcType;
+ private String pdcType;
@ApiModelProperty(value= "")
@TableField("ctn_no")
@@ -341,6 +341,14 @@
@ApiModelProperty(value= "RGV鐩爣绔�")
@TableField("rgv_dsta_no")
private Integer rgvDstaNo;
+
+ @ApiModelProperty(value= "rgv鍛戒护涓嬪彂鏃堕棿")
+ @TableField("rgv_create_time")
+ private Date rgvCreateTime;
+
+ @ApiModelProperty(value= "rgv浠诲姟瀹屾垚鏃堕棿")
+ @TableField("rgv_finish_time")
+ private Date rgvFinishTime;
/**
* 浼寸敓宸ヤ綔鍙�
@@ -397,6 +405,8 @@
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
+ } else if(!Cools.isEmpty(this.locNo)) {
+ return this.locNo;
}
return null;
}
--
Gitblit v1.9.1