Merge remote-tracking branch 'origin/developer' into developerA

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

@@ -26,6 +26,8 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     Integer findSpId(Integer spID);
 
+    List<ServiceProviderModel> spNameList();
+
     void insertBeansHistory(UserBeansHistory beansHistory);
 
     void updateByStatus(@Param("clubStatus") int clubStatus, @Param("confirmUserId") Integer confirmUserId);

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

@@ -180,9 +180,11 @@ public class AgencyController extends BaseController {
         }
 
         Page<NewCmClub> page = newCmClubService.findPage(new Page<NewCmClub>(request, response, 20), newCmClub);
-
+        // 协销下拉
+        List<ServiceProviderModel> spNameList = newCmClubDao.spNameList();
         model.addAttribute("newCmClub", newCmClub);
         model.addAttribute("page", page);
+        model.addAttribute("spNameList", spNameList);
         return "modules/userNew/cmAgencyList";
     }
 

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

@@ -99,9 +99,9 @@
         <include refid="otherColumns"/>,u.userPermission,u.source, covs.activeState,covs.customerValue
         FROM club a
         <include refid="newCmClubJoins"/>
-        left join cm_organ_value_system covs on a.userID = covs.userID
+        LEFT JOIN (SELECT userID, activeState, customerValue FROM cm_organ_value_system WHERE stage = 0 AND delType = 1) covs ON a.userID = covs.userID
         <where>
-            covs.stage = 0 AND covs.delType = 1
+            (u.userOrganizeID IN(0,1) or u.clubStatus != 92)
             <if test="clubID != null and clubID != ''">
                 AND a.clubID = #{clubID}
             </if>
@@ -162,7 +162,10 @@
             <if test="customerValue != null and customerValue != ''">
                 AND covs.customerValue = #{customerValue}
             </if>
-             AND (u.userOrganizeID IN(0,1) or u.clubStatus != 92)
+            <if test="spID != null and spID != ''">
+                AND sp.serviceProviderID = #{spID}
+            </if>
+
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -173,7 +176,9 @@
             </otherwise>
         </choose>
     </select>
-
+    <select id="spNameList" resultType="com.caimei.modules.project.model.ServiceProviderModel">
+        SELECT serviceProviderID,name FROM serviceprovider WHERE NAME NOT LIKE concat('%','测试','%') AND validFlag = 1 AND STATUS = 90
+    </select>
     <select id="findAllList" resultType="NewCmClub">
         SELECT
         <include refid="newCmClubColumns"/>

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

@@ -141,6 +141,13 @@
                 <form:option value="2">否</form:option>
             </form:select>
         </div>
+        <div class="item">
+            <label>协销：</label>
+            <form:select path="spID" class="input-medium">
+                <form:option value="" label="全部"/>
+                <form:options items="${spNameList}" itemLabel="name" itemValue="serviceProviderID" htmlEscape="false"/>
+            </form:select>
+        </div>
         <div class="item">
             <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         </div>

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

@@ -112,7 +112,7 @@
         <div class="flex-content">
             <div class="flex-box">
                 <div class="box-title">
-                    <span>咨询记录总数:<a class="line" href="${ctx}/new/user/agency/regist?clubName=${cmPortrait.clubName}"><c:if test="${!empty portrait.remarksTotal}">${portrait.remarksTotal}</c:if><c:if test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>
+                    <span>咨询记录总数:<a class="line" href="${ctx}/new/user/agency/regist?clubId=${cmPortrait.clubID}&clubName=${cmPortrait.clubName}"><c:if test="${!empty portrait.remarksTotal}">${portrait.remarksTotal}</c:if><c:if test="${empty portrait.remarksTotal}">0</c:if> 条</a></span>
                 </div>
                 <div class="box-tabmain">
                     <div class="box-tabs" id="serviceTabs">

src/main/webapp/static/modules/cmClubPortrait/cmClubEacths.js

@@ -44,6 +44,7 @@ const getInfoOrderDate = function () {
             $('#orderTimeStart').val(s1);
             $('#orderTimeEnd').val(s2);
             if (defaultParams.startTime && defaultParams.endTime) {
+                $('#orderTabs').find('a').removeClass('active');
                 getClubEacthsData(0,0)
             }
         }
@@ -72,6 +73,7 @@ const getInfoKeyWordsDate = function () {
             $('#keyWordsTimeStart').val(s1);
             $('#keyWordsTimeEnd').val(s2);
             if (defaultParams.startTime && defaultParams.endTime) {
+                $('#keyWordTabs').find('a').removeClass('active');
                 getClubEacthsData(1,0)
             }
         }
@@ -100,6 +102,7 @@ const getInfoServiceDate = function () {
             $('#serviceTimeStart').val(s1);
             $('#serviceTimeEnd').val(s2);
             if (defaultParams.startTime && defaultParams.endTime) {
+                $('#serviceTabs').find('a').removeClass('active');
                 getClubEacthsData(2,0)
             }
         }
@@ -128,6 +131,7 @@ const getInfoVisitDate = function () {
             $('#visitTimeStart').val(s1);
             $('#visitTimeEnd').val(s2);
             if (defaultParams.startTime && defaultParams.endTime) {
+                $('#visitTabs').find('a').removeClass('active');
                 getClubEacthsData(3,0)
             }
         }
@@ -150,6 +154,8 @@ const  getClubEacthsData = function (type,dateType) {
                             $('#orderEacthsNone').show();
                             $('#orderEacths').hide();
                             $('.eachts-total').hide();
+                            $('#orderTimeEnd').val(data.portrait.endTime);
+                            $('#orderTimeStart').val(data.portrait.startTime);
                         }else{
                             setOrderData(type,data)
                         }
@@ -158,6 +164,8 @@ const  getClubEacthsData = function (type,dateType) {
                         if(!data.behavior){
                             $('#keyWordsEacthsNone').show();
                             $('#keyWordsEacths').hide();
+                            $('#keyWordsTimeEnd').val(data.portrait.endTime);
+                            $('#keyWordsTimeStart').val(data.portrait.startTime);
                         }else{
                             setOtherData(type,data)
                         }
@@ -166,6 +174,8 @@ const  getClubEacthsData = function (type,dateType) {
                         if(!data.remarks){
                             $('#serviceEacthsNone').show();
                             $('#serviceEacths').hide();
+                            $('#serviceTimeEnd').val(data.portrait.endTime);
+                            $('#serviceTimeStart').val(data.portrait.startTime);
                         }else{
                             setOtherData(type,data)
                         }
@@ -174,6 +184,8 @@ const  getClubEacthsData = function (type,dateType) {
                         if(!data.pageType){
                             $('#visitEacthsNone').show();
                             $('#visitEacths').hide();
+                            $('#visitTimeEnd').val(data.portrait.endTime);
+                            $('#visitTimeStart').val(data.portrait.startTime);
                         }else{
                             setOtherData(type,data)
                         }