Browse Source

修复获取跟进记录错误
将取消关注的请求参数放入请求体中

云殇忆 1 year ago
parent
commit
af73090edb

+ 3 - 3
benyun-core/src/main/java/com/benyun/core/controller/WorkTableController.java

@@ -52,7 +52,7 @@ public class WorkTableController {
     }
     }
 
 
 //    分页获取潜客列表
 //    分页获取潜客列表
-    @GetMapping("/pool/list")
+    @PostMapping("/pool/list")
     public R poolList(WorkTableSearchVo workTableSearchVo){
     public R poolList(WorkTableSearchVo workTableSearchVo){
         // 获取用户id
         // 获取用户id
         String userId = "1";
         String userId = "1";
@@ -93,7 +93,7 @@ public class WorkTableController {
     }
     }
 
 
 //    分页获取线索列表
 //    分页获取线索列表
-    @GetMapping("/clue/list")
+    @PostMapping("/clue/list")
     public R clueList(WorkTableSearchVo vo){
     public R clueList(WorkTableSearchVo vo){
         // 获取用户id
         // 获取用户id
         String userId = "1";
         String userId = "1";
@@ -103,7 +103,7 @@ public class WorkTableController {
     }
     }
 
 
 //    分页获取跟进记录
 //    分页获取跟进记录
-    @GetMapping("/follow/list")
+    @PostMapping("/follow/list")
     public R followList(WorkTableSearchVo vo){
     public R followList(WorkTableSearchVo vo){
         // 获取用户id
         // 获取用户id
         String userId = "1";
         String userId = "1";

+ 8 - 4
benyun-core/src/main/java/com/benyun/core/service/impl/BusinessOpportunitiesServiceImpl.java

@@ -47,10 +47,14 @@ public class BusinessOpportunitiesServiceImpl implements BusinessOpportunitiesSe
     @Override
     @Override
     public PageInfo<List<FollowUpRecordBo>> searchFollowList(WorkTableSearchVo workVo, String userId) {
     public PageInfo<List<FollowUpRecordBo>> searchFollowList(WorkTableSearchVo workVo, String userId) {
         PageHelper.startPage(workVo.getPageNum(),workVo.getPageSize(),true);
         PageHelper.startPage(workVo.getPageNum(),workVo.getPageSize(),true);
-        if (workVo.getStartTime().equals(""))
-            workVo.setStartTime(null);
-        if (workVo.getEndTime().equals(""))
-            workVo.setEndTime(null);
+        if (workVo.getStartTime() != null){
+            if (workVo.getStartTime().equals(""))
+                workVo.setStartTime(null);
+        }
+        if (workVo.getEndTime() != null){
+            if (workVo.getEndTime().equals(""))
+                workVo.setEndTime(null);
+        }
         List<FollowUpRecord> records = followUpDao.searchAllByMulti(workVo.getClueId(), workVo.getText(), workVo.getStartTime(), workVo.getEndTime(), userId);
         List<FollowUpRecord> records = followUpDao.searchAllByMulti(workVo.getClueId(), workVo.getText(), workVo.getStartTime(), workVo.getEndTime(), userId);
         List<FollowUpRecordBo> recordBos = new ArrayList<>();
         List<FollowUpRecordBo> recordBos = new ArrayList<>();
         for (FollowUpRecord record : records){
         for (FollowUpRecord record : records){