协销填写咨询记录增加关键词联想后台

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

@@ -56,5 +56,5 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     void deleteRamarks(CmRemaks cmRemaks);
 
-    void ClubsIds(ClubChangeSp clubChangeSp);
+    Integer ClubsIds(ClubChangeSp clubChangeSp);
 }

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

@@ -96,7 +96,67 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
      */
     private List<RemarksFileVo> fileList;
 
+    /**
+     * 机构类型
+     */
+    private String clubType;
+    /**
+     * 价格敏感度
+     */
+    private String pinceSensitve;
+    /**
+     * 意向程度
+     */
+    private String satisfied;
+    /**
+     * 跟进状态
+     */
+    private String followup;
+    /**
+     * 额外说明
+     */
+    private String extra;
+
+
+    public String getClubType() {
+        return clubType;
+    }
+
+    public void setClubType(String clubType) {
+        this.clubType = clubType;
+    }
 
+    public String getPinceSensitve() {
+        return pinceSensitve;
+    }
+
+    public void setPinceSensitve(String pinceSensitve) {
+        this.pinceSensitve = pinceSensitve;
+    }
+
+    public String getSatisfied() {
+        return satisfied;
+    }
+
+    public void setSatisfied(String satisfied) {
+        this.satisfied = satisfied;
+    }
+
+    public String getFollowup() {
+        return followup;
+    }
+
+    public void setFollowup(String followup) {
+        this.followup = followup;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
 
     public String getConsultType() {
         return consultType;

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

@@ -99,6 +99,67 @@ public class VisitRemarkVo extends DataEntity<VisitRemarkVo> {
      */
     private List<Server> serverList;
 
+    /**
+     * 机构类型
+     */
+    private String clubType;
+    /**
+     * 价格敏感度
+     */
+    private String pinceSensitve;
+    /**
+     * 意向程度
+     */
+    private String satisfied;
+    /**
+     * 跟进状态
+     */
+    private String followup;
+    /**
+     * 额外说明
+     */
+    private String extra;
+
+    public String getClubType() {
+        return clubType;
+    }
+
+    public void setClubType(String clubType) {
+        this.clubType = clubType;
+    }
+
+    public String getPinceSensitve() {
+        return pinceSensitve;
+    }
+
+    public void setPinceSensitve(String pinceSensitve) {
+        this.pinceSensitve = pinceSensitve;
+    }
+
+    public String getSatisfied() {
+        return satisfied;
+    }
+
+    public void setSatisfied(String satisfied) {
+        this.satisfied = satisfied;
+    }
+
+    public String getFollowup() {
+        return followup;
+    }
+
+    public void setFollowup(String followup) {
+        this.followup = followup;
+    }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
     public String getConsultType() {
         return consultType;
     }

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

@@ -185,7 +185,9 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
     @Transactional(readOnly = false)
      public void deleteRamarks(CmRemaks cmRemaks){newCmClubDao.deleteRamarks(cmRemaks);}
 
-    public void ClubsIds(ClubChangeSp clubChangeSp){
-          newCmClubDao.ClubsIds(clubChangeSp);
+    @Transactional(readOnly = false)
+    public Integer ClubsIds(ClubChangeSp clubChangeSp){
+
+          return newCmClubDao.ClubsIds(clubChangeSp);
     }
 }

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

@@ -1141,12 +1141,12 @@ public class AgencyController extends BaseController {
            cmRemaks.setAddtime(new Date());
            newCmClubService.addRemarks(cmRemaks);
        }
-        return "redirect:" + Global.getAdminPath() + "/userNew/cmRemaksList";
+        return "redirect:" + Global.getAdminPath() + "/new/user/agency/cmrenaksList";
     }
     @RequestMapping("deleteRamarks")
     public String deleteRamarks(CmRemaks cmRemaks,HttpServletRequest request, HttpServletResponse response, Model model) {
          newCmClubService.deleteRamarks(cmRemaks);
-        return "redirect:" + Global.getAdminPath() + "/userNew/cmRemaksList";
+        return "redirect:" + Global.getAdminPath() + "/new/user/agency/cmrenaksList";
     }
 
 }

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

@@ -120,7 +120,10 @@ public class SpController extends BaseController {
                 if (null != cssp) {
                     String ClubsNames = sysLogService.ClubsName(clubChangeSpRecordID);
                     System.out.println("操作员" + ClubsNames);
-//                    Integer clubIds=newCmClubService.ClubsIds(ClubsNames);
+                    Integer clubId= newCmClubService.ClubsIds(cssp);
+                    if(clubId!=null){
+                        System.out.println("转移成功");
+                    }
                     System.out.println("旧ID>>>>>>>>" + cssp.getOldSpID());
                     System.out.println("ID>>>>>>>>" + cssp.getNewSpID());
                     System.out.println("ID>>>>>>>>" + clubChangeSpRecordID);

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

@@ -403,7 +403,7 @@
                         s.linkMan                                                                     as spName,
                         ccr.addTime,
                         ccr.questionMan,
-                        ccr.consultType                                                               as consult,
+                        ccr.consultType as consult,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
                         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName
         from cm_club_remarks ccr
                  left join serviceprovider s on ccr.serviceProviderId = s.serviceProviderID
@@ -449,7 +449,8 @@
     <select id="findRegistList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
         SELECT DISTINCT
         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,
+        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
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
@@ -503,7 +504,9 @@
     </select>
 
     <delete id="deleteRamarks">
-        DELETE FROM `cm_remarks` WHERE remarksId=#{remarksId}
+        DELETE
+        FROM `cm_remarks`
+        WHERE remarksId = #{remarksId}
     </delete>
 
     <insert id="addRemarks">
@@ -533,11 +536,12 @@
     <select id="upremakasList" resultType="java.lang.String">
         SELECT remarks
         FROM `cm_remarks`
-        WHERE remarksId=#{remarksId}
+        WHERE remarksId = #{remarksId}
     </select>
 
     <update id="ClubsIds">
-        UPDATE `cm_club_remarks` SET serviceProviderId=#{newSpID}
-        WHERE serviceProviderId=#{oldSpID}
+        UPDATE `cm_club_remarks`
+        SET serviceProviderId=#{newSpID}
+        WHERE serviceProviderId = #{oldSpID}
     </update>
 </mapper>

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

@@ -17,12 +17,14 @@
     <select id="getServer" resultType="com.caimei.modules.user.entity.Server">
         SELECT DISTINCT cvr.serviceProviderId, s.linkMan as name
         FROM cm_visitor_remarks cvr
-        LEFT JOIN serviceprovider s ON s.serviceProviderID = cvr.serviceProviderId
+                 LEFT JOIN serviceprovider s ON s.serviceProviderID = cvr.serviceProviderId
     </select>
     <select id="findList" resultType="com.caimei.modules.user.entity.VisitRemarkVo">
-        SELECT cvr.id as remarksId,cvr.questionManId,cvr.serviceProviderId,cvr.remarks,cvr.addTime,cvr.questionMan,cvr.clubId,cvr.concactTime,c.name as clubName,s.linkMan as serviceName
+        SELECT cvr.id as
+        remarksId,cvr.questionManId,cvr.serviceProviderId,cvr.remarks,cvr.addTime,cvr.questionMan,cvr.clubId,cvr.concactTime,c.name
+        as clubName,s.linkMan as serviceName
         FROM cm_visitor_remarks cvr
-        LEFT JOIN serviceprovider s  ON s.serviceProviderID = cvr.serviceProviderId
+        LEFT JOIN serviceprovider s ON s.serviceProviderID = cvr.serviceProviderId
         LEFT JOIN club c ON c.clubId= cvr.clubId
         <where>
             <if test="serviceProviderId != null and serviceProviderId != ''">
@@ -42,14 +44,19 @@
         ORDER BY cvr.addTime DESC
     </select>
     <select id="findRemarksList" resultType="com.caimei.modules.user.entity.VisitRemarkVo">
-        select cvr.id as remarksId, remarks,s.linkMan as serviceName, cvr.addTime,cvr.questionMan,ifnull(cvr.consultType,'')as consult,
-        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName
+        select cvr.id                                                                        as remarksId,
+               remarks,
+               s.linkMan                                                                     as serviceName,
+               cvr.addTime,
+               cvr.questionMan,
+               ifnull(cvr.consultType, '')                                                   as consult,
+               (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName
         from cm_visitor_remarks cvr
-        left join serviceprovider s on cvr.serviceProviderId = s.serviceProviderID
-        LEFT JOIN cm_serviceteam_group csg ON cvr.serviceProviderId=csg.serviceId
-        LEFT JOIN cm_serviceteam_role csr ON csr.id=csg.teamId
+                 left join serviceprovider s on cvr.serviceProviderId = s.serviceProviderID
+                 LEFT JOIN cm_serviceteam_group csg ON cvr.serviceProviderId = csg.serviceId
+                 LEFT JOIN cm_serviceteam_role csr ON csr.id = csg.teamId
         where questionManId = #{questionManId}
-        and remarks is not null
+          and remarks is not null
         order by addTime desc
     </select>
     <select id="getRemarksImageList" resultType="java.lang.String">
@@ -67,7 +74,8 @@
     <select id="findRegistList" resultType="com.caimei.modules.user.entity.VisitRemarkVo">
         SELECT DISTINCT
         ccr.id AS remarksId, ccr.remarks,s.name AS spName, ccr.addTime,ccr.questionMan,
-        csr.leaderId AS leaderId,ifnull(ccr.consultType,'') as consult,
+        csr.leaderId AS leaderId,ifnull(ccr.consultType,'') as
+        consult,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS serviceName,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName
         FROM cm_visitor_remarks ccr
@@ -90,11 +98,13 @@
             <if test="endAddTime != '' and endAddTime != null">
                 and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
             </if>
-                and ccr.remarks IS NOT NULL
+            and ccr.remarks IS NOT NULL
         </where>
         ORDER BY ADDTIME DESC
     </select>
     <select id="findClassName" resultType="java.lang.String">
-        select className from cm_consulttype where id = #{string}
+        select className
+        from cm_consulttype
+        where id = #{string}
     </select>
 </mapper>

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

@@ -67,17 +67,53 @@
 				<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.questionMan}</div>
+					<c:if test="${not empty clubRemarks.clubType}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
+							机构类型：
+						</div>
+						<div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.clubType}</div>
+					</c:if>
 				</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>
 					<div style="width: 800px;float: left;margin: 10px 0;">${clubRemarks.consultType}</div>
 				</div>
+				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+					<c:if test="${not empty clubRemarks.pinceSensitve}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+							价格敏感度 :
+						</div>
+						<div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.pinceSensitve}</div>
+					</c:if>
+					<c:if test="${not empty clubRemarks.satisfied}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+							意向程度：
+						</div>
+						<div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.satisfied}</div>
+					</c:if>
+					<c:if test="${not empty clubRemarks.followup}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+							跟进状态：
+						</div>
+						<div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.followup}</div>
+					</c:if>
+				</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>
 					<div style="width: 800px;float: left;margin: 10px 0;">
 						${clubRemarks.remarks}
 					</div>
 				</div>
