bugfix

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

@@ -92,6 +92,19 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         cmClubRemarks.setPage(page);
         List<CmClubRemarks> remarksList = newCmClubDao.findRemarksList(cmClubRemarks);
         remarksList.forEach(remarks -> {
+            if (StringUtils.isNotBlank(remarks.getConsult())) {
+                StringBuilder cons = new StringBuilder();
+                if(remarks.getConsult().contains(",")){
+                    String[] split = remarks.getConsult().split(",");
+                    for (String string : split) {
+                        cons.append(newCmClubDao.findClassName(string)).append(",");
+                    }
+                    cons = new StringBuilder(cons.substring(0, cons.length() - 1));
+                }else{
+                    cons = new StringBuilder(newCmClubDao.findClassName(remarks.getConsult()));
+                }
+                remarks.setConsultType(cons.toString());
+            }
             List<String> imageList = newCmClubDao.getRemarksImageList(remarks.getRemarksId());
             List<RemarksFileVo> fileList = newCmClubDao.getRemarksFileList(remarks.getRemarksId());
             fileList.forEach(f -> f.setFileUrl(OSSUtils.getOssUrl(f.getOssName())));

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

@@ -79,6 +79,19 @@ public class VisitRemarkController extends BaseController {
         visit.setPage(page);
         List<VisitRemarkVo> remarksList = visitRemarkDao.findRemarksList(visit);
         remarksList.forEach(remarks->{
+            if (StringUtils.isNotBlank(remarks.getConsult())) {
+                StringBuilder cons = new StringBuilder();
+                if(remarks.getConsult().contains(",")){
+                    String[] split = remarks.getConsult().split(",");
+                    for (String string : split) {
+                        cons.append(visitRemarkDao.findClassName(string)).append(",");
+                    }
+                    cons = new StringBuilder(cons.substring(0, cons.length() - 1));
+                }else{
+                    cons = new StringBuilder(visitRemarkDao.findClassName(remarks.getConsult()));
+                }
+                remarks.setConsultType(cons.toString());
+            }
             List<String> imageList = visitRemarkDao.getRemarksImageList(remarks.getRemarksId());
             List<RemarksFileVo> fileList = visitRemarkDao.getRemarksFileList(remarks.getRemarksId());
             fileList.forEach(f->f.setFileUrl(OSSUtils.getOssUrl(f.getOssName())));

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

@@ -398,9 +398,12 @@
 		select serviceProviderID from serviceprovider where serviceProviderID = #{spID} and status = 90
 	</select>
     <select id="findRemarksList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
-		select id as remarksId, remarks,s.linkMan as spName, ccr.addTime,ccr.questionMan
+		select ccr.id as remarksId, remarks,s.linkMan as spName, ccr.addTime,ccr.questionMan,ccr.consultType as consult,
+		(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
+		LEFT JOIN cm_serviceteam_group csg ON ccr.serviceProviderId=csg.serviceId
+		LEFT JOIN cm_serviceteam_role csr ON csr.id = csg.teamId
 		where clubId = #{clubId}
 		order by addTime desc
 	</select>

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

@@ -42,9 +42,12 @@
         ORDER BY cvr.addTime DESC
     </select>
     <select id="findRemarksList" resultType="com.caimei.modules.user.entity.VisitRemarkVo">
-        select id as remarksId, remarks,s.linkMan as serviceName, cvr.addTime,cvr.questionMan
+        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
         where questionManId = #{questionManId}
         and remarks is not null
         order by addTime desc

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

@@ -44,7 +44,7 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/new/user/agency/">机构列表</a></li>
+		<li><a href="${ctx}/new/user/agency/">未注册用户咨询记录</a></li>
 		<li class="active"><a href="${ctx}/new/user/agency/remarks?clubId=${cmClubRemarks.clubId}">咨询记录</a></li>
 	</ul><br/>
 <form:form id="searchForm" modelAttribute="cmClubRemarks" action="${ctx}/new/user/agency/remarks" method="post" class="breadcrumb form-search">
@@ -58,12 +58,20 @@
 	<div style="overflow-x: hidden;word-break:break-all">
 		<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>
-					<span style="float: left;margin-left:10px;"><fmt:formatDate value="${clubRemarks.addTime}" pattern="yyyy-MM-dd HH:mm"/></span></div>
+
+				<div style="font-weight: bold;width: 100%;float: left;">
+					<span style="float: left;">${clubRemarks.spName}</span>
+					<span style="float: left;margin-left:10px;"><fmt:formatDate value="${clubRemarks.addTime}" pattern="yyyy-MM-dd HH:mm"/></span>
+					<span style="float: left;margin-left:120px;">管理员：${clubRemarks.leaderName}</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>
 					<div style="width: 800px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</div>
 				</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;">
 					<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;">

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

@@ -44,7 +44,7 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/new/user/visit/">潜在用户画像信息</a></li>
+		<li><a href="${ctx}/new/user/visit/">未注册用户咨询记录</a></li>
 		<li class="active">   <a href="${ctx}/new/user/visit/find?questionManId=${visit.questionManId}">信息详情</a></li>
 	</ul><br/>
 <form:form id="questionManId" modelAttribute="visit" action="${ctx}/new/user/visit/find" method="post" class="breadcrumb form-search">
@@ -63,6 +63,11 @@
 				<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>
+					<span style="float: left;margin-left:120px;">管理员：${visitRemarks.leaderName}</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>
+					<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;">
 					<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">关键词记录:</div>