行为记录链接

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

@@ -27,10 +27,14 @@ ReportVo reportDetailsList(Integer reportId);
 
 ReportVo visitorReportsList(Integer reportId);
 
-List<ReportVo>reportRemarks(Integer teamId,Integer serviceProviderId,String keyWord);
+List<ReportVo>reportRemarks(Integer teamId,Integer serviceProviderId,String keyWord,Integer manager);
+
+List<ReportVo>repotRemark(Integer teamId,Integer serviceProviderId,String keyWord,Integer manager);
 
 List<ReportVo>visitorReportRemarks(Integer teamId,Integer serviceProviderId,String keyWord);
 
+    List<ReportVo>visitoReportRemark(Integer teamId,Integer serviceProviderId,String keyWord);
+
 Integer reportLeaderId(Integer serviceProviderId);
 
 String roeprtNa(Integer serviceProviderId);

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

@@ -1002,7 +1002,7 @@ public class ClubServiceImpl implements ClubService {
         if (null != manager && 1 == manager) {
             //主管查所有注册客户咨询记录
             log.info("方法1 管理员");
-            pageInfo = clubReportMapper.visitorReportRemarks(teamId,serviceProviderId,keyWord);
+            pageInfo = clubReportMapper.visitoReportRemark(teamId,serviceProviderId,keyWord);
         } else if (null != teamId && teamId > 0) {
             log.info("方法2 协销组长");
 
@@ -1026,14 +1026,14 @@ public class ClubServiceImpl implements ClubService {
         if (null != manager && 1 == manager) {
             //主管查所有注册客户咨询记录
             log.info("方法1 管理员");
-            pageInfo = clubReportMapper.reportRemarks(teamId,serviceProviderId,keyWord);
+            pageInfo = clubReportMapper.repotRemark(teamId,null,keyWord,manager);
         } else if (null != teamId && teamId > 0) {
             log.info("方法2 协销组长");
 
-            pageInfo = clubReportMapper.reportRemarks(teamId,serviceProviderId,keyWord);
+            pageInfo = clubReportMapper.reportRemarks(teamId,serviceProviderId,keyWord,manager);
         } else {
             log.info("方法3 协销");
-            pageInfo = clubReportMapper.reportRemarks(teamId,serviceProviderId,keyWord);
+            pageInfo = clubReportMapper.reportRemarks(teamId,serviceProviderId,keyWord,manager);
         }
         return ResponseJson.success(new PaginationVo<>(pageInfo));
     }

src/main/resources/mapper/ClubReport.xml

@@ -120,13 +120,32 @@
             <if test="teamId!=null">
                 and csg.teamId = #{teamId}
             </if>
-            <if test="teamId==null and serviceProviderId!=null">
+            <if test="serviceProviderId!=null">
                 and cmc.serviceProviderId=#{serviceProviderId}
             </if>
         </where>
         ORDER BY cmc.`addTime` DESC
     </select>
 
+    <select id="repotRemark" resultType="com.caimei365.user.model.vo.ReportVo">
+        SELECT DISTINCT
+        cmc.id AS reportId ,cmc.productID AS productId,ccr.serviceProviderID AS serviceProviderId,  c.name AS clubName,c.`newDeal` AS newDeal,cmc.reportName AS
+        reportName,cmc.`addTime` AS ADDTIME,p.`mainImage` AS mainImage,p.name AS productName,cmc.`reportText` AS
+        reportText,cmc.status AS STATUS,cmc.`auditText` AS auditText,ccr.questionMan AS questionMan
+        FROM cm_club_report cmc
+        LEFT JOIN club c ON c.clubId=cmc.clubId
+        LEFT JOIN cm_club_remarks ccr ON cmc.Id = ccr.reportId
+        LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
+        LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
+        LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
+        LEFT JOIN product p ON p.productID = cmc.productID
+        where
+             cmc.clubID is not null
+
+        ORDER BY cmc.`addTime` DESC
+    </select>
+
+
     <select id="visitorReportRemarks" resultType="com.caimei365.user.model.vo.ReportVo">
         SELECT DISTINCT
         cmc.id AS reportId , cmc.productID as productId,cmc.serviceProviderID as serviceProviderId,cmc.questionManId AS questionManId, c.name AS clubName,c.`newDeal` AS
@@ -156,6 +175,23 @@
         ORDER BY cmc.`addTime` DESC
     </select>
 
+    <select id="visitoReportRemark" resultType="com.caimei365.user.model.vo.ReportVo">
+        SELECT DISTINCT
+        cmc.id AS reportId , cmc.productID as productId,cmc.serviceProviderID as serviceProviderId,cmc.questionManId AS questionManId, c.name AS clubName,c.`newDeal` AS
+        newDeal,cmc.reportName AS reportName,cmc.`addTime` AS ADDTIME,p.`mainImage` AS mainImage,p.name AS
+        productName,cmc.`reportText` as reportText,cmc.status AS status,cmc.`auditText` as auditText
+        FROM cm_club_report cmc
+        LEFT JOIN club c ON c.clubId=cmc.clubId
+        LEFT JOIN cm_visitor_remarks ccr ON cmc.Id = ccr.reportId
+        LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
+        LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
+        LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
+        LEFT JOIN product p ON p.productID = cmc.productID
+        where
+             cmc.clubID is null
+
+        ORDER BY cmc.`addTime` DESC
+    </select>
 
     <select id="reportLeaderId" resultType="java.lang.Integer">
         SELECT DISTINCT id