+				<c:if test="${not empty clubRemarks.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}
+						</div>
+					</div>
+				</c:if>
 				<div class="td-text" style="width: 100%;float: left;">
 					<c:if test="${not empty clubRemarks.imageList}">
 						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">图片:</div>

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

@@ -108,10 +108,12 @@
         </div>
         <div class="item">
             <label class="control-label">添加日期：</label>
-            <form:input path="startAddTime" type="text" maxlength="20" class="input-mini Wdate" value="${cmClubRemarks.startAddTime}" cssStyle="width: 130px"
+            <form:input path="startAddTime" type="text" maxlength="20" class="input-mini Wdate"
+                        value="${cmClubRemarks.startAddTime}" cssStyle="width: 130px"
                         onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
             -
-            <form:input path="endAddTime" type="text" maxlength="20" class="input-mini Wdate" value="${cmClubRemarks.endAddTime}" cssStyle="width: 130px"
+            <form:input path="endAddTime" type="text" maxlength="20" class="input-mini Wdate"
+                        value="${cmClubRemarks.endAddTime}" cssStyle="width: 130px"
                         onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
         </div>
         <div class="item">
@@ -140,6 +142,12 @@
                             机构名称：
                         </div>
                         <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.clubName}</div>
+                        <c:if test="${not empty clubRemarks.clubType}">
+                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                            机构类型：
+                        </div>
+                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.clubType}</div>
+                        </c:if>
                     </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;">
