From 849447728d34d72c113c65f3cd83d366f439dfe3 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 19 Jul 2024 15:48:26 +0800
Subject: [PATCH] md

---
 .../erp/oms/web/Oms2cWaybillController.java   | 20 +++++++++++++++++++
 .../erp/oms/mapper/EmisWaybillMapper.java     |  9 +++++++++
 .../erp/oms/service/IEmisWaybillService.java  |  3 ++-
 .../service/impl/EmisWaybillServiceImpl.java  |  6 ++++++
 .../resources/mapper/EmisWaybillMapper.xml    | 17 ++++++++++++++++
 5 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
index 4796ab3..d8c368b 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
@@ -209,6 +209,26 @@ public class Oms2cWaybillController extends BaseController
     }
 
 
+    @GetMapping("/queryNewSalesmen")
+    public AjaxResult queryNewSalesmen(String  searchValue)
+    {
+//        "empCode": "业务员编码",
+//            "empName": "业务员名称",
+//            "rate": "3",
+//            "avater": "http://123213",
+//            "phone":"联系电话",
+//            "ownerSiteCode":"所属网点编号",
+//            "ownerSiteName":"所属网点名称",
+        Map emp = emisWaybillService.queryNewSalesmen(searchValue);
+        if(emp==null){
+            return AjaxResult.error("业务员不存在");
+        }
+        return AjaxResult.success("获取成功",emp);
+    }
+
+
+
+
     @GetMapping("/listWmsWarehouse")
     public AjaxResult listWmsWarehouse(Integer pageNum,Integer pageSize,String searchValue)
     {
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
index 55fcf8e..bb1fe11 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
@@ -42,6 +42,15 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      */
     public List<Map> selectUserBindSalesmenList(@Param("customerCode") String customerCode,@Param("searchValue")String searchValue);
 
+
+    /**
+     * 业务员信息查询
+     * @param searchValue
+     * @return
+     */
+    public Map queryNewSalesmen(@Param("searchValue")String searchValue);
+
+
     /**
      * 绑定专属业务员
      * @param customerCode
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
index 53820ad..e2353b4 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
@@ -36,7 +36,8 @@ public interface IEmisWaybillService
 
     public int bindSalesmen(String empCode) throws EmisBizError;
 
-//    public int bindMonthPayCode(String monthPayCode) throws EmisBizError;
+    public Map queryNewSalesmen(String searchValue);
+
 
 
 
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
index cfe19e0..b3306ea 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
@@ -77,6 +77,12 @@ public class EmisWaybillServiceImpl  implements IEmisWaybillService
         return emisWaybillMapper.selectUserBindSalesmenList(SecurityUtils.getLoginUser().getUser().getCustomerCode(),searchValue);
     }
 
+    @Override
+    public Map queryNewSalesmen(String searchValue)
+    {
+        return emisWaybillMapper.queryNewSalesmen(searchValue);
+    }
+
     @Override
     public int bindSalesmen(String empCode) throws EmisBizError {
 
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index d65c4ba..1a9614a 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -559,6 +559,23 @@
         </if>
     </select>
 
+    <select id="queryNewSalesmen" resultType="map">
+        SELECT
+        a.emp_code AS empCode,
+        a.emp_name AS empName,
+        a.extra_data AS rate,
+        a.avatar,
+        a.phonenumber AS phone,
+        a.owner_site_code AS ownerSiteCode,
+        b.site_name AS ownerSiteName
+        FROM
+        sys_user a,emis_site b
+        WHERE a.owner_site_code=b.site_code
+        <if test="searchValue != null and searchValue != ''">
+            and a.emp_code=#{searchValue}
+        </if>
+    </select>
+
 
     <select id="checkEmpIsExist" resultType="int">
         select count(1) from sys_user  where del_flag='0' and emp_code=#{empCode}