Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/BusinessOpportunityController.java

@@ -45,6 +45,19 @@ public class BusinessOpportunityController {
 
     @Resource
     private BusinessOpportunityService bOservice;
+    @Resource
+    private BusinessOpportunityMapper businessOpportunityMapper;
+
+    @RequestMapping("getAll")
+    public Object getAll(HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        msg.setData(
+                businessOpportunityMapper.selectList(new QueryWrapper<BusinessOpportunity>().eq("company_id", user.getCompanyId()))
+        );
+        return msg;
+    }
 
 
     @RequestMapping("exportData")
@@ -219,6 +232,7 @@ public class BusinessOpportunityController {
         return bOservice.uploadFile(bo, request, file);
     }
 
+
     //下载
     @RequestMapping("downFile")
     public Object downFile(UploadFile file, HttpServletRequest request, HttpServletResponse response) throws Exception {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ClueController.java

@@ -6,6 +6,7 @@ import com.management.platform.entity.Clue;
 import com.management.platform.entity.SysDict;
 import com.management.platform.entity.UploadFile;
 import com.management.platform.entity.User;
+import com.management.platform.mapper.ClueMapper;
 import com.management.platform.mapper.SysDictMapper;
 import com.management.platform.mapper.SysFunctionMapper;
 import com.management.platform.mapper.UserMapper;
@@ -47,9 +48,22 @@ public class ClueController {
     @Resource
     private SysFunctionService sysFunctionService;
 
+    @Resource
+    private ClueMapper clueMapper;
+
     @Resource
     private SysDictMapper sysDictMapper;
 
+    @RequestMapping("getAll")
+    public Object getAll(HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        msg.setData(
+                clueMapper.selectList(new QueryWrapper<Clue>().eq("company_id", user.getCompanyId()))
+        );
+        return msg;
+    }
 
     // 详情
     @RequestMapping("getDetail")

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/CustomController.java

@@ -1,10 +1,12 @@
 package com.management.platform.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.Clue;
 import com.management.platform.entity.Custom;
 import com.management.platform.entity.UploadFile;
 import com.management.platform.entity.User;
+import com.management.platform.mapper.CustomMapper;
 import com.management.platform.mapper.UserMapper;
 import com.management.platform.service.CustomService;
 import com.management.platform.util.HttpRespMsg;
@@ -22,7 +24,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author Seyason
@@ -36,32 +38,39 @@ public class CustomController {
     @Autowired
     private CustomService customService;
     @Autowired
+    private CustomMapper customMapper;
+    @Autowired
     private UserMapper userMapper;
 
     @RequestMapping("list")
-    public HttpRespMsg list(Custom custom , HttpServletRequest request){
-        return customService.getList(custom,request);
+    public HttpRespMsg list(Custom custom, HttpServletRequest request) {
+        return customService.getList(custom, request);
     }
+
     @RequestMapping("getAllCustom")
-    public HttpRespMsg getAllCustom( HttpServletRequest request){
+    public HttpRespMsg getAllCustom(HttpServletRequest request) {
         return customService.getAllCustom(request);
     }
+
     @RequestMapping("deleteList")
-    public HttpRespMsg deleteList(Custom custom , HttpServletRequest request){
-        return customService.getDeleteList(custom,request);
+    public HttpRespMsg deleteList(Custom custom, HttpServletRequest request) {
+        return customService.getDeleteList(custom, request);
     }
 
 
     @RequestMapping("insertAndUpdate")
-    public HttpRespMsg insertAndUpdate(Custom custom , HttpServletRequest request){
-        return customService.insertAndUpdate(custom,request);
+    public HttpRespMsg insertAndUpdate(Custom custom, HttpServletRequest request) {
+        return customService.insertAndUpdate(custom, request);
     }
+
     @RequestMapping("getInfo")
-    public HttpRespMsg getInfo(Custom custom , HttpServletRequest request){
-        return customService.getInfo(custom,request);
-    } @RequestMapping("getLog")
-    public HttpRespMsg getLog(Custom custom , HttpServletRequest request){
-        return customService.getInfo(custom,request);
+    public HttpRespMsg getInfo(Custom custom, HttpServletRequest request) {
+        return customService.getInfo(custom, request);
+    }
+
+    @RequestMapping("getLog")
+    public HttpRespMsg getLog(Custom custom, HttpServletRequest request) {
+        return customService.getInfo(custom, request);
     }
 
 
@@ -77,12 +86,13 @@ public class CustomController {
             }
             customService.isDelete(ids);
             msg.setMsg("操作成功");
-        }else {
+        } else {
             msg.setError("请选择客户");
 
         }
         return msg;
     }
+
     // 批量恢复
     @RequestMapping("rollback")
     public Object rollback(Custom custom) {
@@ -95,12 +105,13 @@ public class CustomController {
             }
             customService.isRollback(ids);
             msg.setMsg("操作成功");
-        }else {
+        } else {
             msg.setError("请选择客户");
 
         }
         return msg;
     }
+
     //彻底删除
     @RequestMapping("reallyDelete")
     public Object reallyDelete(Custom custom) {
@@ -113,7 +124,7 @@ public class CustomController {
             }
             customService.isReallyDelete(ids);
             msg.setMsg("操作成功");
-        }else {
+        } else {
             msg.setError("请选择客户");
 
         }
@@ -130,6 +141,17 @@ public class CustomController {
         return msg;
     }
 
+    @RequestMapping("getAll")
+    public Object getAll(HttpServletRequest request) {
+        User user = userMapper.selectById(request.getHeader("Token"));
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        msg.setData(
+                customMapper.selectList(new QueryWrapper<Custom>().eq("company_id", user.getCompanyId()))
+        );
+        return msg;
+    }
+
     // 上传
     @RequestMapping("uploadFile")
     public Object uploadFile(Custom custom, HttpServletRequest request, MultipartFile file) throws Exception {