关键词库,客户咨询记录bugfix

src/main/java/com/caimei/modules/user/dao/CmRemaksDao.java

@@ -0,0 +1,16 @@
+package com.caimei.modules.user.dao;
+
+import com.caimei.modules.user.entity.CmRemaks;
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/5/19
+ */
+@MyBatisDao
+public interface CmRemaksDao extends CrudDao<CmRemaks> {
+
+}

src/main/java/com/caimei/modules/user/dao/NewCmClubDao.java

@@ -46,7 +46,6 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     String findClassName(String string);
 
-    List<CmRemaks> remakasList(CmRemaks cmRemaks);
 
     String upremakasList(CmRemaks cmRemaks);
 
@@ -56,5 +55,8 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     void deleteRamarks(CmRemaks cmRemaks);
 
-    Integer ClubsIds(ClubChangeSp clubChangeSp);
+    List<Integer> ClubsIds(ClubChangeSp clubChangeSp);
+
+    void oldname(@Param("oldserviceProviderId")Integer oldserviceProviderId,@Param("clubID")Integer clubID,@Param("oldSpID")Integer oldSpID,@Param("newSpID")Integer newSpID);
+    void oldnames(@Param("clubID")Integer clubID,@Param("oldSpID")Integer oldSpID,@Param("newSpID")Integer newSpID);
 }

src/main/java/com/caimei/modules/user/entity/CmClubRemarks.java

@@ -116,7 +116,18 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
      * 额外说明
      */
     private String extra;
+    /**
+     * 非持久化字段旧协销名
+     */
+    private String oldName;
 
