Procházet zdrojové kódy

修改报销未走完单提示语。

anderx před 1 rokem
rodič
revize
1d9500fe3b

+ 8 - 0
src/main/java/com/goafanti/admin/bo/SalesTeamBo.java

@@ -3,6 +3,7 @@ package com.goafanti.admin.bo;
 import com.goafanti.common.model.SalesTeam;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 public class SalesTeamBo extends SalesTeam {
 
@@ -14,8 +15,15 @@ public class SalesTeamBo extends SalesTeam {
     private Integer teamConnectSum;
     private Integer teamValidSum;
     private BigDecimal teamCallDurationSum;
+    private List<SalesTeamBo> list;
 
+    public List<SalesTeamBo> getList() {
+        return list;
+    }
 
+    public void setList(List<SalesTeamBo> list) {
+        this.list = list;
+    }
 
     public SalesTeamBo() {
     }

+ 12 - 1
src/main/java/com/goafanti/admin/controller/AdminSalesTeamController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 营销团队(SalesTeam)表控制层
@@ -102,7 +103,7 @@ public class AdminSalesTeamController extends CertifyApiController {
     /**
      * 列表查询
      *
-     * @param in 参数
+     * @param lvl 层级
      * @return
      */
     @GetMapping("/list")
@@ -110,5 +111,15 @@ public class AdminSalesTeamController extends CertifyApiController {
         return new Result<>().data(this.salesTeamService.list(lvl));
     }
 
+    /**
+     * 团队层级列表查询
+     *
+     * @return
+     */
+    @GetMapping("/lvlList")
+    public Result<List<SalesTeamBo>> lvlList() {
+        return new Result<>().data(this.salesTeamService.lvlList());
+    }
+
 }
 

+ 2 - 0
src/main/java/com/goafanti/admin/service/SalesTeamService.java

@@ -54,4 +54,6 @@ public interface SalesTeamService {
     boolean checkName(SalesTeam name);
 
     Object pageList(SalesTeam in, Integer pageNo, Integer pageSize);
+
+    Object lvlList();
 }

+ 29 - 0
src/main/java/com/goafanti/admin/service/impl/SalesTeamServiceImpl.java

@@ -10,6 +10,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 营销团队(SalesTeam)表服务实现类
@@ -29,6 +31,8 @@ public class SalesTeamServiceImpl extends BaseMybatisDao<SalesTeamMapper> implem
                 "findSalesTeamCount", salesTeam, pageNo, pageSize);
     }
 
+
+
     @Override
     public boolean checkName(SalesTeam in) {
         SalesTeam salesTeam = salesTeamMapper.queryByName(in.getName());
@@ -90,4 +94,29 @@ public class SalesTeamServiceImpl extends BaseMybatisDao<SalesTeamMapper> implem
     public Object list(Integer lvl) {
         return salesTeamMapper.findSalesTeamLvlList(lvl);
     }
+
+    @Override
+    public Object lvlList() {
+        List<SalesTeamBo> list = salesTeamMapper.findSalesTeamLvlList(null);
+        List<SalesTeamBo> lvl1List = list.stream()
+                .filter(e -> e.getLvl() == 1)
+                .collect(Collectors.toList());
+        List<SalesTeamBo> lvl2List = list.stream()
+                .filter(e -> e.getLvl() == 2)
+                .collect(Collectors.toList());
+        List<SalesTeamBo> lvl3List = list.stream()
+                .filter(e -> e.getLvl() == 3)
+                .collect(Collectors.toList());
+        lvl2List.forEach(e -> {
+            e.setList(lvl3List.stream()
+                    .filter(e1 -> e1.getSuperId().equals(e.getId()))
+                    .collect(Collectors.toList()));
+        });
+        lvl1List.forEach(e -> {
+            e.setList(lvl2List.stream()
+                   .filter(e1 -> e1.getSuperId().equals(e.getId()))
+                   .collect(Collectors.toList()));
+        });
+        return lvl1List;
+    }
 }