客户咨询记录bugfix

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

@@ -273,7 +273,7 @@ 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("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);
 
     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);
     //, @Param("questionManId") String questionManId

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

@@ -19,7 +19,7 @@ public class PaginationVo<T> implements Serializable {
     private int pageNum = 1;
     /** 每页大小 */
     @Builder.Default
-    private int pageSize = 10;
+    private int pageSize = 20;
     /** 总记录数 */
     private int totalRecord;
     /** 总页数 */

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

@@ -89,4 +89,8 @@ public class RemarkVo implements Serializable {
      * 额外说明
      */
     private String extra;
+    /**
+     * 非持久化字段旧协销名
+     */
+//    private String oldName;以后可能会用到
 }

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

@@ -92,4 +92,8 @@ public class RemarksVo implements Serializable {
      * 额外说明
      */
     private String extra;
+    /**
+     * 非持久化字段旧协销名
+     */
+//    private String oldName;以后可能会用上
 }

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

@@ -403,15 +403,17 @@ public class ClubServiceImpl implements ClubService {
             boolean newRemarks = null == remarksId;
             ClubRemarksPo clubRemarksPo = new ClubRemarksPo();
 
-                List<String> strings = new ArrayList<>();
-                String rk = null == remarks ? "" : remarks;
-                if (!rk.contains("，")) {
-                    String[] split = rk.split("，");
-                    strings = Arrays.asList(split);
-                } else {
-                    strings.add(rk);
-                }
-                if(strings==null){ return ResponseJson.error("添加关键词为空！", null);}
+            List<String> strings = new ArrayList<>();
+            String rk = null == remarks ? "" : remarks;
+            if (!rk.contains("，")) {
+                String[] split = rk.split("，");
+                strings = Arrays.asList(split);
+            } else {
+                strings.add(rk);
+            }
+            if (strings == null) {
+                return ResponseJson.error("添加关键词为空！", null);
+            }
 //                clubRemarksPo.setRemarks(StringUtils.strip(strings.toString(), "[]"));
 //            }
             // 是否新增备注
@@ -420,7 +422,7 @@ public class ClubServiceImpl implements ClubService {
             clubRemarksPo.setServiceProviderId(serviceProviderId);
             clubRemarksPo.setQuestionMan(questionMan);
             clubRemarksPo.setConsult(consult);
-            clubRemarksPo.setRemarks(StringUtils.strip(strings.toString(), "[]").replace("\"",""));//去除符号
+            clubRemarksPo.setRemarks(StringUtils.strip(strings.toString(), "[]").replace("\"", ""));//去除符号
             clubRemarksPo.setClubType(clubType);
             clubRemarksPo.setPinceSensitve(pinceSensitve);
             clubRemarksPo.setSatisfied(satisfied);
@@ -494,23 +496,25 @@ public class ClubServiceImpl implements ClubService {
         }
         if (null != manager && 1 == manager) {
             //主管查所有注册客户咨询记录
+            log.info("方法1 所有");
             List<String> finalConss = conss;
             pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss));
         } 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));
         } else {
+            log.info("方法3 协销");
             List<String> finalConss2 = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getRemarksListByKey(keyWord, serviceProviderId, startAddTime, endAddTime, pinceSensitve,followup,satisfied, finalConss2));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getRemarksListByKey(keyWord, serviceProviderId, startAddTime, endAddTime, pinceSensitve, leaderId, groupId, followup, satisfied, finalConss2));
         }
         ArrayList<RemarkVo> remarkVos = new ArrayList<>();
         pageInfo.getList().forEach(r -> {
             RemarkVo remarkVo = new RemarkVo();
-            List<Map<String,String>> strings = new ArrayList<>();
+            List<Map<String, String>> strings = new ArrayList<>();
             String rk = null == r.getRemarks() ? "" : r.getRemarks();
             if (rk.contains(",")) {
                 String[] split = rk.split(",");
-                log.info("输出》》》》》》》》》》",split);
                 for (String remark : split) {
                     HashMap<String, String> map = new HashMap<>();
                     map.put("label", remark);
@@ -549,7 +553,10 @@ public class ClubServiceImpl implements ClubService {
             remarkVo.setSatisfied(r.getSatisfied());
             remarkVo.setPinceSensitve(r.getPinceSensitve());
             remarkVo.setFollowup(r.getFollowup());
+//            remarkVo.setOldName(r.getOldName());
             remarkVos.add(remarkVo);
+            log.info("页码>>>>>>>>>>", remarkVos.size());
+            log.info("页码取值>>>>>>>>>>", remarkVo.toString());
         });
         PaginationVo<RemarkVo> pageVo = new PaginationVo<>(remarkVos);
         if (null != remarkVos && remarkVos.size() > 0) {
@@ -578,7 +585,7 @@ public class ClubServiceImpl implements ClubService {
         List<String> imageList = clubMapper.getRemarksImageList(remarksId);
         List<RemarksFileVo> fileList = clubMapper.getRemarksFileList(remarksId);
         fileList.forEach(file -> file.setFileUrl(OssUtil.getOssUrl(file.getOssName())));
-        List<Map<String,String>> strings = new ArrayList<>();
+        List<Map<String, String>> strings = new ArrayList<>();
         String rk = null == remarksVo.getRemarks() ? "" : remarksVo.getRemarks();
         if (rk.contains(",")) {
             String[] split = rk.split(",");
@@ -849,16 +856,18 @@ public class ClubServiceImpl implements ClubService {
             }
             boolean newRemarks = null == remarksId;
             VisitorRemarkVo visitorRemarkVo = new VisitorRemarkVo();
-                List<String> strings = new ArrayList<>();
-                String rk = null == remarks ? "" : remarks;
-                if (!rk.contains(",")) {
-                    String[] split = rk.split(",");
-                    strings = Arrays.asList(split);
-                } else {
-                    strings.add(rk);
-                }
-                if(strings==null){ return ResponseJson.error("strings添加关键词为空！", null);}
-            visitorRemarkVo.setRemarks(StringUtils.strip(strings.toString(), "[]").replace("\"",""));//去除符号
+            List<String> strings = new ArrayList<>();
+            String rk = null == remarks ? "" : remarks;
+            if (!rk.contains(",")) {
+                String[] split = rk.split(",");
+                strings = Arrays.asList(split);
+            } else {
+                strings.add(rk);
+            }
+            if (strings == null) {
+                return ResponseJson.error("strings添加关键词为空！", null);
+            }
+            visitorRemarkVo.setRemarks(StringUtils.strip(strings.toString(), "[]").replace("\"", ""));//去除符号
 //            }
             // 是否新增备注
             visitorRemarkVo.setRemarksId(remarksId);
@@ -920,7 +929,7 @@ public class ClubServiceImpl implements ClubService {
         List<String> imageList = clubMapper.getVisitRemarksImageList(remarksId);
         List<RemarksFileVo> fileList = clubMapper.getVisitRemarksFileList(remarksId);
         fileList.forEach(file -> file.setFileUrl(OssUtil.getOssUrl(file.getOssName())));
-        List<Map<String,String>> strings = new ArrayList<>();
+        List<Map<String, String>> strings = new ArrayList<>();
         String rk = null == visitRemarksVo.getRemarks() ? "" : visitRemarksVo.getRemarks();
         if (rk.contains(",")) {
             String[] split = rk.split(",");
@@ -986,16 +995,16 @@ public class ClubServiceImpl implements ClubService {
             remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss1));
         } 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));
         }
         ArrayList<VisitRemarkVo> remarkVos = new ArrayList<>();
         remarksList.getList().forEach(r -> {
             VisitRemarkVo visit = new VisitRemarkVo();
-            List<Map<String,String>> strings = new ArrayList<>();
+            List<Map<String, String>> strings = new ArrayList<>();
             String rk = null == r.getRemarks() ? "" : r.getRemarks();
             if (rk.contains(",")) {
                 String[] split = rk.split(",");
-                log.info("输出》》》》》》》》》》",split.toString());
+                log.info("输出》》》》》》》》》》", split.toString());
                 for (String remark : split) {
                     HashMap<String, String> map = new HashMap<>();
                     map.put("label", remark);
@@ -1096,6 +1105,11 @@ public class ClubServiceImpl implements ClubService {
             remarksVo.setAddTime(v.getAddDate());
             remarksVo.setServiceProviderId(v.getServiceProviderId());
             remarksVo.setConsult(v.getConsult());
+            remarksVo.setPinceSensitve(v.getPinceSensitve());
+            remarksVo.setSatisfied(v.getSatisfied());
+            remarksVo.setFollowup(v.getFollowup());
+            remarksVo.setExtra(v.getExtra());
+            remarksVo.setClubType(v.getClubType());
             clubMapper.concactVisit(remarksVo);
             if (null != imageList && imageList.size() > 0) {
                 imageList.forEach(i -> clubMapper.insertRemarksImage(remarksVo.getRemarksId(), i));

src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
     config:                             # Config客户端配置
       profile: @activatedProperties@    # 启用配置后缀名称
       label: master                     # 分支名称
-      # uri: http://localhost:18001      # 配置中心地址（本地）
+       #uri: http://localhost:18001      # 配置中心地址（本地）
       # uri: http://47.119.112.46:18001  # 配置中心地址（测试环境）
       uri: http://120.79.162.1:18001     # 配置中心地址（正式环境）
       name: user                        # 配置文件名称

src/main/resources/mapper/ClubMapper.xml

@@ -32,8 +32,8 @@
     </insert>
     <insert id="concactVisit" parameterType="com.caimei365.user.model.vo.RemarksVo" keyProperty="remarksId"
             useGeneratedKeys="true">
-        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan, concactTime,consultType)
-        values (#{clubId}, #{serviceProviderId}, #{remarks}, #{addTime}, #{questionMan}, now(),#{consult})
+        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan, concactTime,consultType,clubType,pinceSensitve,satisfied,followup,extra)
+        values (#{clubId}, #{serviceProviderId}, #{remarks}, #{addTime}, #{questionMan}, now(),#{consult}, #{clubType}, #{pinceSensitve}, #{satisfied}, #{followup}, #{extra})
     </insert>
     <update id="updateClubUserByUpdateInfo">
         update user set
@@ -205,7 +205,7 @@
             pinceSensitve=#{pinceSensitve},
             satisfied=#{satisfied},
             followup=#{followup},
-            extra=#{extra},
+            extra=#{extra}
          where id = #{remarksId}
     </update>
     <update id="updateQuestionMan">
@@ -222,7 +222,7 @@
             pinceSensitve=#{pinceSensitve},
             satisfied=#{satisfied},
             followup=#{followup},
-            extra=#{extra},
+            extra=#{extra}
         where id = #{remarksId}
     </update>
     <update id="updateVisit">
@@ -423,7 +423,12 @@
                questionMan,
                clubId,
                consultType as consult,
-               concactTime
+               concactTime,
+               clubType,
+               pinceSensitve,
+               satisfied,
+               followup,
+               extra
         from cm_visitor_remarks
         where questionManId = #{questionManId}
           and remarks is not null
@@ -435,39 +440,47 @@
           AND questionMan IS NOT NULL
     </select>
     <select id="getRemarksListByKey" resultType="com.caimei365.user.model.vo.RemarksVo">
-        select DISTINCT
-               ccr.id as remarksId, ccr.remarks, ccr.addTime, ccr.questionMan, ccr.clubId,c.Name as clubName,ccr.serviceProviderId,
-        ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS recordName,ifnull(ccr.consultType,'') as consult
-        from cm_club_remarks ccr
-        LEFT JOIN club c ON c.clubID = ccr.clubId
-        where ccr.serviceProviderId = #{serviceProviderId}
+
+        SELECT DISTINCT
+        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId,
+        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
+#         (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
+        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
+        where ccr.serviceProviderId=#{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}, '%')
+           AND (ccr.remarks LIKE CONCAT('%', #{keyWord}, '%')
+           OR c.Name LIKE CONCAT('%', #{keyWord}, '%')
+           OR ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%'))
+        </if>
+        <if test="leaderId != null and leaderId>0">
+            and csr.leaderId = #{leaderId}
         </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">
+        <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">
+        <if test="endAddTime != '' and endAddTime != null">
             and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
         </if>
 
-        <if test="pinceSensitve != '' and pinceSensitve!=null">
+        <if test="pinceSensitve != '' and pinceSensitve != null">
             and ccr.pinceSensitve LIKE concat('%',#{pinceSensitve},'%')
         </if>
-        <if test="satisfied != '' and satisfied!=null">
+        <if test="satisfied != '' and satisfied != null">
             and ccr.satisfied LIKE concat('%',#{satisfied},'%')
         </if>
 
-        <if test="followup != '' and followup!=null">
+        <if test="followup != '' and followup != null">
             and ccr.followup LIKE concat('%',#{followup},'%')
         </if>
         <if test="con != null and con.size > 0">
@@ -494,6 +507,7 @@
         <if test="keyWord != null and keyWord != ''">
           and ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
           or ccr.remarks LIKE CONCAT('%', #{keyWord}, '%')
+                 or.
         </if>
         <if test="startAddTime !='' and startAddTime != null">
             and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
@@ -572,7 +586,8 @@
         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
+        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS recordName
+#         (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
         LEFT JOIN club c ON c.clubId=ccr.clubId
@@ -580,9 +595,9 @@
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
         <where>
             <if test="keyWord != null and keyWord !=''">
-                AND ccr.remarks LIKE concat('%',#{keyWord},'%')
+                AND (ccr.remarks LIKE concat('%',#{keyWord},'%')
                 or ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
-                or c.Name LIKE CONCAT('%', #{keyWord}, '%')
+                or c.Name LIKE CONCAT('%', #{keyWord}, '%'))
             </if>
             <if test="leaderId != null and leaderId>0">
                 and csr.leaderId = #{leaderId}