From 40ca5988d40e21eb5678c205aac792b04c248140 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 26 Feb 2025 17:51:20 +0800 Subject: [PATCH] =?UTF-8?q?2/26=20=E5=B7=A5=E4=BD=8D=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/res/basic/SysWorkplaceResponse.java | 3 +++ src/main/java/com/glxp/api/res/basic/UserWorkResponse.java | 5 +++++ .../mybatis/mapper/basic/BasicCollectUserMapper.xml | 4 +++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java index a4413ea0d..097c944f2 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceResponse.java @@ -143,6 +143,9 @@ public class SysWorkplaceResponse { @TableField(value = "workPlaceClass") private Integer workPlaceClass; + + private Integer productType; + private String queueStatus; /** diff --git a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java index 6757eba25..c45260db2 100644 --- a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java @@ -85,4 +85,9 @@ public class UserWorkResponse { private Integer queueStatus; + /** + * 1 器械业务 2药品业务 + */ + private Integer productType; + } diff --git a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml index 5eecdd037..bd8e85804 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml @@ -14,7 +14,9 @@ sw.workplaceStatus, sw.workplaceType, sw.invRemindNumber, - sw.workPlaceClass,sw.queueStatus, + sw.workPlaceClass, + sw.queueStatus, + sw.productType, ad.name deptCodeName from basic_collect_user bcu left join auth_user au on bcu.userId = au.id