Browse Source

查看销售与助理的关系修改

yangzian 4 năm trước cách đây
mục cha
commit
b281978081

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsSaleAssistantInfoMapper.java

@@ -35,5 +35,7 @@ public interface CwjsSaleAssistantInfoMapper extends BaseMapper<CwjsSaleAssistan
      */
     List <CwjsSaleAssistantInfo> getCwAssistantNameList(String userId);
 
+    List <CwjsSaleAssistantInfo> getAssistantList(String userId);
+
     List <String> getCwAssistantNameListPolicy(String userId);
 }

+ 33 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsSaleAssistantInfoMapper.xml

@@ -86,6 +86,39 @@
         GROUP BY u.create_time;
     </select>
 
+    <!-- -->
+    <select id="getAssistantList" resultType="org.jeecg.ctop.finance.policy.entity.CwjsSaleAssistantInfo">
+        SELECT
+        u.id AS sale_id,
+        u.realname as sale_name,
+        uc.nick_name as nickName
+        FROM
+        sys_user u
+        LEFT JOIN user_company uc on u.id = uc.user_id
+        WHERE
+        u.id IN (
+        SELECT
+        s.sale_id
+        FROM
+        ctop_cwjs_sale_assistant_info s
+        WHERE
+        s.del_flag = 0
+        <if test="userId !=null and userId != ''">
+            AND s.sale_id = #{userId} OR s.assistant_id = #{userId}
+        </if>
+        UNION
+        SELECT
+        s.assistant_id
+        FROM
+        ctop_cwjs_sale_assistant_info s
+        WHERE
+        s.del_flag = 0
+        <if test="userId !=null and userId != ''">
+            AND s.sale_id = #{userId} OR s.assistant_id = #{userId}
+        </if>
+            )
+    </select>
+
 
     <!--查询对应销售助理 政策 -->
     <select id="getCwAssistantNameListPolicy" resultType="java.lang.String">

+ 16 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsSaleAssistantInfoServiceImpl.java

@@ -49,6 +49,7 @@ public class CwjsSaleAssistantInfoServiceImpl extends ServiceImpl<CwjsSaleAssist
     }
 
 
+/*
 
     public List<CwjsSaleAssistantInfo> getCwSaleAndAssistantList(String userId){
         List<CwjsSaleAssistantInfo> resultList = new ArrayList();
@@ -80,6 +81,21 @@ public class CwjsSaleAssistantInfoServiceImpl extends ServiceImpl<CwjsSaleAssist
         log.info("查询成功-助理。");
         return assistantList;
     }
+*/
+
+
+
+    public List<CwjsSaleAssistantInfo> getCwSaleAndAssistantList(String userId){
+        List<CwjsSaleAssistantInfo> resultList = new ArrayList();
+        String roleCode = roleMapper.getRoleCodeByUserId(userId);
+        //管理员 查询全部
+        if (StringUtils.equals("admin",roleCode) || "finance".equals(roleCode)){
+            userId = null;
+        }
+        //查询 销售
+        List <CwjsSaleAssistantInfo> saleList = cwjsSaleAssistantInfoMapper.getAssistantList(userId);
+        return saleList;
+    }
 
 
     /**