From d164df98abff9bffba850b8edbcfe74989ed52b6 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Thu, 24 Aug 2023 10:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/technology/domain/ProRoute.java    | 42 +++++++++++++++++++
 .../mapper/technology/ProRouteMapper.xml      | 26 ++++++++++--
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/op-modules/op-technology/src/main/java/com/op/technology/domain/ProRoute.java b/op-modules/op-technology/src/main/java/com/op/technology/domain/ProRoute.java
index 43cd688e1..996b85b7c 100644
--- a/op-modules/op-technology/src/main/java/com/op/technology/domain/ProRoute.java
+++ b/op-modules/op-technology/src/main/java/com/op/technology/domain/ProRoute.java
@@ -53,6 +53,18 @@ public class ProRoute extends BaseEntity
     /** 预留字段4 */
     private String attr4;
 
+    /** 人工 */
+    private String tecMan;
+
+    /** 机器 */
+    private String tecMachine;
+
+    /** 折旧 */
+    private String tecDepreciation;
+
+    /** 其他 */
+    private String tecOther;
+
     private String fileList;
     private List<BaseFile> files;
 
@@ -182,6 +194,32 @@ public class ProRoute extends BaseEntity
         this.needCheck = needCheck;
     }
 
+    public void setTecMan(String tecMan) {
+        this.tecMan = tecMan;
+    }
+    public String getTecMan() {
+        return tecMan;
+    }
+
+    public void setTecMachine(String tecMachine) {
+        this.tecMachine = tecMachine;
+    }
+    public String getTecMachine() {
+        return tecMachine;
+    }
+
+    public String getTecDepreciation() { return tecDepreciation; }
+    public void setTecDepreciation(String tecDepreciation) {
+        this.tecDepreciation = tecDepreciation;
+    }
+
+    public String getTecOther() {
+        return tecOther;
+    }
+    public void setTecOther(String tecOther) {
+        this.tecOther = tecOther;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -199,6 +237,10 @@ public class ProRoute extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("tecMan",getTecMan())
+            .append("tecMachine",getTecMachine())
+            .append("tecOther",getTecOther())
+            .append("tecDepreciation",getTecDepreciation())
             .toString();
     }
 }
diff --git a/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteMapper.xml b/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteMapper.xml
index 870d103f1..6016d0795 100644
--- a/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteMapper.xml
+++ b/op-modules/op-technology/src/main/resources/mapper/technology/ProRouteMapper.xml
@@ -21,13 +21,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="routeVersion"    column="route_version"    />
         <result property="needCheck"    column="need_check"    />
-
+        <!--新增-->
+        <result property="tecMan"    column="tec_man"    />
+        <result property="tecMachine"    column="tec_machine"    />
+        <result property="tecOther"    column="tec_other"    />
+        <result property="tecDepreciation"    column="tec_depreciation"    />
     </resultMap>
 
     <sql id="selectProRouteVo">
         select route_id, route_code, route_name, route_desc, enable_flag, remark,
                attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time,
-               route_version,need_check
+               route_version,need_check,tec_man,tec_machine,tec_other,tec_depreciation
         from pro_route
     </sql>
 
@@ -59,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="checkRouteCodeUnique" parameterType="ProRoute" resultMap="ProRouteResult">
         select top 1 route_id, route_code, route_name, route_desc,
                enable_flag, remark, attr1, attr2, attr3, attr4,
-               create_by, create_time, update_by, update_time,need_check
+               create_by, create_time, update_by, update_time,need_check,tec_man,tec_machine,tec_other,tec_depreciation
         from pro_route
         where route_code = #{routeCode}
     </select>
@@ -89,7 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="routeVersion != null">route_version,</if>
             <if test="needCheck != null">need_check,</if>
-
+            -- 新增
+            <if test="tecMan != null">tec_man,</if>
+            <if test="tecMachine != null">tec_machine,</if>
+            <if test="tecOther != null">tec_other,</if>
+            <if test="tecDepreciation != null">tec_depreciation,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="routeId != null and routeId != ''">#{routeId},</if>
@@ -108,6 +116,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="routeVersion != null">#{routeVersion},</if>
             <if test="needCheck != null">#{needCheck},</if>
+            -- 新增
+            <if test="tecMan != null">#{tecMan},</if>
+            <if test="tecMachine != null">#{tecMachine},</if>
+            <if test="tecOther != null">#{tecOther},</if>
+            <if test="tecDepreciation != null">#{tecDepreciation},</if>
          </trim>
     </insert>
 
@@ -129,6 +142,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="routeVersion != null">route_version = #{routeVersion},</if>
             <if test="needCheck != null">need_check=#{needCheck},</if>
+            -- 新增
+            <if test="tecMan != null">tec_man = #{tecMan},</if>
+            <if test="tecMachine != null">tec_machine = #{tecMachine},</if>
+            <if test="tecOther != null">tec_other = #{tecOther},</if>
+            <if test="tecDepreciation != null">tec_depreciation=#{tecDepreciation},</if>
         </trim>
         where route_id = #{routeId}
     </update>