Browse Source

新增营销团队开发

anderx 1 year ago
parent
commit
54e5cbe17e

+ 13 - 2
src/main/java/com/goafanti/admin/controller/AdminSalesTeamController.java

@@ -89,14 +89,25 @@ public class AdminSalesTeamController extends CertifyApiController {
     }
 
     /**
+     * 分页列表查询
+     *
+     * @param in 参数
+     * @return
+     */
+    @GetMapping("/pageList")
+    public Result<Pagination<SalesTeamBo>> pageList(SalesTeam in, Integer pageNo, Integer pageSize) {
+        return new Result<>().data(this.salesTeamService.pageList(in, pageNo, pageSize));
+    }
+
+    /**
      * 列表查询
      *
      * @param in 参数
      * @return
      */
     @GetMapping("/list")
-    public Result<Pagination<SalesTeamBo>> list(SalesTeam in, Integer pageNo, Integer pageSize) {
-        return new Result<>().data(this.salesTeamService.list(in, pageNo, pageSize));
+    public Result<Pagination<SalesTeamBo>> list(SalesTeam in) {
+        return new Result<>().data(this.salesTeamService.list(in));
     }
 
 }

+ 3 - 1
src/main/java/com/goafanti/admin/service/SalesTeamService.java

@@ -50,7 +50,9 @@ public interface SalesTeamService {
      * @param in 参数
      * @return 是否成功
      */
-    Object list(SalesTeam in, Integer pageNo, Integer pageSize);
+    Object list(SalesTeam in);
 
     boolean checkName(SalesTeam name);
+
+    Object pageList(SalesTeam in, Integer pageNo, Integer pageSize);
 }

+ 6 - 1
src/main/java/com/goafanti/admin/service/impl/SalesTeamServiceImpl.java

@@ -24,7 +24,7 @@ public class SalesTeamServiceImpl extends BaseMybatisDao<SalesTeamMapper> implem
 
 
     @Override
-    public Pagination<SalesTeamBo> list(SalesTeam salesTeam, Integer pageNo, Integer pageSize) {
+    public Pagination<SalesTeamBo> pageList(SalesTeam salesTeam, Integer pageNo, Integer pageSize) {
         return (Pagination<SalesTeamBo>) findPage("findSalesTeamList",
                 "findSalesTeamCount", salesTeam, pageNo, pageSize);
     }
@@ -85,4 +85,9 @@ public class SalesTeamServiceImpl extends BaseMybatisDao<SalesTeamMapper> implem
     public boolean deleteById(Integer id) {
         return this.salesTeamMapper.deleteById(id) > 0;
     }
+
+    @Override
+    public Object list(SalesTeam in) {
+        return salesTeamMapper.findSalesTeamLvlList(in);
+    }
 }

+ 3 - 3
src/main/java/com/goafanti/common/dao/SalesTeamMapper.java

@@ -3,7 +3,6 @@ package com.goafanti.common.dao;
 import com.goafanti.admin.bo.SalesTeamBo;
 import com.goafanti.common.model.SalesTeam;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.data.domain.Pageable;
 
 import java.util.List;
 
@@ -28,10 +27,9 @@ public interface SalesTeamMapper {
      * 查询指定行数据
      *
      * @param salesTeam 查询条件
-     * @param pageable  分页对象
      * @return 对象列表
      */
-    List<SalesTeam> findSalesTeamList(SalesTeam salesTeam, @Param("pageable") Pageable pageable);
+    List<SalesTeam> findSalesTeamList(SalesTeam salesTeam);
 
     /**
      * 统计总行数
@@ -85,5 +83,7 @@ public interface SalesTeamMapper {
     SalesTeam queryByName(String name);
 
     SalesTeamBo queryDetailsById(Integer id);
+
+    List<SalesTeamBo> findSalesTeamLvlList(SalesTeam in);
 }
 

+ 19 - 0
src/main/java/com/goafanti/common/mapper/SalesTeamMapper.xml

@@ -41,6 +41,9 @@
             <if test="status != null">
                 and a.status = #{status}
             </if>
+            <if test="lvl!= null">
+                and a.lvl = #{lvl}
+            </if>
         </where>
         <if test="page_sql != null">
             ${page_sql}
@@ -61,6 +64,9 @@
             <if test="status != null">
                 and a.status = #{status}
             </if>
+            <if test="lvl!= null">
+                and a.lvl = #{lvl}
+            </if>
         </where>
     </select>
 
@@ -146,5 +152,18 @@
         left join sales_team d on a.super_id=d.id
     where a.id = #{id}
     </select>
+
+    <select id="findSalesTeamLvlList" resultType="com.goafanti.admin.bo.SalesTeamBo">
+        select a.id, a.name, a.aid, a.lvl, a.dep_id depId, a.super_id superId, a.status, a.create_time createTime,
+        b.name adminName,c.name depName,d.name superName
+        from sales_team a left join admin b on a.aid=b.id left join department c on a.dep_id=c.id
+        left join sales_team d on a.super_id=d.id
+        <where>
+            <if test="lvl!= null">
+                and a.lvl = #{lvl}
+            </if>
+        </where>
+
+    </select>
 </mapper>