咨询记录

src/main/java/com/caimei365/user/model/vo/RemarksVo.java

@@ -133,4 +133,8 @@ public class RemarksVo implements Serializable {
      * 报备商品ID
      */
     private Integer productId;
+    /**
+     * 创建记录 协销id
+     */
+    private Integer createServiceProviderId;
 }

src/main/java/com/caimei365/user/model/vo/ReportVo.java

@@ -50,6 +50,10 @@ public class ReportVo implements Serializable {
     private String questionMan;//咨询人名称
 
     private Integer newDeal;// 新分配机构1.是, 2.否，
+    /**
+     * 创建记录 协销id
+     */
+    private Integer createServiceProviderId;
 
 
 

src/main/resources/mapper/ClubMapper.xml

@@ -619,13 +619,10 @@
     <select id="getRemarksListByKey" resultType="com.caimei365.user.model.vo.RemarksVo">
 
         SELECT DISTINCT
-        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId,
+        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId, ccr.createServiceProviderId as createServiceProviderId
         csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') as consult, c.Name as clubName,
-        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS
-        followup,ccr.extra AS extra,
-        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS
-        recordName,c.newDeal as newDeal,cmc.status as status
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
+        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName, recordName,c.newDeal as newDeal,cmc.status as status
         # (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
@@ -633,12 +630,14 @@
         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.ID = ccr.reportID
-        where ccr.serviceProviderId=#{serviceProviderId}
+        where
+              (ccr.serviceProviderId=#{serviceProviderId} or ccr.createServiceProviderId=#{serviceProviderId})
 
         <if test="keyWord != null and keyWord != ''">
             AND (ccr.remarks LIKE CONCAT('%', #{keyWord}, '%')
             OR c.Name LIKE CONCAT('%', #{keyWord}, '%')
-            OR ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%'))
+            OR ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
+            or c.contractMobile like concat('%', #{keyWord}, '%'))
         </if>
         <if test="leaderId != null and leaderId>0">
             and csr.leaderId = #{leaderId}
@@ -775,13 +774,11 @@
     </select>
     <select id="findAllRemarks" resultType="com.caimei365.user.model.vo.RemarksVo">
         SELECT DISTINCT
-        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId,
+        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId, ccr.createServiceProviderId as createServiceProviderId
         csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') as consult, c.Name as clubName,
-        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS
-        followup,ccr.extra AS extra,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS
-        recordName,c.newDeal as newDeal,cmc.status as status
+        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.createServiceProviderId) AS recordName,c.newDeal as newDeal,cmc.status as status
         # (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID

src/main/resources/mapper/ClubReport.xml

@@ -101,8 +101,9 @@
 
     <select id="reportRemarks" 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
+        cmc.id AS reportId ,cmc.productID AS productId,ccr.serviceProviderID AS serviceProviderId, cmc.createServiceProviderId as createServiceProviderId,
+        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
@@ -129,8 +130,9 @@
 
     <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
+        cmc.id AS reportId ,cmc.productID AS productId,ccr.serviceProviderID AS serviceProviderId, cmc.createServiceProviderId as createServiceProviderId,
+        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
@@ -219,13 +221,12 @@
 
     <select id="associated" resultType="com.caimei365.user.model.vo.RemarksVo">
         SELECT DISTINCT
-        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.serviceProviderId AS serviceProviderId,
+        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.serviceProviderId AS serviceProviderId, ccr.createServiceProviderId as createServiceProviderId
         csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') AS consult, c.Name AS clubName,
-        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS
-        followup,ccr.extra AS extra,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS
-        recordName,c.newDeal AS newDeal,cmc.status AS status,cmc.`auditText` as auditText
+        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.createServiceProviderId) AS recordName,
+        c.newDeal AS newDeal,cmc.status AS status,cmc.`auditText` as auditText
         # (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID