（咨询记录）日常更新

src/main/java/com/caimei365/user/controller/ClubApi.java

@@ -174,10 +174,10 @@ public class ClubApi {
                                                                Integer satisfied,
                                                                Integer followup,
                                                                String extra,
-                                                               Integer groupId,
+                                                               Integer groupId,Integer status,Integer newDeal,
                                                                @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
-        return clubService.getRemarksList(serviceProviderId, keyWord, startAddTime, endAddTime, consult, leaderId, manager, clubType, pinceSensitve, satisfied, followup, extra, groupId, pageNum, pageSize);
+        return clubService.getRemarksList(serviceProviderId, keyWord, startAddTime, endAddTime, consult, leaderId, manager, clubType, pinceSensitve, satisfied, followup, extra, groupId,status,newDeal, pageNum, pageSize);
     }
 
     @ApiOperation("关键词库联想查询")
@@ -275,14 +275,32 @@ public ResponseJson<PaginationVo<ReportVo>> reportRemarks(Integer manager,Intege
 
     @ApiOperation("关联咨询记录列表")
     @GetMapping("/report/associatedList")
-    public ResponseJson<PaginationVo<RemarkVo>>associated(Integer reportId,String keyWord,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
-        return clubService.associated(reportId,keyWord,pageNum,pageSize);
+    public ResponseJson<PaginationVo<RemarkVo>>associated(Integer manager, Integer serviceProviderId, Integer reportId, String keyWord, String startAddTime,
+                                                          String endAddTime,
+                                                          String consult,
+                                                          Integer leaderId,
+                                                          String clubType,
+                                                          Integer pinceSensitve,
+                                                          Integer satisfied,
+                                                          Integer followup,
+                                                          String extra,
+                                                          Integer groupId,Integer newDeal,Integer status,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+        return clubService.associated(manager,serviceProviderId,reportId,keyWord,startAddTime,endAddTime,consult,leaderId,clubType,pinceSensitve,satisfied,followup,extra,groupId,newDeal,status,pageNum,pageSize);
     }
 
     @ApiOperation("未注册关联咨询记录列表")
     @GetMapping("/report/visitor/associatedList")
-    public ResponseJson<PaginationVo<RemarkVo>>visitorAssociated(Integer reportId,String keyWord,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
-        return clubService.visitorAssociated(reportId,keyWord,pageNum,pageSize);
+    public ResponseJson<PaginationVo<RemarkVo>>visitorAssociated(Integer manager, Integer serviceProviderId, Integer reportId, String keyWord, String startAddTime,
+                                                                 String endAddTime,
+                                                                 String consult,
+                                                                 Integer leaderId,
+                                                                 String clubType,
+                                                                 Integer pinceSensitve,
+                                                                 Integer satisfied,
+                                                                 Integer followup,
+                                                                 String extra,
+                                                                 Integer groupId,Integer status,@RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10") int pageSize){
+        return clubService.visitorAssociated(manager,serviceProviderId,reportId,keyWord,startAddTime,endAddTime,consult,leaderId,clubType,pinceSensitve,satisfied,followup,extra,groupId,status,pageNum,pageSize);
     }
 
 
@@ -450,13 +468,13 @@ public ResponseJson<PaginationVo<ReportVo>> reportRemarks(Integer manager,Intege
                                                                           Integer pinceSensitve,
                                                                           Integer satisfied,
                                                                           Integer followup,
-                                                                          String extra,
+                                                                          String extra,Integer status,
                                                                           @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                           @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         if (null == serviceProviderId) {
             return ResponseJson.error("参数异常：协销id不能为空！", null);
         }
-        return clubService.getVisitorRecordList(questionManId, keyWord, serviceProviderId, startAddTime, endAddTime, consult, leaderId, groupId, manager,clubType,pinceSensitve, satisfied,followup,extra, pageNum, pageSize);
+        return clubService.getVisitorRecordList(questionManId, keyWord, serviceProviderId, startAddTime, endAddTime, consult, leaderId, groupId, manager,clubType,pinceSensitve, satisfied,followup,extra,status, pageNum, pageSize);
     }
 
     @ApiOperation("删除潜在用户资料备注")

src/main/java/com/caimei365/user/mapper/ClubMapper.java

@@ -273,9 +273,9 @@ public interface ClubMapper {
 
     String findQuestionMan(String questionManId);
 
-    List<RemarksVo> getRemarksListByKey(@Param("keyWord") String keyWord, @Param("serviceProviderId") Integer serviceProviderId,@Param("startAddTime")String startAddTime,@Param("endAddTime")String endAddTime,@Param("pinceSensitve") Integer pinceSensitve,@Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied, @Param("con")List<String> con);
+    List<RemarksVo> getRemarksListByKey(@Param("keyWord") String keyWord, @Param("serviceProviderId") Integer serviceProviderId,@Param("startAddTime")String startAddTime,@Param("endAddTime")String endAddTime,@Param("pinceSensitve") Integer pinceSensitve,@Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied, @Param("con")List<String> con,Integer status,Integer newDeal);
 
-    List<VisitorRemarkVo> getVisitorListByKey(@Param("serviceProviderId") Integer serviceProviderId, @Param("keyWord") String keyWord,@Param("startAddTime")String startAddTime,@Param("endAddTime")String endAddTime,Integer pinceSensitve,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("con")List<String> con);
+    List<VisitorRemarkVo> getVisitorListByKey(@Param("serviceProviderId") Integer serviceProviderId, @Param("keyWord") String keyWord,@Param("startAddTime")String startAddTime,@Param("endAddTime")String endAddTime,Integer pinceSensitve,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("con")List<String> con,Integer status);
     //, @Param("questionManId") String questionManId
     List<VisitorRemarkVo> getVisitRecordListByKey(@Param("keyWord") String keyWord);
 
@@ -287,9 +287,9 @@ public interface ClubMapper {
 
     ConsultVo findConsultById(String string);
 
-    List<RemarksVo> findAllRemarks(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer pinceSensitve, @Param("con")List<String> con);
+    List<RemarksVo> findAllRemarks(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer pinceSensitve, @Param("con")List<String> con,Integer status,Integer newDeal);
 
-    List<VisitorRemarkVo> getAllVisitRemark(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer pinceSensitve,@Param("con")List<String> con);
+    List<VisitorRemarkVo> getAllVisitRemark(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer pinceSensitve,@Param("con")List<String> con,Integer status);
 
     Integer findLeaderId(Integer serviceProviderId);
 

src/main/java/com/caimei365/user/mapper/ClubReportMapper.java

@@ -4,6 +4,7 @@ import com.caimei365.user.model.vo.ProductItemVo;
 import com.caimei365.user.model.vo.RemarksVo;
 import com.caimei365.user.model.vo.ReportVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -34,9 +35,9 @@ Integer reportLeaderId(Integer serviceProviderId);
 
 String roeprtNa(Integer serviceProviderId);
 
-List<RemarksVo> associated(Integer reportId,String keyWord);
+List<RemarksVo> associated(@Param("teamId")Integer teamId,@Param("serviceProviderId")Integer serviceProviderId,@Param("reportId")Integer reportId,@Param("keyWord")String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer pinceSensitve,@Param("con")List<String> con,@Param("newDeal")Integer newDeal,@Param("status")Integer status);
 
-List<RemarksVo> visitorAssociated(Integer reportId,String keyWord);
+List<RemarksVo> visitorAssociated(@Param("teamId")Integer teamId,@Param("serviceProviderId")Integer serviceProviderId,@Param("reportId")Integer reportId,@Param("keyWord")String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer pinceSensitve,@Param("con")List<String> con,@Param("status")Integer status);
 
 void disassociation(Integer remarksId);
 

src/main/java/com/caimei365/user/service/ClubService.java

@@ -112,11 +112,11 @@ public interface ClubService {
 
     ResponseJson saveClubReport(ReportVo reportVo);
 
-    ResponseJson<PaginationVo<ProductItemVo>> getproductList(String keyWord,int pageNum,int pageSize);
+    ResponseJson<PaginationVo<ProductItemVo>> getproductList(String keyWord, int pageNum, int pageSize);
 
-    ResponseJson<PaginationVo<ReportVo>> ClubReportList(Integer serviceProviderId,Integer clubId,String keyWord, int pageNum,  int pageSize);
+    ResponseJson<PaginationVo<ReportVo>> ClubReportList(Integer serviceProviderId, Integer clubId, String keyWord, int pageNum, int pageSize);
 
-    ResponseJson<PaginationVo<ReportVo>> visitorReportList(String questionManId,String keyWord, int pageNum,  int pageSize);
+    ResponseJson<PaginationVo<ReportVo>> visitorReportList(String questionManId, String keyWord, int pageNum, int pageSize);
 
     ResponseJson addVisitorReport(ReportVo reportVo);
 
@@ -124,23 +124,41 @@ public interface ClubService {
 
     ResponseJson<ReportVo> visitorReportsList(Integer reportId);
 
-    ResponseJson<PaginationVo<RemarkVo>>associated(Integer reportId,String keyWord, int pageNum,int pageSize);
-
-    ResponseJson<PaginationVo<RemarkVo>>visitorAssociated(Integer reportId,String keyWord, int pageNum,  int pageSize);
+    ResponseJson<PaginationVo<RemarkVo>> associated(Integer manager, Integer serviceProviderId, Integer reportId, String keyWord, String startAddTime,
+                                                    String endAddTime,
+                                                    String consult,
+                                                    Integer leaderId,
+                                                    String clubType,
+                                                    Integer pinceSensitve,
+                                                    Integer satisfied,
+                                                    Integer followup,
+                                                    String extra,
+                                                    Integer groupId,Integer newDeal,Integer status, int pageNum, int pageSize);
+
+    ResponseJson<PaginationVo<RemarkVo>> visitorAssociated(Integer manager,Integer serviceProviderId,Integer reportId,String keyWord, String startAddTime,
+                                                           String endAddTime,
+                                                           String consult,
+                                                           Integer leaderId,
+                                                           String clubType,
+                                                           Integer pinceSensitve,
+                                                           Integer satisfied,
+                                                           Integer followup,
+                                                           String extra,
+                                                           Integer groupId,Integer status, int pageNum,  int pageSize);
 
     ResponseJson disassociation(Integer remarksId);
 
     ResponseJson visitorDisassociation(Integer remarksId);
 
 
-        /**
-         * 获取机构资料备注列表
-         *
-         * @param serviceProviderId 协销id
-         * @param pageNum           页码
-         * @param pageSize          每页数量
-         * @return
-         */
+    /**
+     * 获取机构资料备注列表
+     *
+     * @param serviceProviderId 协销id
+     * @param pageNum           页码
+     * @param pageSize          每页数量
+     * @return
+     */
     ResponseJson<PaginationVo<RemarkVo>> getRemarksList(Integer serviceProviderId,
                                                         String keyWord,
                                                         String startAddTime,
@@ -153,7 +171,7 @@ public interface ClubService {
                                                         Integer satisfied,
                                                         Integer followup,
                                                         String extra,
-                                                        Integer groupId, int pageNum, int pageSize);
+                                                        Integer groupId,Integer status,Integer newDeal, int pageNum, int pageSize);
 
     /**
      * 获取机构资料备注详情
@@ -227,7 +245,7 @@ public interface ClubService {
      */
     ResponseJson<VisitRemarkVo> getVisitRemark(Integer remarksId);
 
-    ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, String keyWord, Integer serviceProviderId, String startAddTime, String endAddTime, String consult, Integer leaderId, Integer groupId, Integer manager, String clubType, Integer pinceSensitve,Integer satisfied,Integer followup, String extra, int pageNum, int pageSize);
+    ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, String keyWord, Integer serviceProviderId, String startAddTime, String endAddTime, String consult, Integer leaderId, Integer groupId, Integer manager, String clubType, Integer pinceSensitve, Integer satisfied, Integer followup, String extra,Integer status, int pageNum, int pageSize);
 
     ResponseJson deleteVisitRemarks(String remarksId);
 
@@ -248,9 +266,9 @@ public interface ClubService {
 
     ResponseJson getCmRemarksList(String remarks);
 
-    ResponseJson<PaginationVo<ReportVo>> reportRemarks(Integer manager,Integer serviceProviderId,String keyWord,int pageNum, int pageSize);
+    ResponseJson<PaginationVo<ReportVo>> reportRemarks(Integer manager, Integer serviceProviderId, String keyWord, int pageNum, int pageSize);
 
-    ResponseJson<PaginationVo<ReportVo>> visitorReportRemarks(Integer manager,Integer serviceProviderId,String keyWord,int pageNum, int pageSize);
+    ResponseJson<PaginationVo<ReportVo>> visitorReportRemarks(Integer manager, Integer serviceProviderId, String keyWord, int pageNum, int pageSize);
 
     ResponseJson deleteReport(Integer reportId);
 }

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -542,9 +542,41 @@ public class ClubServiceImpl implements ClubService {
 
 
     @Override
-    public ResponseJson<PaginationVo<RemarkVo>>associated(Integer reportId,String keyWord, int pageNum,  int pageSize) {
+    public ResponseJson<PaginationVo<RemarkVo>>associated(Integer manager,Integer serviceProviderId,Integer reportId,String keyWord, String startAddTime,
+                                                          String endAddTime,
+                                                          String consult,
+                                                          Integer leaderId,
+                                                          String clubType,
+                                                          Integer pinceSensitve,
+                                                          Integer satisfied,
+                                                          Integer followup,
+                                                          String extra,
+                                                          Integer groupId,Integer newDeal,Integer status, int pageNum,  int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<RemarksVo>reportList=clubReportMapper.associated(reportId,keyWord);
+        List<RemarksVo>reportList=null;
+        Integer teamId= clubReportMapper.reportLeaderId(serviceProviderId);
+        List<String> conss = new ArrayList<>();
+        if (StringUtils.isNotBlank(consult)) {
+            if (consult.contains(",")) {
+                conss = Arrays.asList(consult.split(","));
+            } else {
+                conss.add(consult);
+            }
+        }
+        if (null != manager && 1 == manager) {
+            //主管查所有注册客户咨询记录
+            log.info("方法1 管理员");
+            List<String> finalConss = conss;
+            reportList = clubReportMapper.associated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss,newDeal,status);
+        } else if (null != teamId && teamId > 0) {
+            log.info("方法2 协销组长");
+            List<String> finalConss1 = conss;
+            reportList =clubReportMapper.associated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss1,newDeal,status);
+        } else {
+            log.info("方法3 协销");
+            List<String> finalConss2 = conss;
+            reportList = clubReportMapper.associated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss2,newDeal,status);
+        }
         ArrayList<RemarkVo> remarkVos = new ArrayList<>();
         RemarkVo remarkVo = new RemarkVo();
         reportList.forEach(remarksVo->{
@@ -562,6 +594,7 @@ public class ClubServiceImpl implements ClubService {
                 map.put("label", rk);
                 strings.add(map);
             }
+
             remarkVo.setLeaderName(remarksVo.getLeaderName());
             remarkVo.setRecordName(remarksVo.getRecordName());
             remarkVo.setServiceProviderId(remarksVo.getServiceProviderId());
@@ -600,9 +633,41 @@ public class ClubServiceImpl implements ClubService {
     }
 
     @Override
-    public ResponseJson<PaginationVo<RemarkVo>>visitorAssociated(Integer reportId,String keyWord, int pageNum,  int pageSize) {
+    public ResponseJson<PaginationVo<RemarkVo>>visitorAssociated(Integer manager,Integer serviceProviderId,Integer reportId,String keyWord, String startAddTime,
+                                                                 String endAddTime,
+                                                                 String consult,
+                                                                 Integer leaderId,
+                                                                 String clubType,
+                                                                 Integer pinceSensitve,
+                                                                 Integer satisfied,
+                                                                 Integer followup,
+                                                                 String extra,
+                                                                 Integer groupId,Integer status,int pageNum,  int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<RemarksVo>reportList=clubReportMapper.visitorAssociated(reportId,keyWord);
+        List<RemarksVo>reportList=null;
+        Integer teamId= clubReportMapper.reportLeaderId(serviceProviderId);
+        List<String> conss = new ArrayList<>();
+        if (StringUtils.isNotBlank(consult)) {
+            if (consult.contains(",")) {
+                conss = Arrays.asList(consult.split(","));
+            } else {
+                conss.add(consult);
+            }
+        }
+        if (null != manager && 1 == manager) {
+            //主管查所有注册客户咨询记录
+            log.info("方法1 管理员");
+            List<String> finalConss = conss;
+            reportList = clubReportMapper.visitorAssociated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss,status);
+        } else if (null != teamId && teamId > 0) {
+            log.info("方法2 协销组长");
+            List<String> finalConss1 = conss;
+            reportList = clubReportMapper.visitorAssociated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss1,status);
+        } else {
+            log.info("方法3 协销");
+            List<String> finalConss2 = conss;
+            reportList = clubReportMapper.visitorAssociated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss2,status);
+        }
         ArrayList<RemarkVo> remarkVos = new ArrayList<>();
         RemarkVo remarkVo = new RemarkVo();
         reportList.forEach(remarksVo->{
@@ -671,7 +736,7 @@ public class ClubServiceImpl implements ClubService {
                                                                Integer satisfied,
                                                                Integer followup,
                                                                String extra,
-                                                               Integer groupId,
+                                                               Integer groupId,Integer status,Integer newDeal,
                                                                int pageNum, int pageSize) {
         if (null == serviceProviderId) {
             return ResponseJson.error("参数异常，协销id不能为空", null);
@@ -690,15 +755,15 @@ public class ClubServiceImpl implements ClubService {
             //主管查所有注册客户咨询记录
             log.info("方法1 管理员");
             List<String> finalConss = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss,status,newDeal));
         } else if (null != findLeader && findLeader > 0) {
             log.info("方法2 协销组长");
             List<String> finalConss1 = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, serviceProviderId, groupId, followup, satisfied, pinceSensitve, finalConss1));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, serviceProviderId, groupId, followup, satisfied, pinceSensitve, finalConss1,status,newDeal));
         } else {
             log.info("方法3 协销");
             List<String> finalConss2 = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getRemarksListByKey(keyWord, serviceProviderId, startAddTime, endAddTime, pinceSensitve, leaderId, groupId, followup, satisfied, finalConss2));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getRemarksListByKey(keyWord, serviceProviderId, startAddTime, endAddTime, pinceSensitve, leaderId, groupId, followup, satisfied, finalConss2,status,newDeal));
         }
         ArrayList<RemarkVo> remarkVos = new ArrayList<>();
         pageInfo.getList().forEach(r -> {
@@ -838,7 +903,7 @@ public class ClubServiceImpl implements ClubService {
         }
         return ResponseJson.success(remarkVo);
         }
-        return ResponseJson.error("参数错误remarksId："+remarksId);
+        return ResponseJson.error("remarksVo为空remarksId："+remarksId);
     }
 
     @Override
@@ -1241,11 +1306,11 @@ public class ClubServiceImpl implements ClubService {
         }
         return ResponseJson.success(visit);
         }
-        return ResponseJson.error("参数错误remarksId："+remarksId);
+        return ResponseJson.error("visitRemarksVo为空remarksId："+remarksId);
     }
 
     @Override
