From 189d9f14e49338ae69c34c2414e329b2c98a7196 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 15 Jun 2024 08:24:55 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisSiteAccountController.java      | 12 ++++++++++++
 .../erp/emis/mapper/EmisSiteAccountMapper.java       |  7 +++++++
 .../com/xdadan/erp/emis/service/EmisBaseService.java | 11 +++++++++++
 .../service/impl/EmisSiteAccountServiceImpl.java     |  4 +++-
 .../main/resources/mapper/EmisSiteAccountMapper.xml  |  7 +++++++
 5 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java
index 4af60904e..3a07acc97 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSiteAccountController.java
@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.xdadan.erp.common.utils.DateUtils;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
+import com.xdadan.erp.emis.service.EmisBaseService;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
@@ -54,6 +55,9 @@ public class EmisSiteAccountController extends EmisBaseController
     @Autowired
     private IEmisSiteAccountService emisSiteAccountService;
 
+    @Autowired
+    private EmisBaseService emisBaseService;
+
     /**
      * 查询网点结算账户列表
      */
@@ -100,6 +104,14 @@ public class EmisSiteAccountController extends EmisBaseController
         return toAjax(emisSiteAccountService.insertEmisSiteAccount(emisSiteAccount));
     }
 
+    /**
+     * 获取已开户网点
+     */
+    @GetMapping(value = "/getHasAddSite")
+    public AjaxResult getHasAddSite()
+    {
+        return AjaxResult.success(emisBaseService.getHasAddSite());
+    }
 
     /**
      * 批量开户
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java
index d86936c47..d8e8c9928 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSiteAccountMapper.java
@@ -67,4 +67,11 @@ public interface EmisSiteAccountMapper extends BaseMapper<EmisSiteAccount>
      * @return 结果
      */
     public int deleteEmisSiteAccountByIds(Long[] ids);
+
+
+    /**
+     * 获取已开户网点表
+     * @return
+     */
+    public String getHasAddSite();
 }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 8bf85220e..d5ce2e435 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -122,6 +122,9 @@ public class EmisBaseService {
      @Autowired
      private EmisWaybillTransferMapper emisWaybillTransferMapper;
 
+     @Autowired
+     private EmisSiteAccountMapper emisSiteAccountMapper;
+
 
      /**
       * 获取客户完整手机号 国家+电话  eg: 0086-1381861188
@@ -174,6 +177,14 @@ public class EmisBaseService {
          return emisWaybillMapper.selectWaybillStatByEmpCode(empNo,null);
      }
 
+     /**
+      * 获取已经开户网点列表
+      * @return
+      */
+     public String getHasAddSite(){
+        return emisSiteAccountMapper.getHasAddSite();
+     }
+
      /**
       * 获取员工提成信息
       * @param empNo
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteAccountServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteAccountServiceImpl.java
index 9d58f556e..c786911ad 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteAccountServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSiteAccountServiceImpl.java
@@ -11,6 +11,8 @@
 package com.xdadan.erp.emis.service.impl;
 
 import java.util.List;
+
+import com.xdadan.erp.emis.service.EmisBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisSiteAccount;
@@ -24,7 +26,7 @@ import com.xdadan.erp.emis.service.IEmisSiteAccountService;
  * @date 2024-03-07 10:48:12
  */
 @Service
-public class EmisSiteAccountServiceImpl implements IEmisSiteAccountService 
+public class EmisSiteAccountServiceImpl extends EmisBaseService implements IEmisSiteAccountService
 {
     @Autowired
     private EmisSiteAccountMapper emisSiteAccountMapper;
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
index f01507d64..6b7c4fff3 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
@@ -101,6 +101,13 @@
         where a.id = #{id}
     </select>
 
+
+    <select id="getHasAddSite"  resultType="String">
+        select GROUP_CONCAT(distinct site_code) as site_code
+        from emis_site_account a
+        where del_flag='0'
+    </select>
+
     <insert id="insertEmisSiteAccount" parameterType="EmisSiteAccount" useGeneratedKeys="true" keyProperty="id">
         insert into emis_site_account
         <trim prefix="(" suffix=")" suffixOverrides=",">