Merge branch 'developer' into developerB

src/main/resources/mappings/modules/serviceteam/CmServiceteamRoleMapper.xml

@@ -75,7 +75,7 @@
 		WHERE csg.teamId = #{id}
 	</select>
 	<select id="findAllGroups" resultType="com.caimei.modules.project.model.ServiceProviderModel">
-		select s.serviceProviderID,s.name
+		select s.serviceProviderID,IFNULL(s.name,s.linkman) as name
 		from serviceprovider s
 		WHERE s.serviceProviderID NOT IN (SELECT serviceId FROM cm_serviceteam_group)
 	</select>

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

@@ -398,7 +398,8 @@
 		select serviceProviderID from serviceprovider where serviceProviderID = #{spID} and status = 90
 	</select>
     <select id="findRemarksList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
-		select ccr.id as remarksId, remarks,s.linkMan as spName, ccr.addTime,ccr.questionMan,ccr.consultType as consult,
+		select DISTINCT
+		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
@@ -445,14 +446,15 @@
 		  and num = 500
 	</select>
 	<select id="findRegistList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
-		SELECT ccr.id AS remarksId, ccr.remarks,s.name AS spName, ccr.addTime,ccr.questionMan,
+		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,
 			   (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 club c ON c.clubId=ccr.clubId
-				 LEFT JOIN cm_serviceTeam_role csr ON csr.leaderId = ccr.serviceProviderId
-				 LEFT JOIN cm_serviceTeam_group csg ON csr.id=csg.teamId
+				 LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
+				 LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
 		<where>
 			<if test="remarks != null and remarks !=''">
 				AND ccr.remarks LIKE concat('%',#{remarks},'%')

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

@@ -65,13 +65,15 @@
           and fileType = 2
     </select>
     <select id="findRegistList" resultType="com.caimei.modules.user.entity.VisitRemarkVo">
-        SELECT ccr.id AS remarksId, ccr.remarks,s.name AS spName, ccr.addTime,ccr.questionMan,
+        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,
-        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName
+        (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
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
-        LEFT JOIN cm_serviceTeam_role csr ON csr.leaderId = ccr.serviceProviderId
-        LEFT JOIN cm_serviceTeam_group csg ON csr.id=csg.teamId
+        LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
+        LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
         <where>
             <if test="remarks != null and remarks !=''">
                 AND ccr.remarks LIKE concat('%',#{remarks},'%')
@@ -88,6 +90,7 @@
             <if test="endAddTime != '' and endAddTime != null">
                 and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
             </if>
+                and ccr.remarks IS NOT NULL
         </where>
         ORDER BY ADDTIME DESC
     </select>