-    public ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, String keyWord, Integer serviceProviderId, String startAddTime, String endAddTime, String consult, Integer leaderId, Integer groupId, Integer manager, String clubType, Integer pinceSensitve, Integer satisfied, Integer followup, String extra, int pageNum, int pageSize) {
+    public ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, String keyWord, Integer serviceProviderId, String startAddTime, String endAddTime, String consult, Integer leaderId, Integer groupId, Integer manager, String clubType, Integer pinceSensitve, Integer satisfied, Integer followup, String extra,Integer status, int pageNum, int pageSize) {
         PageInfo<VisitorRemarkVo> remarksList = null;
         List<String> conss = new ArrayList<>();
         if (StringUtils.isNotBlank(consult)) {
@@ -1259,13 +1324,13 @@ public class ClubServiceImpl implements ClubService {
         if (null != manager && 1 == manager) {
             //主管查所有注册客户咨询记录
             List<String> finalConss = conss;
-            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss));
+            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss,status));
         } else if (null != findLeader && findLeader > 0) {
             List<String> finalConss1 = conss;
-            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss1));
+            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss1,status));
         } else {
             List<String> finalConss2 = conss;
-            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getVisitorListByKey(serviceProviderId, keyWord, startAddTime, endAddTime, pinceSensitve, satisfied, followup, finalConss2));
+            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getVisitorListByKey(serviceProviderId, keyWord, startAddTime, endAddTime, pinceSensitve, satisfied, followup, finalConss2,status));
         }
         ArrayList<VisitRemarkVo> remarkVos = new ArrayList<>();
         remarksList.getList().forEach(r -> {

src/main/resources/mapper/ClubMapper.xml

@@ -308,7 +308,6 @@
         LEFT JOIN shop s ON s.shopID = p.shopID
         where ccr.id = #{remarksId}
         AND ccr.remarks IS NOT NULL
-        AND cmc.clubId IS NOT NULL
     </select>
     <select id="getRemarksImageList" resultType="java.lang.String">
         select imageUrl
@@ -405,7 +404,7 @@
          LEFT JOIN shop s ON s.shopID = p.shopID
         where ccr.id = #{remarksId}
           AND ccr.remarks IS NOT NULL
-          and cmc.clubId is null
+#           and cmc.clubId is null
 
     </select>
     <select id="getVisitRemarksImageList" resultType="java.lang.String">
@@ -499,7 +498,12 @@
         <if test="satisfied != '' and satisfied != null">
             and ccr.satisfied LIKE concat('%',#{satisfied},'%')
         </if>
-
+        <if test="status!=null and status!=0">
+           and cmc.status=#{status}
+        </if>
+        <if test="newDeal !=null and newDeal!=0">
+            and c.newDeal =#{newDeal}
+        </if>
         <if test="followup != '' and followup != null">
             and ccr.followup LIKE concat('%',#{followup},'%')
         </if>
@@ -541,7 +545,9 @@
         <if test="satisfied != '' and satisfied!=null">
             and ccr.satisfied LIKE concat('%',#{satisfied},'%')
         </if>
-
+        <if test="status!=null and status!=0">
+            and cmc.status=#{status}
+        </if>
         <if test="followup != '' and followup!=null">
             and ccr.followup LIKE concat('%',#{followup},'%')
         </if>
@@ -623,6 +629,9 @@
             <if test="leaderId != null and leaderId>0">
                 and csr.leaderId = #{leaderId}
             </if>
+            <if test="status!=null and status!=0">
+               and cmc.status=#{status}
+            </if>
             <if test="groupId != null and groupId>0">
                 and ccr.serviceProviderId = #{groupId}
             </if>
@@ -643,7 +652,7 @@
             <if test="followup != '' and followup !=null">
                 and ccr.followup LIKE concat('%',#{followup},'%')
             </if>
-            <if test="newDeal !=null">
+            <if test="newDeal !=null and newDeal!=0">
                 and c.newDeal =#{newDeal}
             </if>
 
@@ -696,7 +705,7 @@
             <if test="followup != '' and followup !=null">
                 and ccr.followup LIKE concat('%',#{followup},'%')
             </if>
-             <if test="status!=null">
+             <if test="status!=null and status!=0">
                 and cmc.status=#{status}
              </if>
             <if test="con != null and con.size > 0">

src/main/resources/mapper/ClubReport.xml

@@ -55,6 +55,7 @@
                cmc.status      as status,
                p.productID     as productId,
                c.name          AS clubName,
+                ccr.questionMan as questionMan,
                c.linkMan,
                cmc.`reportName`,
                cmc.`addTime`,
@@ -65,6 +66,7 @@
                cmc.`auditText` as auditText
         FROM cm_club_report cmc
                  LEFT JOIN club c ON c.clubID = cmc.clubID
+                 LEFT JOIN cm_club_remarks ccr ON ccr.clubID = cmc.clubID
                  LEFT JOIN product p ON p.productID = cmc.productID
                  LEFT JOIN shop s ON s.shopID = p.shopID
         WHERE cmc.id = #{reportId}
@@ -119,8 +121,8 @@
             <if test="teamId==null and serviceProviderId!=null">
                 and cmc.serviceProviderId=#{serviceProviderId}
             </if>
-            ORDER BY cmc.`addTime` DESC
         </where>
+        ORDER BY cmc.`addTime` DESC
     </select>
 
     <select id="visitorReportRemarks" resultType="com.caimei365.user.model.vo.ReportVo">
@@ -192,13 +194,55 @@
         LEFT JOIN club c ON c.clubId=ccr.clubId
         LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
-        LEFT JOIN cm_club_report cmc ON cmc.clubId = ccr.clubId
+        LEFT JOIN cm_club_report cmc ON cmc.Id = ccr.reportID
         <where>
             and cmc.id=#{reportId}
+            <if test="teamId!=null">
+                and csg.teamId = #{teamId}
+            </if>
+            <if test="teamId==null and serviceProviderId!=null">
+                and cmc.serviceProviderId=#{serviceProviderId}
+            </if>
             and reportID is not null
             <if test="keyWord != null and keyWord !=''">
                 and cmc.reportText LIKE CONCAT('%', #{keyWord}, '%')
             </if>
+            <if test="leaderId != null and leaderId>0">
+                and csr.leaderId = #{leaderId}
+            </if>
+            <if test="groupId != null and groupId>0">
+                and ccr.serviceProviderId = #{groupId}
+            </if>
+            <if test="startAddTime !='' and startAddTime !=null">
+                and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
+            </if>
+            <if test="endAddTime != '' and endAddTime!=null">
+                and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
+            </if>
+
+            <if test="pinceSensitve != '' and pinceSensitve!=null">
+                and ccr.pinceSensitve LIKE concat('%',#{pinceSensitve},'%')
+            </if>
+            <if test="satisfied != '' and satisfied!=null">
+                and ccr.satisfied LIKE concat('%',#{satisfied},'%')
+            </if>
+
+            <if test="followup != '' and followup !=null">
+                and ccr.followup LIKE concat('%',#{followup},'%')
+            </if>
+            <if test="newDeal !=null and newDeal != 0">
+                and c.newDeal =#{newDeal}
+            </if>
+            <if test="status!=null and status!=0">
+                and cmc.status=#{status}
+            </if>
+            <if test="con != null and con.size > 0">
+                and
+                <foreach collection="con" item="item" index="index" open="(" close=")" separator="OR">
+                    ccr.consultType LIKE CONCAT('%',#{consultType},'%')
+                </foreach>
+            </if>
+
         </where>
         ORDER BY cmc.`addTime` DESC
     </select>
@@ -219,13 +263,44 @@
         LEFT JOIN club c ON c.clubId=ccr.clubId
         LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
-        LEFT JOIN cm_club_report cmc ON cmc.questionManId = ccr.questionManId
+        LEFT JOIN cm_club_report cmc ON cmc.Id = ccr.reportID
         <where>
             and cmc.id=#{reportId}
             and reportID is not null
+            <if test="teamId!=null">
+                and csg.teamId = #{teamId}
+            </if>
+            <if test="teamId==null and serviceProviderId!=null">
+                and cmc.serviceProviderId=#{serviceProviderId}
+            </if>
             <if test="keyWord != null and keyWord !=''">
                 and cmc.reportText LIKE CONCAT('%', #{keyWord}, '%')
             </if>
+            <if test="leaderId != null and leaderId>0">
+                and csr.leaderId = #{leaderId}
+            </if>
+            <if test="groupId != null and groupId>0">
+                and ccr.serviceProviderId = #{groupId}
+            </if>
+            <if test="startAddTime !='' and startAddTime !=null">
+                and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
+            </if>
+            <if test="endAddTime != '' and endAddTime!=null">
+                and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
+            </if>
+
+            <if test="pinceSensitve != '' and pinceSensitve!=null">
+                and ccr.pinceSensitve LIKE concat('%',#{pinceSensitve},'%')
+            </if>
+            <if test="satisfied != '' and satisfied!=null">
+                and ccr.satisfied LIKE concat('%',#{satisfied},'%')
+            </if>
+            <if test="status!=null and status!=0">
+                and cmc.status=#{status}
+            </if>
+            <if test="followup != '' and followup !=null">
+                and ccr.followup LIKE concat('%',#{followup},'%')
+            </if>
         </where>
         ORDER BY cmc.`addTime` DESC
     </select>