客户咨询记录bugfix

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

@@ -515,6 +515,14 @@ public class ClubServiceImpl implements ClubService {
             String rk = null == r.getRemarks() ? "" : r.getRemarks();
             if (rk.contains(",")) {
                 String[] split = rk.split(",");
+                split = rk.split(",");
+                for (String remark : split) {
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("label", remark);
+                    strings.add(map);
+                }
+            } else if (rk.contains("，")) {
+                String[] split = rk.split("，");
                 for (String remark : split) {
                     HashMap<String, String> map = new HashMap<>();
                     map.put("label", remark);
@@ -555,8 +563,6 @@ public class ClubServiceImpl implements ClubService {
             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) {
@@ -1004,7 +1010,14 @@ public class ClubServiceImpl implements ClubService {
             String rk = null == r.getRemarks() ? "" : r.getRemarks();
             if (rk.contains(",")) {
                 String[] split = rk.split(",");
-                log.info("输出》》》》》》》》》》", split.toString());
+                split = rk.split(",");
+                for (String remark : split) {
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("label", remark);
+                    strings.add(map);
+                }
+            } else if (rk.contains("，")) {
+                String[] split = rk.split("，");
                 for (String remark : split) {
                     HashMap<String, String> map = new HashMap<>();
                     map.put("label", remark);

src/main/resources/mapper/ClubMapper.xml

@@ -502,18 +502,17 @@
         left join cm_serviceteam_role csr on csr.id = csg.teamId
         left join serviceprovider s on ccr.serviceProviderID = s.serviceProviderID
         WHERE ccr.serviceProviderId = #{serviceProviderId}
-        and ccr.remarks IS NOT NULL
-        and ccr.clubId is null
+#         and ccr.remarks IS NOT NULL
+#         and ccr.clubId is null
         <if test="keyWord != null and keyWord != ''">
-          and ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
-          or ccr.remarks LIKE CONCAT('%', #{keyWord}, '%')
-                 or.
+          and (ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
+          or ccr.remarks LIKE CONCAT('%', #{keyWord}, '%'))
         </if>
         <if test="startAddTime !='' and startAddTime != null">
-            and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
+            and ccr.addTime <![CDATA[  >=  ]]> #{startAddTime}
         </if>
         <if test="endAddTime != '' and endAddTime != null">
-            and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
+            and ccr.addTime <![CDATA[  <=  ]]> #{endAddTime}
         </if>
         <if test="pinceSensitve != '' and pinceSensitve!=null">
             and ccr.pinceSensitve LIKE concat('%',#{pinceSensitve},'%')