From 188532aada72d5e51204092a981460075f89f42f Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 15 十一月 2021 10:14:43 +0800
Subject: [PATCH] 危化品编码修改
---
src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml | 4 +++-
src/main/webapp/sys_dangerous_encode.xhtml | 4 ----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml b/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
index d6f2d9c..57c3513 100644
--- a/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/DangerousEncodeMapper.xml
@@ -298,6 +298,7 @@
</select>
<select id="selectByCodeAndName" resultType="com.nanometer.smartlab.entity.DangerousEncode">
select
+ id,
container_number containerNumber, reagent_code reagentCode, reagent_name reagentName, cas, memo, property, feature, avoid,
status, fire, random, code, update_time, creator, count
from sys_dangerous_encode
@@ -346,7 +347,8 @@
</select>
<select id="selectById" resultType="com.nanometer.smartlab.entity.DangerousEncode">
select
- <include refid="Base_Column_List" />
+ id,container_number containerNumber, reagent_code reagentCode, reagent_name reagentName, cas, memo,
+ property, feature, avoid, status, fire, random, code, update_time, creator, count
from sys_dangerous_encode
where id = #{id}
</select>
diff --git a/src/main/webapp/sys_dangerous_encode.xhtml b/src/main/webapp/sys_dangerous_encode.xhtml
index f49003e..2225650 100644
--- a/src/main/webapp/sys_dangerous_encode.xhtml
+++ b/src/main/webapp/sys_dangerous_encode.xhtml
@@ -117,10 +117,6 @@
<h:outputText value="#{row.avoid}"/>
</p:column>
- <p:column headerText="特性">
- <h:outputText value="#{row.avoid}"/>
- </p:column>
-
<p:column headerText="状态">
<h:outputText value="#{row.status}"/>
</p:column>
--
Gitblit v1.9.2