From 1195089a2f65e8773ef74f3d369d8f2ff1dd3f34 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 24 十月 2025 08:58:08 +0800
Subject: [PATCH] 任务信息显示码盘信息
---
src/main/webapp/views/taskWrk/taskWrk.html | 6 ++++++
src/main/java/com/zy/asrs/entity/TaskWrk.java | 15 +++++++++++++++
src/main/webapp/views/taskWrkLog/taskWrkLog.html | 6 ++++++
src/main/java/com/zy/asrs/entity/TaskWrkLog.java | 14 ++++++++++++++
4 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 1d75370..590b0f3 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -190,6 +190,7 @@
@TableField("lev")
private short lev;
+ // 鐮佺洏瀹屾垚涓婃姤 榛樿0.鏈笂鎶ワ紝1.宸蹭笂鎶�
@TableField("mp_completed_report")
private Integer mpCompletedReport;
@@ -263,6 +264,20 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
+ public String getMp$() {
+ if(Cools.isEmpty(this.mp)) {
+ return "";
+ }
+ return this.mp == 1 ? "Y" : "N";
+ }
+
+ public String getMpCompletedReport$() {
+ if(Cools.isEmpty(this.mpCompletedReport)) {
+ return "";
+ }
+ return this.mpCompletedReport == 1 ? "Y" : "N";
+ }
+
public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
index d4e8755..4b609c7 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrkLog.java
@@ -183,6 +183,20 @@
@TableField("mp_completed_report")
private Integer mpCompletedReport;
+ public String getMp$() {
+ if(Cools.isEmpty(this.mp)) {
+ return "";
+ }
+ return this.mp == 1 ? "Y" : "N";
+ }
+
+ public String getMpCompletedReport$() {
+ if(Cools.isEmpty(this.mpCompletedReport)) {
+ return "";
+ }
+ return this.mpCompletedReport == 1 ? "Y" : "N";
+ }
+
public TaskWrkLog() {
}
diff --git a/src/main/webapp/views/taskWrk/taskWrk.html b/src/main/webapp/views/taskWrk/taskWrk.html
index ba46faa..64a0031 100644
--- a/src/main/webapp/views/taskWrk/taskWrk.html
+++ b/src/main/webapp/views/taskWrk/taskWrk.html
@@ -90,6 +90,12 @@
</el-table-column>
<el-table-column property="memo" label="澶囨敞">
</el-table-column>
+ <el-table-column property="mp$" label="鐮佺洏鍚�">
+ </el-table-column>
+ <el-table-column property="lev" label="鐮佺洏灞傛暟">
+ </el-table-column>
+ <el-table-column property="mpCompletedReport$" label="鐮佺洏涓婃姤">
+ </el-table-column>
</el-table>
<div style="margin-top: 10px;">
diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index 12757f6..f17f14e 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -73,6 +73,12 @@
</el-table-column>
<el-table-column property="type" label="涓嬮檷楂樺害">
</el-table-column>
+ <el-table-column property="mp$" label="鐮佺洏鍚�">
+ </el-table-column>
+ <el-table-column property="lev" label="鐮佺洏灞傛暟">
+ </el-table-column>
+ <el-table-column property="mpCompletedReport$" label="鐮佺洏涓婃姤">
+ </el-table-column>
</el-table>
<div style="margin-top: 10px;">
--
Gitblit v1.9.1