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 @@ + @@ -20,7 +21,8 @@ auditUser, createTime, updateTime, - `status` + `status`, + collectUser 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 AND dco.status = #{status}