From 595651c193db846c17940d270f2886733c26f389 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 16 Aug 2024 14:56:59 +0800
Subject: [PATCH] =?UTF-8?q?1.2=20=E5=A2=9E=E5=8A=A0=E5=BE=80=E6=9D=A5?=
 =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/entity/auth/SysWorkplace.java    | 10 +++++++++-
 .../java/com/glxp/api/res/basic/UserWorkResponse.java  |  1 +
 .../mybatis/mapper/basic/BasicCollectUserMapper.xml    |  4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java
index 80abf001e..8b039f67d 100644
--- a/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java
+++ b/src/main/java/com/glxp/api/entity/auth/SysWorkplace.java
@@ -100,12 +100,20 @@ public class SysWorkplace implements Serializable {
     @TableField(value = "unitTittle")
     private String unitTittle;
 
+
     /**
-     * 单据类型ID
+     * 来源单据的编号 basic_collect_bustype表里面的code
      */
     @TableField(value = "orderId")
     private String orderId;
 
+    /**
+     *  往来单位类型 1:客户,2:供应商,3:内部科室,4:特殊往来
+     */
+    @TableField(value = "corpType")
+    private Integer corpType;
+
+
     @TableField(exist = false)
     private String invName;
 
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 5c073cb5a..06eb65f6d 100644
--- a/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UserWorkResponse.java
@@ -75,5 +75,6 @@ public class UserWorkResponse  {
 
     private String employeeName;
     private String userName;
+    private Integer corpType;
 
 }
diff --git a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml
index d61ca6a4b..d3da08525 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicCollectUserMapper.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.basic.BasicCollectUserMapper">
     <select id="filterList" resultType="com.glxp.api.res.basic.UserWorkResponse">
-        select bcu.id,sw.workplaceName,sw.invCode,sw.workplaceId,sw.constituencies,sw.operationType,sw.checkInsert,sw.warnType,sw.unitTittle,
-               au.userName,au.employeeName
+        select bcu.id,sw.workplaceName,sw.invCode,sw.workplaceId,sw.constituencies,sw.operationType,sw.checkInsert,sw.warnType,sw.unitTittle,sw.corpType,
+               au.userName,au.employeeName,sw.createTime as createTime
          from basic_collect_user bcu
             left join auth_user au on bcu.userId = au.id
             left join sys_workplace sw on bcu.workplaceCode = sw.workplaceId