1.设备领用记录添加领用人字段

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;
 }

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.orderId,
-               dco.deptCode,
+        dco.deptCode,
-               dco.createUser,
+        dco.createUser,
-               dco.auditUser,
+        dco.auditUser,
-               dco.createTime,
+        dco.createTime,
-               dco.updateTime,
+        dco.updateTime,
-               dco.status,
+        dco.status,
-               auth_dept.name deptName
+        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}