From c2ce3b521b81a0af47c6f62e914baeee59508d52 Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Thu, 21 Nov 2024 16:26:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5active=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java | 2 ++
 .../java/com/spring/modules/Tooling/entity/IfsTool.java  | 9 +++++++++
 .../modules/Tooling/service/impl/ToolServiceImpl.java    | 1 +
 3 files changed, 12 insertions(+)

diff --git a/src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java b/src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java
index 75bed15e..54c5a14e 100644
--- a/src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java
+++ b/src/main/java/com/spring/modules/Tooling/dao/impl/ToolDaoImpl.java
@@ -145,9 +145,11 @@ public class ToolDaoImpl implements ToolDao {
         StringBuilder sql = new StringBuilder();
         sql.append("INSERT INTO tool_header(site, tool_id, tool_description, c_tool_type, c_calendar_id, c_sched_capacity,");
         sql.append(" c_calibration_control, c_calibration_time, c_alternate_tool_id, c_last_used, c_enabled_for_control_plan_db, c_note_text,");
+        sql.append(" active,"); //2024-11-21新增字段
         sql.append(" created_by, create_date, c_state, c_property_no, ifs_row_id, ifs_row_version)");
         sql.append("VALUES(:site, :toolId, :toolDesc, :toolType, :calendarId, :schedCapacity,");
         sql.append(" :calibrationControl, :calibrationTime, :alternateToolId, :lastUsed, :enabledForControlPlanDb, :noteText,");
+        sql.append(" :active,"); //2024-11-21新增字段
         sql.append(" :username, :createDate, :state, :propertyNo, :ifsRowId, :ifsRowVersion)");
         parameterJdbcTemplate.update(sql.toString(), new BeanPropertySqlParameterSource(inData));
     }
diff --git a/src/main/java/com/spring/modules/Tooling/entity/IfsTool.java b/src/main/java/com/spring/modules/Tooling/entity/IfsTool.java
index 0f2cfab0..eb0842ac 100644
--- a/src/main/java/com/spring/modules/Tooling/entity/IfsTool.java
+++ b/src/main/java/com/spring/modules/Tooling/entity/IfsTool.java
@@ -25,6 +25,7 @@ public class IfsTool extends PageData {
     private String state;
     private String propertyNo;
     private Date updatedDate;
+    private String active;//2024-11-21 新增的字段
 
     public IfsTool() {
     }
@@ -189,4 +190,12 @@ public class IfsTool extends PageData {
     public void setUpdatedDate(Date updatedDate) {
         this.updatedDate = updatedDate;
     }
+
+    public String getActive() {
+        return active;
+    }
+
+    public void setActive(String active) {
+        this.active = active;
+    }
 }
diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java
index 1e017f0f..5acd26f3 100644
--- a/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java
+++ b/src/main/java/com/spring/modules/Tooling/service/impl/ToolServiceImpl.java
@@ -119,6 +119,7 @@ public class ToolServiceImpl implements ToolService {
             String resultMsg = String.valueOf(resultMap.get("result_msg"));
             throw new RuntimeException(resultMsg);
         }
+        inData.setActive("Y");
         inData.setState("Active");
         inData.setCreateDate(new Date());
         //3.校验是否需要插入属性模版的数据