From 3ec33511ce5a20e380d91885c8668a72c9dc6ae6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 14 Dec 2022 17:45:10 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=BE=E5=A4=87=E9=A2=86=E7=94=A8=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=B7=BB=E5=8A=A0=E9=A2=86=E7=94=A8=E4=BA=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/DeviceCollectOrderEntity.java   |  7 +++-
 .../inventory/DeviceCollectOrderDao.xml       | 39 ++++++++++++-------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java
index eaf9c77a..f1fe0152 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/DeviceCollectOrderEntity.java
@@ -23,7 +23,7 @@ public class DeviceCollectOrderEntity {
     private String deptCode;
 
     /**
-    * 领用人
+    * 创建人
     */
     private String createUser;
 
@@ -46,4 +46,9 @@ public class DeviceCollectOrderEntity {
     * 状态   0：草稿   1：未审核   2：已审核
     */
     private Integer status;
+
+    /**
+     * 领用人
+     */
+    private String collectUser;
 }
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml
index e0556375..1e34dfdc 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/DeviceCollectOrderDao.xml
@@ -10,6 +10,7 @@
         <result column="createTime" jdbcType="VARCHAR" property="createTime"/>
         <result column="updateTime" jdbcType="VARCHAR" property="updateTime"/>
         <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="collectUser" jdbcType="VARCHAR" property="collectUser"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -20,7 +21,8 @@
         auditUser,
         createTime,
         updateTime,
-        `status`
+        `status`,
+        collectUser
     </sql>
 
     <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
@@ -40,10 +42,10 @@
             parameterType="com.glxp.api.admin.entity.inventory.DeviceCollectOrderEntity" useGeneratedKeys="true">
         insert into device_collect_order (orderId, deptCode, `createUser`,
                                           auditUser, createTime, updateTime,
-                                          `status`)
+                                          `status`, collectUser)
         values (#{orderId,jdbcType=VARCHAR}, #{deptCode,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR},
                 #{auditUser,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},
-                #{status,jdbcType=INTEGER})
+                #{status,jdbcType=INTEGER}, #{collectUser,jdbcType=VARCHAR})
     </insert>
 
     <insert id="insertSelective" keyColumn="id" keyProperty="id"
@@ -71,6 +73,9 @@
             <if test="status != null">
                 `status`,
             </if>
+            <if test="collectUser != null">
+                collectUser,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderId != null">
@@ -94,6 +99,9 @@
             <if test="status != null">
                 #{status,jdbcType=INTEGER},
             </if>
+            <if test="collectUser != null">
+                #{collectUser,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
 
@@ -122,6 +130,9 @@
             <if test="status != null">
                 `status` = #{status,jdbcType=INTEGER},
             </if>
+            <if test="collectUser != null">
+                collectUser = #{collectUser,jdbcType=VARCHAR},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -134,22 +145,24 @@
             auditUser    = #{auditUser,jdbcType=VARCHAR},
             createTime   = #{createTime,jdbcType=VARCHAR},
             updateTime   = #{updateTime,jdbcType=VARCHAR},
-            `status`     = #{status,jdbcType=INTEGER}
+            `status`     = #{status,jdbcType=INTEGER},
+            collectUser     = #{collectUser,jdbcType=VARCHAR}
         where id = #{id,jdbcType=INTEGER}
     </update>
 
     <select id="filterList" resultType="com.glxp.api.admin.res.inventory.DeviceCollectOrderResponse">
         select dco.id,
-               dco.orderId,
-               dco.deptCode,
-               dco.createUser,
-               dco.auditUser,
-               dco.createTime,
-               dco.updateTime,
-               dco.status,
-               auth_dept.name deptName
+        dco.orderId,
+        dco.deptCode,
+        dco.createUser,
+        dco.auditUser,
+        dco.createTime,
+        dco.updateTime,
+        dco.status,
+        dco.collectUser,
+        auth_dept.name deptName
         from device_collect_order dco
-                 left join auth_dept on dco.deptCode = auth_dept.code
+        left join auth_dept on dco.deptCode = auth_dept.code
         <where>
             <if test="status != null">
                 AND dco.status = #{status}