+    public String getOldName() {
+        return oldName;
+    }
+
+    public void setOldName(String oldName) {
+        this.oldName = oldName;
+    }
 
     public String getClubType() {
         return clubType;

src/main/java/com/caimei/modules/user/entity/VisitRemarkVo.java

@@ -120,6 +120,19 @@ public class VisitRemarkVo extends DataEntity<VisitRemarkVo> {
      */
     private String extra;
 
+    /**
+     * 非持久化字段旧协销名
+     */
+    private String oldName;
+
+    public String getOldName() {
+        return oldName;
+    }
+
+    public void setOldName(String oldName) {
+        this.oldName = oldName;
+    }
+
     public String getClubType() {
         return clubType;
     }

src/main/java/com/caimei/modules/user/service/CmRemaksService.java

@@ -0,0 +1,35 @@
+package com.caimei.modules.user.service;
+
+import com.caimei.modules.user.dao.CmRemaksDao;
+import com.caimei.modules.user.entity.CmRemaks;
+import com.thinkgem.jeesite.common.service.CrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import com.thinkgem.jeesite.common.persistence.Page;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/5/19
+ */
+@Service
+@Transactional(readOnly = true)
+public class CmRemaksService extends CrudService<CmRemaksDao, CmRemaks> {
+
+    @Autowired
+    private CmRemaksDao cmRemaksDao;
+
+    @Transactional(readOnly = false)
+    public List<CmRemaks> findList(CmRemaks cmRemaks) {
+        return cmRemaksDao.findList(cmRemaks);
+    }
+
+    @Transactional(readOnly = false)
+    public Page<CmRemaks> findPage(Page<CmRemaks> page, CmRemaks cmRemaks) {
+        return super.findPage(page, cmRemaks);
+    }
+}

src/main/java/com/caimei/modules/user/service/NewCmClubService.java

@@ -164,13 +164,6 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         return newCmClubDao.findGroup(leaderId);
     }
 
-
-    @Transactional(readOnly = false)
-    public Page<CmRemaks> findRemaksPage(Page<CmRemaks> page, CmRemaks cmRemaks) {
-       List<CmRemaks> cmremakslist= newCmClubDao.remakasList(cmRemaks);
-       page.setList(cmremakslist);
-        return page;
-    }
     @Transactional(readOnly = false)
     public String upremakasList(CmRemaks cmRemaks){return newCmClubDao.upremakasList(cmRemaks);}
 
@@ -186,8 +179,20 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
      public void deleteRamarks(CmRemaks cmRemaks){newCmClubDao.deleteRamarks(cmRemaks);}
 
     @Transactional(readOnly = false)
-    public Integer ClubsIds(ClubChangeSp clubChangeSp){
+    public List<Integer> ClubsIds(ClubChangeSp clubChangeSp){
 
           return newCmClubDao.ClubsIds(clubChangeSp);
     }
+
+    @Transactional(readOnly = false)
+    public void oldname(Integer oldserviceProviderId,Integer clubID , Integer oldSpID,Integer newSpID){
+
+         newCmClubDao.oldname(oldserviceProviderId, clubID,oldSpID,newSpID);
+    }
+
+    @Transactional(readOnly = false)
+    public void oldnames(Integer clubID , Integer oldSpID,Integer newSpID){
+
+        newCmClubDao.oldnames(clubID,oldSpID,newSpID);
+    }
 }

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -690,15 +690,15 @@ public class NewCmShopController extends BaseController {
         } else if (!newCmShop.getFirstShopType().equals(newCmShops.getFirstShopType())) {
             list.add("修改了公司类型");
         }
-
-        if (newCmShops.getSecondShopType() == null) {
-            if (!newCmShop.getSecondShopType().equals("")) {
-                list.add("新增了医疗类型");
+        if (newCmShop.getMainpro() == null) {
+            if (newCmShops.getSecondShopType() == null) {
+                if (!newCmShop.getSecondShopType().equals("")) {
+                    list.add("新增了医疗类型");
+                }
+            } else if (!newCmShop.getSecondShopType().equals(newCmShops.getSecondShopType())) {
+                list.add("修改了医疗类型");
             }
-        } else if (!newCmShop.getSecondShopType().equals(newCmShops.getSecondShopType())) {
-            list.add("修改了医疗类型");
         }
-
         if (newCmShops.getMainpro() == null) {
             if (!newCmShop.getMainpro().equals("")) {
                 list.add("新增了主营内容");

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -57,6 +57,8 @@ public class AgencyController extends BaseController {
     @Autowired
     private NewCmClubService newCmClubService;
     @Autowired
+    private CmRemaksService cmRemaksService;
+    @Autowired
     private CmUserOrganizeService cmUserOrganizeService;
     @Autowired
     private CmUserService cmUserService;
@@ -1117,7 +1119,7 @@ public class AgencyController extends BaseController {
 
     @RequestMapping("cmrenaksList")
     public String renaks(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
-        Page<CmRemaks> page = newCmClubService.findRemaksPage(new Page<CmRemaks>(request, response, 20), cmRemaks);
+        Page<CmRemaks> page = cmRemaksService.findPage(new Page<CmRemaks>(request, response,20), cmRemaks);
         model.addAttribute("page",page);
         model.addAttribute("cmRemaks",cmRemaks);
         return "modules/userNew/cmRemaksList";
@@ -1129,6 +1131,7 @@ public class AgencyController extends BaseController {
            String remaks= newCmClubService.upremakasList(cmRemaks);
             model.addAttribute("list",cmRemaks);
             model.addAttribute("remaks",remaks);
+            model.addAttribute("remaksId",cmRemaks.getRemarksId());
         }
         return "modules/userNew/cmRemaksForm";
     }

src/main/java/com/caimei/modules/user/web/newUser/SpController.java

@@ -120,13 +120,24 @@ public class SpController extends BaseController {
                 if (null != cssp) {
                     String ClubsNames = sysLogService.ClubsName(clubChangeSpRecordID);
                     System.out.println("操作员" + ClubsNames);
-                    Integer clubId= newCmClubService.ClubsIds(cssp);
-                    if(clubId!=null){
-                        System.out.println("转移成功");
+
+                    Integer oldserviceProviderId=cssp.getOldSpID();
+                    Integer clubId=cssp.getClubID();
+                    Integer oldSpID=cssp.getOldSpID();
+                    Integer newspId=cssp.getNewSpID();
+                    List<Integer> oldname= newCmClubService.ClubsIds(cssp);
+                    for(Integer i : oldname){
+                    System.out.println("旧协销>>>>>>"+oldname+oldname.contains(null));
+                    if(i==null){
+                        System.out.println("旧协销id添加成功");
+                        newCmClubService.oldname(oldserviceProviderId,clubId,oldSpID,newspId);
+                     }else {
+                        newCmClubService.oldnames(clubId,oldSpID,newspId);
+                    }
                     }
                     System.out.println("旧ID>>>>>>>>" + cssp.getOldSpID());
                     System.out.println("ID>>>>>>>>" + cssp.getNewSpID());
-                    System.out.println("ID>>>>>>>>" + clubChangeSpRecordID);
+                    System.out.println("ID>>>>>>>>" + cssp.getClubID());
                     // 查询serviceprovider协销表
                     List<ServiceProviderModel> serviceprovider = serviceProviderDao.getServiceproviderById(cssp.getNewSpID());
                     // 查询cm_bind表

src/main/resources/mappings/modules/user/CmRemaksMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei.modules.user.dao.CmRemaksDao">
+
+    <select id="findList" resultType="CmRemaks">
+        SELECT remarksId,remarks,addtime
+        FROM `cm_remarks`
+        <where>
+            <if test="remarks != null and remarks != ''">
+                AND remarks LIKE "%"#{remarks}"%"
+            </if>
+        </where>
+
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+        </when>
+                <otherwise>
+                    order by addtime desc
+                </otherwise>
+        </choose>
+    </select>
+
+</mapper>

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -451,9 +451,11 @@
         ccr.id AS remarksId, ccr.remarks,s.linkman AS spName, ccr.addTime,ccr.questionMan,
         csr.leaderId AS leaderId,ifnull(ccr.consultType,'') as consult, c.Name as
         clubName,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
-        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName
+        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
+        (SELECT NAME 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 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
@@ -478,6 +480,11 @@
             </if>
         </where>
         ORDER BY ADDTIME DESC
+        <choose>
+            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
+                ORDER BY ${page.orderBy}
+            </when>
+        </choose>
     </select>
     <select id="findConsults" resultType="com.caimei.modules.consult.entity.type.CmConsulttype">
         select id, className, createdTime
@@ -518,30 +525,37 @@
         SET remarks = #{remarks}
         WHERE remarksId = #{remarksId}
     </update>
-    <select id="remakasList" resultType="CmRemaks">
-        SELECT remarksId,remarks,addtime
-        FROM `cm_remarks`
-        <where>
-            <if test="remarks != null and remarks != ''">
-                AND remarks LIKE "%"#{remarks}"%"
-            </if>
-        </where>
-        order by addtime desc
-        <choose>
-            <when test="page !=null and page.orderBy != null and page.orderBy != ''">
-                ORDER BY ${page.orderBy}
-            </when>
-        </choose>
-    </select>
+
     <select id="upremakasList" resultType="java.lang.String">
         SELECT remarks
         FROM `cm_remarks`
         WHERE remarksId = #{remarksId}
     </select>
 
-    <update id="ClubsIds">
+    <select id="ClubsIds" resultType="java.lang.Integer">
+        select oldserviceProviderId
+        FROM `cm_club_remarks`
+        WHERE clubId = #{clubID}
+    </select>
+
+<!--    <insert id="oldname">-->
+<!--        INSERT INTO `cm_old_remarks`(serviceProviderId, `serviceProviderName`)-->
+<!--        VALUES (#{serviceProviderId}, #{serviceProviderName})-->
+<!--    </insert>-->
+
+    <update id="oldname">
+    UPDATE `cm_club_remarks`
+    SET oldserviceProviderId = #{oldserviceProviderId},
+        serviceProviderId=#{newSpID}
+    WHERE clubId = #{clubID}
+      AND serviceProviderId=#{oldSpID}
+</update>
+
+    <update id="oldnames">
         UPDATE `cm_club_remarks`
         SET serviceProviderId=#{newSpID}
-        WHERE serviceProviderId = #{oldSpID}
+        WHERE clubId = #{clubID}
+          AND serviceProviderId=#{oldSpID}
     </update>
+
 </mapper>

src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp

@@ -128,7 +128,12 @@
             <c:forEach items="${page.list}" var="clubRemarks" varStatus="remark">
                 <div class="td clear" style="dashed:#0066CC;">
                     <div style="font-weight: bold;width: 100%;float: left;">
-                        <span style="float: left;">${clubRemarks.spName}</span>
+                        <c:if test="${not empty clubRemarks.oldName}">
+                            <span style="float: left;">${clubRemarks.oldName}</span>
+                        </c:if>
+                        <c:if test="${empty clubRemarks.oldName}">
+                            <span style="float: left;">${clubRemarks.spName}</span>
+                        </c:if>
                         <span style="float: left;margin-left:20px;"><fmt:formatDate value="${clubRemarks.addTime}"
                                                                                     pattern="yyyy-MM-dd HH:mm"/></span>
                         <span style="float: left;margin-left:120px;">管理员：${clubRemarks.leaderName}</span>

src/main/webapp/WEB-INF/views/modules/userNew/cmRemaksForm.jsp

@@ -167,6 +167,7 @@
         <tr>
             <th><span style="color: red">*</span>  关键词：</th>
             <td colspan="3">
+                <input type="hidden" name="remarksId" id="remarksId" value="${remaksId}" >
 <%--                <input:form path="remarks" name="remarks" value=" ${empty list.remarks ? '' : list.remarks}" class="short input-small required" maxlength="50"/>--%>
                 <input style="width: 150px" id="remarks" placeholder="最多输入10个字符" name="remarks" class="short input-small" type="text" value="${remaks}" maxlength="10"/>&nbsp; &emsp; <span class="red" id="bt">*必填</span>
             </td>

src/main/webapp/WEB-INF/views/modules/userNew/cmRemaksList.jsp

@@ -48,7 +48,7 @@
     <thead>
     <tr>
         <th>ID</th>
-        <th>关键字</th>
+        <th>关键词</th>
         <th>添加时间</th>
         <th>操作</th>
     </tr>
@@ -72,6 +72,7 @@
 
         </tr>
     </c:forEach>
+
     </tbody>
 </table>
 <div class="pagination">${page}</div>

src/main/webapp/WEB-INF/views/modules/userNew/cmUnRegistRemarksList.jsp

@@ -101,7 +101,13 @@
 		<c:forEach items="${page.list}" var="visitRemarks" varStatus="remark">
 			<div class="td clear">
 				<div style="font-weight: bold;width: 100%;float: left;">
-                    <span style="float: left;">${visitRemarks.serviceName}</span>
+					<c:if test="${not empty visitRemarks.oldName}">
+						<span style="float: left;">${visitRemarks.oldName}</span>
+					</c:if>
+					<c:if test="${empty visitRemarks.oldName}">
+						<span style="float: left;">${visitRemarks.serviceName}</span>
+					</c:if>
+<%--                    <span style="float: left;">${visitRemarks.serviceName}</span>--%>
 					<span style="float: left;margin-left:10px;"><fmt:formatDate value="${visitRemarks.addTime}" pattern="yyyy-MM-dd HH:mm"/></span>
                     <span style="float: left;margin-left:120px;">管理员：${visitRemarks.leaderName}</span>
                 </div>
@@ -178,13 +184,13 @@
 						${visitRemarks.remarks}
 					</div>
 				</div>
-				<c:if test="${not empty clubRemarks.extra}">
+				<c:if test="${not empty visitRemarks.extra}">
 					<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 							额外说明:
 						</div>
 						<div style="width: 800px;float: left;margin: 10px 0;">
-								${clubRemarks.extra}
+								${visitRemarks.extra}
 						</div>
 					</div>
 				</c:if>

src/main/webapp/WEB-INF/views/modules/userNew/cmVisitRemarksList.jsp

@@ -58,7 +58,14 @@
 	<div style="overflow-x: hidden;word-break:break-all">
 		<c:forEach items="${page.list}" var="visitRemarks" varStatus="remark">
 			<div class="td clear">
-				<div style="font-weight: bold;width: 100%;float: left;"><span style="float: left;">${visitRemarks.serviceName}</span>
+				<div style="font-weight: bold;width: 100%;float: left;"
+				<c:if test="${not empty visitRemarks.oldName}">
+					<span style="float: left;">${visitRemarks.oldName}</span>
+				</c:if>
+				<c:if test="${empty visitRemarks.oldName}">
+					<span style="float: left;">${visitRemarks.serviceName}</span>
+				</c:if>
+<%--				<span style="float: left;">${visitRemarks.serviceName}</span>--%>
 					<span style="float: left;margin-left:10px;"><fmt:formatDate value="${visitRemarks.addTime}" pattern="yyyy-MM-dd HH:mm"/></span></div>
 				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
 					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询人:</div>