@@ -147,6 +155,26 @@
                         </div>
                         <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.consultType}</div>
                     </div>
+                    <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+                        <c:if test="${not empty clubRemarks.pinceSensitve}">
+                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                            价格敏感度 :
+                        </div>
+                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.pinceSensitve}</div>
+                        </c:if>
+                        <c:if test="${not empty clubRemarks.satisfied}">
+                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                            意向程度：
+                        </div>
+                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.satisfied}</div>
+                        </c:if>
+                        <c:if test="${not empty clubRemarks.followup}">
+                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                            跟进状态：
+                        </div>
+                        <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.followup}</div>
+                        </c:if>
+                    </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;">
                             关键词记录:
@@ -155,6 +183,16 @@
                                 ${clubRemarks.remarks}
                         </div>
                     </div>
+                    <c:if test="${not empty clubRemarks.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}
+                        </div>
+                    </div>
+                    </c:if>
                     <div class="td-text" style="width: 100%;float: left;">
                         <c:if test="${not empty clubRemarks.imageList}">
                             <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">

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

@@ -107,17 +107,53 @@
 				<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;">${visitRemarks.questionMan}</div>
+					<c:if test="${not empty visitRemarks.clubType}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
+							机构类型：
+						</div>
+						<div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.clubType}</div>
+					</c:if>
 				</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>
 					<div style="width: 800px;float: left;margin: 10px 0;">${visitRemarks.consultType}</div>
 				</div>
+				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+					<c:if test="${not empty visitRemarks.pinceSensitve}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+							价格敏感度 :
+						</div>
+						<div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.pinceSensitve}</div>
+					</c:if>
+					<c:if test="${not empty visitRemarks.satisfied}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+							意向程度：
+						</div>
+						<div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.satisfied}</div>
+					</c:if>
+					<c:if test="${not empty visitRemarks.followup}">
+						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+							跟进状态：
+						</div>
+						<div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.followup}</div>
+					</c:if>
+				</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>
 					<div style="width: 800px;float: left;margin: 10px 0;">
 						${visitRemarks.remarks}
 					</div>
 				</div>
+				<c:if test="${not empty clubRemarks.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}
+						</div>
+					</div>
+				</c:if>
 				<div class="td-text" style="width: 100%;float: left;">
 					<c:if test="${not empty visitRemarks.imageList}">
 						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">图片:</div>