From 2ea9df20878e079c3fdcf7873b8b72380eca5253 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 3 Apr 2023 11:52:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xujie/sys/modules/pms/data/EamObjectData.java | 13 +++++++++++--
 .../pms/service/Impl/EamObjectServiceImpl.java    |  2 ++
 src/main/resources/mapper/pms/EamObjectMapper.xml | 15 +++++++++------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamObjectData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamObjectData.java
index e24558b6..69ff88fa 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamObjectData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamObjectData.java
@@ -2,10 +2,11 @@ package com.xujie.sys.modules.pms.data;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xujie.sys.common.utils.QueryPage;
+import org.apache.ibatis.type.Alias;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
-
+@Alias("EamObjectData")
 public class EamObjectData extends QueryPage {
     /**
      *
@@ -16,7 +17,7 @@ public class EamObjectData extends QueryPage {
      *
      */
     private String objectID;
-
+    private String resourceID;
     /**
      *
      */
@@ -205,5 +206,13 @@ public class EamObjectData extends QueryPage {
     public void setManufacturerID(String manufacturerID) {
         this.manufacturerID = manufacturerID;
     }
+
+    public String getResourceID() {
+        return resourceID;
+    }
+
+    public void setResourceID(String resourceID) {
+        this.resourceID = resourceID;
+    }
 }
 
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java
index fc06c7d9..34f27a32 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamObjectServiceImpl.java
@@ -77,6 +77,7 @@ public class EamObjectServiceImpl implements EamObjectService {
         params.add(groupId);
         params.add(supplierId);
         params.add(manufacturerId);
+        params.add(inData.getResourceID());
         //执行方法
         List<Map<String, Object>> resultList = procedureDao.getProcedureData("checkInsertEamObject", params);
         return resultList.get(0);
@@ -118,6 +119,7 @@ public class EamObjectServiceImpl implements EamObjectService {
         params.add(groupId);
         params.add(supplierId);
         params.add(manufacturerId);
+        params.add(inData.getResourceID());
         //执行方法
         List<Map<String, Object>> resultList = procedureDao.getProcedureData("checkUpdateEamObject", params);
         return resultList.get(0);
diff --git a/src/main/resources/mapper/pms/EamObjectMapper.xml b/src/main/resources/mapper/pms/EamObjectMapper.xml
index bb55bede..41dc0448 100644
--- a/src/main/resources/mapper/pms/EamObjectMapper.xml
+++ b/src/main/resources/mapper/pms/EamObjectMapper.xml
@@ -6,15 +6,18 @@
 <!--查询设备清单的接口-->
 <select id="getEamObjectList"  parameterType="EamObjectData" resultType="EamObjectData">
     SELECT Site, ObjectID, ObjectDesc, LocationID, FamilyID, GroupID, SupplierID, manufacturerID, SeqNo,
-    PurchessDate, Active, CreateDate, CreateBy, ClosedDate, ClosedBy
+    PurchessDate, Active, CreateDate, CreateBy, ClosedDate, ClosedBy ,resourceID
     FROM eam_object
     <where>
         AND site = #{query.site}
         <if test="query.objectID != null and query.objectID != ''">
-            AND ObjectID like '%' + #{objectID} +'%'
+            AND ObjectID like '%' + #{query.objectID} +'%'
         </if>
         <if test="query.objectDesc != null and query.objectDesc != ''">
             AND ObjectDesc like '%' + #{query.objectDesc} +'%'
+        </if>
+         <if test="query.resourceID != null and query.resourceID != ''">
+            AND resourceID like '%' + #{query.resourceID} +'%'
         </if>
         <if test="query.locationID != null and query.locationID != ''">
             AND LocationID like '%' + #{query.locationID} +'%'
@@ -31,7 +34,7 @@
 <!--查询设备清单按照设备的id-->
 <select id="getEamObjectByObjectId"  parameterType="EamObjectData" resultType="EamObjectData">
     SELECT Site, ObjectID, ObjectDesc, LocationID, FamilyID, GroupID, SupplierID, manufacturerID, SeqNo,
-    PurchessDate, Active, CreateDate, CreateBy, ClosedDate, ClosedBy
+    PurchessDate, Active, CreateDate, CreateBy, ClosedDate, ClosedBy,resourceID
     FROM eam_object
     <where>
         AND site = #{site}  AND ObjectID = #{objectID}
@@ -41,16 +44,16 @@
 <!--插入设备清单的数据-->
 <insert id="insertEamObject">
     insert into eam_object(Site, ObjectID, ObjectDesc, LocationID, FamilyID, GroupID, SupplierID, ManufacturerID, SeqNo,
-                           PurchessDate, Active, CreateDate, CreateBy)
+                           PurchessDate, Active, CreateDate, CreateBy,resourceID)
     values(#{site}, #{objectID}, #{objectDesc}, #{locationID}, #{familyID}, #{groupID}, #{supplierID}, #{manufacturerID}, #{seqNo},
-           #{purchessDate}, #{active}, #{createDate}, #{createBy})
+           #{purchessDate}, #{active}, #{createDate}, #{createBy},#{resourceID})
 </insert>
 
 <!--修改设备清单的数据-->
 <update id="updateEamObject">
     update eam_object set ObjectDesc = #{objectDesc}, LocationID = #{locationID}, FamilyID = #{familyID}, GroupID = #{groupID},
    SupplierID = #{supplierID}, ManufacturerID = #{manufacturerID}, SeqNo = #{seqNo}, PurchessDate = #{purchessDate}, Active =  #{active}
-   where site = #{site}  AND ObjectID = #{objectID}
+   ,resourceID=#{resourceID} where site = #{site}  AND ObjectID = #{objectID}
 </update>
 
 <!--删除设备清单的信息-->