用户行为优化1.0.4

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

@@ -34,4 +34,6 @@ public interface CmSpDao extends CrudDao<NewCmSp> {
     void deleteManager();
 
     NewCmSp findManagerInfo();
+
+    List<Map<String, Object>> getSpClubActive(@Param("serviceProviderID") Integer serviceProviderID);
 }

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

@@ -32,6 +32,8 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     List<ServiceProviderModel> spNameList();
 
+    List<CmClubLabel> getClubLabel();
+
     void insertBeansHistory(UserBeansHistory beansHistory);
     List<CmClubRemarks> findRemarksList(CmClubRemarks cmClubRemarks);
 

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

@@ -11,6 +11,8 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
 public class ActiveClub  extends DataEntity<ActiveClub> {
     private Integer userID; // 用户Id
     private Integer clubID; // 机构Id
+    private String registerStartTime; // 注册开始时间
+    private String registerEndTime; // 注册结束时间
     private String behaviorStartTime; // 最近访问时间开始时间
     private String behaviorEndTime; // 最近访问时间结束时间
     private String recentlyStartTime; // 最近咨询时间开始时间
@@ -30,6 +32,7 @@ public class ActiveClub  extends DataEntity<ActiveClub> {
     private String linkMan; //联系人
     private String contractMobile;  //联系手机
     private String linkManIdentity; //联系人身份：1老板，2采购，3运营，4其他
+    private Integer spID;   // 协销Id
     private String spName;      //协销人员
     private String address;         //详细地址
     private String userIdentity;    //用户身份
@@ -39,7 +42,6 @@ public class ActiveClub  extends DataEntity<ActiveClub> {
     private String clubRank;  // 机构级别
     private String firstClubType;  // 机构一级分类
     private String classify;  // 机构二级分类
-    private String clubType;  // 机构类型
     private String addTime;  // 注册时间
     private String svipUserFlag;  // vip类别
     private String activeStatus;     // 活跃状态 0：活跃、1：不活跃
@@ -66,6 +68,22 @@ public class ActiveClub  extends DataEntity<ActiveClub> {
         this.clubID = clubID;
     }
 
+    public String getRegisterStartTime() {
+        return registerStartTime;
+    }
+
+    public void setRegisterStartTime(String registerStartTime) {
+        this.registerStartTime = registerStartTime;
+    }
+
+    public String getRegisterEndTime() {
+        return registerEndTime;
+    }
+
+    public void setRegisterEndTime(String registerEndTime) {
+        this.registerEndTime = registerEndTime;
+    }
+
     public String getBehaviorStartTime() {
         return behaviorStartTime;
     }
@@ -194,6 +212,14 @@ public class ActiveClub  extends DataEntity<ActiveClub> {
         this.linkManIdentity = linkManIdentity;
     }
 
+    public Integer getSpID() {
+        return spID;
+    }
+
+    public void setSpID(Integer spID) {
+        this.spID = spID;
+    }
+
     public String getSpName() {
         return spName;
     }
@@ -266,14 +292,6 @@ public class ActiveClub  extends DataEntity<ActiveClub> {
         this.classify = classify;
     }
 
-    public String getClubType() {
-        return clubType;
-    }
-
-    public void setClubType(String clubType) {
-        this.clubType = clubType;
-    }
-
     public String getAddTime() {
         return addTime;
     }

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

@@ -0,0 +1,103 @@
+package com.caimei.modules.user.entity;
+
+/**
+ * Description
+ *
+ * @author : hzg
+ * @date : 2024/1/3
+ */
+public class CmClubLabel {
+    private Integer id;
+    /**
+     * 机构Id
+     */
+    private Integer clubId;
+    /**
+     * 关键词
+     */
+    private String label;
+    /**
+     * 页面类型
+     */
+    private Integer pageType;
+    /**
+     * 0：动态标签；1：静态标签
+     */
+    private Integer dynamicStatus;
+    /**
+     * 出现次数
+     */
+    private Integer appearNumber;
+    /**
+     * 添加时间
+     */
+    private String addTime;
+    /**
+     * 删除标记
+     */
+    private Integer delFlag;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getClubId() {
+        return clubId;
+    }
+
+    public void setClubId(Integer clubId) {
+        this.clubId = clubId;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public Integer getPageType() {
+        return pageType;
+    }
+
+    public void setPageType(Integer pageType) {
+        this.pageType = pageType;
+    }
+
+    public Integer getDynamicStatus() {
+        return dynamicStatus;
+    }
+
+    public void setDynamicStatus(Integer dynamicStatus) {
+        this.dynamicStatus = dynamicStatus;
+    }
+
+    public Integer getAppearNumber() {
+        return appearNumber;
+    }
+
+    public void setAppearNumber(Integer appearNumber) {
+        this.appearNumber = appearNumber;
+    }
+
+    public String getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(String addTime) {
+        this.addTime = addTime;
+    }
+
+    public Integer getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Integer delFlag) {
+        this.delFlag = delFlag;
+    }
+}

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

@@ -100,6 +100,10 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private Integer newDeal;//新分配机构状态 0.否，1.是
     private String allocationStartTime; // 开始分配时间
     private String allocationEndTime; // 开始分配时间
+    private String trendsLabel;   // 动态标签
+    private String stateLabel;   // 静态标签
+    private String labelStartTime;  // 需求跨度开始时间
+    private String labelEndTime;    // 需求跨度结束时间
 
     public Date getProviderTime() {
         return providerTime;
@@ -712,4 +716,36 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     public void setAllocationEndTime(String allocationEndTime) {
         this.allocationEndTime = allocationEndTime;
     }
+
+    public String getTrendsLabel() {
+        return trendsLabel;
+    }
+
+    public void setTrendsLabel(String trendsLabel) {
+        this.trendsLabel = trendsLabel;
+    }
+
+    public String getStateLabel() {
+        return stateLabel;
+    }
+
+    public void setStateLabel(String stateLabel) {
+        this.stateLabel = stateLabel;
+    }
+
+    public String getLabelStartTime() {
+        return labelStartTime;
+    }
+
+    public void setLabelStartTime(String labelStartTime) {
+        this.labelStartTime = labelStartTime;
+    }
+
+    public String getLabelEndTime() {
+        return labelEndTime;
+    }
+
+    public void setLabelEndTime(String labelEndTime) {
+        this.labelEndTime = labelEndTime;
+    }
 }

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

@@ -327,6 +327,26 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         return page;
     }
 
+    public List<CmClubLabel> findClubLabel() {
+        List<CmClubLabel> clubLabelList = newCmClubDao.getClubLabel();
+        if (null != clubLabelList && clubLabelList.size() > 0) {
+            clubLabelList.removeIf(cl -> "null".equals(cl.getLabel()) || " ".equals(cl.getLabel()));
+            for (CmClubLabel cmClubLabel : clubLabelList) {
+                if (cmClubLabel.getLabel().endsWith(".") || cmClubLabel.getLabel().endsWith("-") || cmClubLabel.getLabel().endsWith("、")) {
+                    cmClubLabel.setLabel(cmClubLabel.getLabel().substring(0, cmClubLabel.getLabel().length() - 1).trim());
+                }
+            }
+        }
+        return clubLabelList;
+    }
+
+    public Page<ActiveClub> findActiveClubInfo(Page<ActiveClub> page, ActiveClub activeClub) {
+        activeClub.setPage(page);
+        List<ActiveClub> activeClubInfo = newCmClubDao.getActiveClubInfo(activeClub);
+        page.setList(activeClubInfo);
+        return page;
+    }
+
     public List<easyExcel> exportExcel(ClubStatistics statistics) {
         List<easyExcel> statisticsList = newCmClubDao.findExcelList(statistics);
         List<easyExcel> easyExcels = setExData(statisticsList, statistics);

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

@@ -49,6 +49,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户模块重构--机构管理Controller
@@ -157,11 +158,21 @@ public class AgencyController extends BaseController {
         }
 
         Page<NewCmClub> page = newCmClubService.findPage(new Page<NewCmClub>(request, response, 20), newCmClub);
+        // 机构标签
+        List<CmClubLabel> clubLabelList = newCmClubService.findClubLabel();
+        List<CmClubLabel> trendsLabel = new ArrayList<>();
+        List<CmClubLabel> stateLabel = new ArrayList<>();
+        if (null != clubLabelList && clubLabelList.size() > 0) {
+            trendsLabel = clubLabelList.stream().filter( cl -> cl.getDynamicStatus().equals(0)).collect(Collectors.toList());
+            stateLabel = clubLabelList.stream().filter( cl -> cl.getDynamicStatus().equals(1)).collect(Collectors.toList());
+        }
         // 协销下拉
         List<ServiceProviderModel> spNameList = newCmClubDao.spNameList();
         model.addAttribute("newCmClub", newCmClub);
         model.addAttribute("page", page);
         model.addAttribute("spNameList", spNameList);
+        model.addAttribute("trendsLabel", trendsLabel);
+        model.addAttribute("stateLabel", stateLabel);
         return "modules/userNew/cmAgencyList";
     }
 
@@ -2019,8 +2030,13 @@ public class AgencyController extends BaseController {
      * @return
      */
     @RequestMapping("/findActiveClubInfo")
-    public String findActiveClubInfo() {
-
-        return "";
+    public String findActiveClubInfo(ActiveClub activeClub, HttpServletRequest request, HttpServletResponse response, Model model) {
+        Page<ActiveClub> page = newCmClubService.findActiveClubInfo(new Page<>(request, response), activeClub);
+        // 协销下拉
+        List<ServiceProviderModel> spNameList = newCmClubDao.spNameList();
+        model.addAttribute("activeClub", activeClub);
+        model.addAttribute("page", page);
+        model.addAttribute("spNameList", spNameList);
+        return "modules/userNew/activeClubInfoList";
     }
 }

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

@@ -13,6 +13,7 @@ import com.caimei.modules.project.model.ClubModel;
 import com.caimei.modules.project.model.ServiceProviderModel;
 import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.sys.utils.ValidateUtils;
+import com.caimei.modules.user.dao.CmSpDao;
 import com.caimei.modules.user.service.WebChatUserService;
 import com.caimei.modules.user.aop.OperationLogAnnotation;
 import com.caimei.modules.user.dao.NewCmClubDao;
@@ -82,6 +83,8 @@ public class SpController extends BaseController {
     private NewShopOrderDao newShopOrderDao;
     @Resource
     private WebChatUserService webChatUserService;
+    @Resource
+    private CmSpDao cmSpDao;
 
     @ModelAttribute
     public NewCmSp get(@RequestParam(required = false) String id) {
@@ -289,6 +292,23 @@ public class SpController extends BaseController {
     @RequestMapping(value = {"cmSpList", ""})
     public String list(NewCmSp newCmSp, HttpServletRequest request, HttpServletResponse response, Model model) {
         Page<NewCmSp> page = cmSpService.findPage(new Page<NewCmSp>(request, response), newCmSp);
+        page.getList().forEach(s -> {
+            List<Map<String, Object>> spClubActive = cmSpDao.getSpClubActive(s.getServiceProviderID());
+            int loginSum = 0, notLoginSum = 0;
+            for (Map<String, Object> map : spClubActive) {
+                if (map.get("activeStatus").equals(0)) {
+                    loginSum = Integer.parseInt(map.get("number").toString());
+                }
+                if (map.get("activeStatus").equals(1)) {
+                    notLoginSum = Integer.parseInt(map.get("number").toString());
+                }
+            }
+            int sum = MathUtil.add(loginSum, notLoginSum).intValue();
+            s.setLivelyClub(loginSum);
+            s.setNolivelyClub(notLoginSum);
+            s.setLivelyClubProportion(0 == sum ? new BigDecimal(0) : MathUtil.mul(MathUtil.div(loginSum, sum, 2), 100));
+            s.setNolivelyClubProportion(0 == sum ? new BigDecimal(0) : MathUtil.mul(MathUtil.div(notLoginSum, sum, 2), 100));
+        });
         if (CollectionUtils.isEmpty(cmSpService.findSpManager())) {
             model.addAttribute("hasManager", "0");
         } else {

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

@@ -271,5 +271,15 @@
 		left join serviceprovider s on csm.serviceProviderId=s.serviceProviderID
 	</select>
 
+	<select id="getSpClubActive" resultType="java.util.Map">
+		SELECT
+			COUNT(c.clubId) as number,
+			coas.activeStatus as activeStatus
+		FROM serviceprovider s
+				 LEFT JOIN club c ON c.spID = s.serviceProviderID
+				 LEFT JOIN cm_organ_active_system coas ON coas.userId = c.userId
+		WHERE coas.stage = 0  and s.status = 90  and s.serviceProviderID = #{serviceProviderID}
+		GROUP BY coas.activeStatus
+	</select>
 
 </mapper>

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

@@ -106,6 +106,7 @@
         LEFT JOIN (SELECT DISTINCT clubID, checkTime FROM clubchangesprecord WHERE checkStatus = 1 GROUP BY clubID ORDER BY clubChangeSpRecordID DESC )ccs ON ccs.clubId = a.clubId
         LEFT JOIN (SELECT userID, customerValue FROM cm_organ_value_system WHERE stage = 0 AND delType = 1) covs ON a.userID = covs.userID
         LEFT JOIN (SELECT userID, activeState FROM cm_organ_active_system WHERE stage = 0 AND delType = 1) AS coas ON coas.userID = a.userID
+        left join (select clubId, label, dynamicStatus, addTime from cm_club_label) ccl on ccl.clubId = a.clubId
         <where>
             (u.userOrganizeID IN(0,1) or u.clubStatus != 92) and u.userOrganizeID != 4 AND u.userIdentity != 8
             <if test="clubID != null and clubID != ''">
@@ -161,6 +162,18 @@
                 AND (ccs.checkTime <![CDATA[ <= ]]> #{allocationEndTime}
                 OR cpr.createTime <![CDATA[ <= ]]> #{allocationEndTime})
             </if>
+            <if test="trendsLabel != null and trendsLabel != ''">
+                AND ccl.label like concat('%', #{trendsLabel}, '%')
+            </if>
+            <if test="stateLabel != null and stateLabel != ''">
+                AND ccl.label like concat('%', #{trendsLabel}, '%')
+            </if>
+            <if test="labelStartTime != null and labelStartTime != ''">
+                AND ccl.addTime <![CDATA[ >= ]]> #{labelStartTime}
+            </if>
+            <if test="labelEndTime != null and labelEndTime != ''">
+                AND ccl.addTime <![CDATA[ <= ]]> #{labelEndTime})
+            </if>
             <if test="startLoginTime != null and startLoginTime != ''">
                 AND (u.loginTime >= DATE_SUB(CURRENT_DATE, INTERVAL 6 MONTH) OR a.clubId in (select a.clubId
                 FROM ((
@@ -249,6 +262,10 @@
           AND STATUS = 90
     </select>
 
+    <select id="getClubLabel" resultType="com.caimei.modules.user.entity.CmClubLabel">
+        SELECT label, dynamicStatus FROM  cm_club_label
+    </select>
+
     <select id="findAllList" resultType="NewCmClub">
         SELECT
         <include refid="newCmClubColumns"/>
@@ -1423,11 +1440,12 @@
         c.linkManIdentity,
         c.address,
         u.userIdentity,
+        u.registerTime,
         c.sname,
         c.info,
-        d.name AS "province",
-        c.name AS "city",
-        b.name AS  "town",
+        d.name AS province,
+        c.name AS city,
+        b.name AS  town,
         (CASE WHEN c.linkManIdentity=1 THEN '老板'
         WHEN c.linkManIdentity=2 THEN '采购'
         WHEN c.linkManIdentity=3 THEN '运营'
@@ -1472,6 +1490,12 @@
         LEFT JOIN (SELECT userId, MAX(orderTime) AS orderTime FROM cm_shop_order  GROUP BY userId) cso ON cso.userId = c.userId
         <where>
             coas.stage = 0
+            <if test="activeStatus == 0">
+                and coas.activeStatus = 0
+            </if>
+            <if test="activeStatus == 1">
+                and coas.activeStatus = 1
+            </if>
             <if test="clubID != null and clubID != ''">
                 AND c.clubID = #{clubID}
             </if>
@@ -1490,6 +1514,9 @@
             <if test="firstClubType != null and firstClubType != ''">
                 AND c.firstClubType = #{firstClubType}
             </if>
+            <if test="linkManIdentity != null and linkManIdentity != ''">
+                AND c.linkManIdentity = #{linkManIdentity}
+            </if>
             <if test="userIdentity != null and userIdentity != ''">
                 AND u.userIdentity = #{userIdentity}
             </if>
@@ -1518,6 +1545,11 @@
                 AND cso.orderTime <![CDATA[ <= ]]> #{orderEndTime}
             </if>
         </where>
-        ORDER BY cb.accessTime DESC
+        <if test="orderByType == null or orderByType == 1">
+            ORDER BY cb.accessTime DESC
+        </if>
+        <if test="orderByType == 2">
+            ORDER BY cb.accessTime asc
+        </if>
     </select>
 </mapper>

src/main/webapp/WEB-INF/views/modules/serviceteam/cmServiceteamRoleForm.jsp

@@ -86,7 +86,7 @@
     </shiro:hasPermission>
     <li><a href="${ctx}/serviceteam/cmServiceteamRole/">协销小组</a></li>
     <li><a href="${ctx}/new/user/cmSp/leader/">协销总管理员</a></li>
-    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+<%--    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
 
     <li class="active"><a
             href="${ctx}/serviceteam/cmServiceteamRole/form?teamId=${cmServiceteamRole.teamId}">协销小组${not empty cmServiceteamRole.teamId?'编辑':'添加'}</a>

src/main/webapp/WEB-INF/views/modules/user/clubTemporaryList.jsp

@@ -24,7 +24,7 @@
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/new/user/agency/clubSales">机构-协销列表</a></li>
 	<li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
-	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+<%--	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
 	<li class="active"><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
 	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 </ul>

src/main/webapp/WEB-INF/views/modules/user/cmDistributionClubList.jsp

@@ -104,7 +104,7 @@
 	<li ><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
 	<li><a href="${ctx}/new/user/agency/statisticsList">机构分析统计列表</a></li>
 	<li><a href="${ctx}/new/user/agency/cmSpClubTrackList">新分配机构跟踪管理</a></li>
-	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+<%--	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
 	<li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
 	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 	<li class="active"><a href="${ctx}/new/user/agency/distributionCLubList">分销系统机构列表</a></li>

src/main/webapp/WEB-INF/views/modules/user/cmOperationalLogs.jsp

@@ -30,7 +30,7 @@
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/new/user/agency/clubSales">机构-协销列表</a></li>
     <li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
-    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+<%--    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
     <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
     <li class="active"><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 </ul>

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

@@ -49,58 +49,64 @@
         /*#items{border-bottom: #0d0d0d 1px dashed}*/
         .viewDiv{position: relative; margin: 0 auto;margin-top: 10px; width: 100%; height: 1px; background-color: #d4d4d4; text-align: center; font-size: 16px; color: rgba(101, 101, 101, 1);}
         .autoView{position: absolute; left: 90%; background-color: #ffffff;margin-left: 100px; padding: 0 15px; transform: translateX(-30%) translateY(-30%);}
+        #activeClub { width: 100%; height: 50px; display: flex;  align-items: center; }
+        #activeClub > li {float: left; text-align: center; margin-left: 15px; font-size: 15px; list-style-type: none;}
+        .redAddClass {color: red; border-bottom: red 5px solid;}
     </style>
     <link href="${ctxStatic}/modules/cmAgencyStatisticsList/cmAgencyStatisticsList.css" rel="stylesheet">
 </head>
 <body>
 <ul class="nav nav-tabs">
     <li><a href="${ctx}/new/user/agency/clubSales">机构-协销列表</a></li>
-    <li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
-    <li class="active"><a href="${ctx}/new/user/agency/statisticsList">机构分析统计列表</a></li>
-    <li><a href="${ctx}/new/user/agency/cmSpClubTrackList">新分配机构跟踪管理</a></li>
-    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
-    <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
-    <li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
+    <li class="active"><a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=1&activeStatus=0">机构分析统计列表</a></li>
 </ul>
-<form:form id="searchForm" modelAttribute="statistics" action="${ctx}/new/user/agency/statisticsList" method="post"
+<form:form id="searchForm" modelAttribute="activeClub" action="${ctx}/new/user/agency/findActiveClubInfo" method="post"
            class="breadcrumb form-search">
     <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-    <input id="payTotalMonthType" name="payTotalMonthType" type="hidden" value="${statistics.payTotalMonthType}"/>
-    <input id="orderCountMonthType" name="orderCountMonthType" type="hidden" value="${statistics.orderCountMonthType}"/>
-    <input id="payTotalYearType" name="payTotalYearType" type="hidden" value="${statistics.payTotalYearType}"/>
-    <input id="orderCountYearType" name="orderCountYearType" type="hidden" value="${statistics.orderCountYearType}"/>
-    <input id="payTotalType" name="payTotalType" type="hidden" value="${statistics.payTotalType}"/>
+    <input id="userID" name="payTotalMonthType" type="hidden" value="${activeClub.userID}"/>
+    <input id="orderByType" name="orderByType" type="hidden" value="${activeClub.orderByType}"/>
+    <input id="activeStatus" name="activeStatus" type="hidden" value="${activeClub.activeStatus}"/>
     <div class="flex-wrap">
         <div id="items" class="flex-wrap">
             <div class="item">
-                <label>注册时间：</label>
-                <form:input path="registerStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${registerStartTime}"
-                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-                -
-                <form:input path="registerEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${registerEndTime}"
-                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+                <label>机构ID：</label>
+                <form:input path="clubID" type="text" onkeyup="this.value=value.replace(/[^\d]/g,'')" htmlEscape="false"
+                            maxlength="50" class="input-medium"/>
             </div>
             <div class="item">
-                <label>最近下单时间：</label>
-                <form:input path="searchStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${searchStartTime}"
-                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-                -
-                <form:input path="searchEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${searchEndTime}"
-                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+                <label>机构名称：</label>
+                <form:input path="name" htmlEscape="false" maxlength="50" class="input-medium"/>
+            </div>
+            <div class="item">
+                <label>联系人：</label>
+                <form:input path="linkMan" htmlEscape="false" maxlength="50" class="input-medium"/>
+            </div>
+            <div class="item">
+                <label>手机号：</label>
+                <form:input path="contractMobile" htmlEscape="false" maxlength="50" class="input-medium"/>
+            </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">
+                <label class="control-label">机构类型：</label>
+                <form:select path="firstClubType" class="input-medium">
+                    <form:option value="" label="请选择"/>
+                    <form:option value="1" label="医美"/>
+                    <form:option value="2" label="生美"/>
+                    <form:option value="3" label="项目公司"/>
+                    <form:option value="4" label="个人"/>
+                    <form:option value="0" label="其他"/>
+                </form:select>
             </div>
-            <label class="control-label">机构类型：</label>
-            <form:select path="customerValue" class="input-medium">
-                <form:option value="" label="请选择"/>
-                <form:option value="1" label="医美"/>
-                <form:option value="2" label="生美"/>
-                <form:option value="3" label="项目公司"/>
-                <form:option value="4" label="个人"/>
-                <form:option value="0" label="其他"/>
-            </form:select>
             <div class="item">
                 <label>机构级别：</label>
-                <form:select path="searchUserIdentity" class="input-medium">
+                <form:select path="userIdentity" class="input-medium">
                     <form:option value="" label="请选择"/>
                     <form:option value="4" label="个人机构"/>
                     <form:option value="2" label="资质机构"/>
@@ -109,61 +115,68 @@
             </div>
             <div class="item">
                 <label> 状态：</label>
-                <form:select path="searchStatus" class="input-medium">
+                <form:select path="clubStatus" class="input-medium">
                     <form:option value="" label="请选择"/>
                     <form:options items="${fns:getDictList('club_status')}" itemLabel="label" itemValue="value"
                                   htmlEscape="false"/>
                 </form:select>
             </div>
-            <label class="control-label">联系人身份：</label>
-            <form:select path="linkManIdentity" class="input-medium">
-                <form:option value="" label="请选择"/>
-                <form:option value="1" label="老板"/>
-                <form:option value="2" label="采购"/>
-                <form:option value="3" label="运营"/>
-                <form:option value="4" label="其他"/>
-            </form:select>
-        <div class="viewDiv">
-            <input id="btnSubmit" class="btn autoView btn-primary" type="button" value="查询"/>
-            <input id="export" class="btn autoView btn-primary" type="button" value="导出"/>
-        </div><br/>
-        <div class="flex-wrap">
-            <label class="control-label">近一个月购买额：</label>
-            <form:select id="payTotalMonth" path="payTotalMonth" class="input-medium">
-                <form:option value="" label="请选择"/>
-                <form:option value="1" label="小于1万"/>
-                <form:option value="2" label="1万至10万"/>
-                <form:option value="3" label="10万至100万"/>
-                <form:option value="4" label="大于100万"/>
-            </form:select>
-            <label class="control-label">近一年购买额：</label>
-            <form:select id ="payTotalYear" path="payTotalYear" class="input-medium">
-                <form:option value="" label="请选择"/>
-                <form:option value="1" label="小于1万"/>
-                <form:option value="2" label="1万至10万"/>
-                <form:option value="3" label="10万至100万"/>
-                <form:option value="4" label="大于100万"/>
-            </form:select>
             <div class="item">
-                <label>自定义统计时间：</label>
-                <form:input id="customStartTime" path="customStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${customStartTime}"
+                <label class="control-label">联系人身份：</label>
+                <form:select path="linkManIdentity" class="input-medium">
+                    <form:option value="" label="请选择"/>
+                    <form:option value="1" label="老板"/>
+                    <form:option value="2" label="采购"/>
+                    <form:option value="3" label="运营"/>
+                    <form:option value="4" label="其他"/>
+                </form:select>
+            </div>
+            <div class="item">
+                <label>注册时间：</label>
+                <form:input path="registerStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${registerStartTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+                -
+                <form:input path="registerEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${registerEndTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            </div>
+            <div class="item">
+                <label>最近访问时间：</label>
+                <form:input path="behaviorStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${behaviorStartTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+                -
+                <form:input path="behaviorEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${behaviorEndTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            </div>
+            <div class="item">
+                <label>最近咨询时间：</label>
+                <form:input path="recentlyStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${recentlyStartTime}"
                             onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
                 -
-                <form:input id="customEndTime" path="customEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${customEndTime}"
+                <form:input path="recentlyEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${recentlyEndTime}"
                             onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
             </div>
-            <label class="control-label">总购买额：</label>
-            <form:select id="payTotal" path="payTotal" class="input-medium">
-                <form:option value="" label="请选择"/>
-                <form:option value="1" label="小于1万"/>
-                <form:option value="2" label="1万至10万"/>
-                <form:option value="3" label="10万至100万"/>
-                <form:option value="4" label="大于100万"/>
-            </form:select>
+            <div class="item">
+                <label>最近下单时间：</label>
+                <form:input path="orderStartTime" type="text" maxlength="20" class="input-mini Wdate" value="${orderStartTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+                -
+                <form:input path="orderEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${orderEndTime}"
+                            onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            </div>
+            <div class="item">
+                <input id="btnSubmit" class="btn btn-primary" type="button" value="查询"/>
+                <input id="export" class="btn btn-primary" type="button" value="导出"/>
+            </div>
         </div>
     </div>
 </form:form>
 <sys:message content="${message}"/>
+<div>
+    <ul id="activeClub">
+        <li class="icon-activeClub" value="0">活跃机构</li>
+        <li class="icon-ubActiveClub" value="1">不活跃机构</li>
+    </ul>
+</div>
 <table id="contentTable" class="table table-striped table-bordered table-condensed">
     <thead>
     <tr>
@@ -173,18 +186,19 @@
         <th>联系人身份</th>
         <th>手机号</th>
         <th>协销人员</th>
+        <th>地址</th>
         <th>状态</th>
         <th>机构类型</th>
         <th>机构级别</th>
         <th>注册时间</th>
         <th class="th-sort">
-            近一个月订单数
+            最近访问时间
             <div class="sort sort-button" id="sort-button1">
-                <a href="${ctx}/new/user/agency/statisticsList?orderByType=0" class="icon icon-up"></a>
-                <a href="${ctx}/new/user/agency/statisticsList?orderByType=1" class="icon icon-down"></a>
+                <a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=1" class="icon icon-up"></a>
+                <a href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=2" class="icon icon-down"></a>
             </div>
         </th>
-        <th>最常搜索词</th>
+        <th>最近咨询时间</th>
         <th>最近下单时间</th>
         <th>操作</th>
     </tr>
@@ -213,6 +227,17 @@
             <td>
                     ${clubList.spName}
             </td>
+            <td>
+                <c:if test="${not empty clubList.province}">
+                    ${clubList.province}
+                </c:if>
+                <c:if test="${not empty clubList.city}">
+                    ${clubList.city}
+                </c:if>
+                <c:if test="${empty clubList.province and empty clubList.city}">
+                    ---
+                </c:if>
+            </td>
             <td>${clubList.clubStatus}</td>
             <td>
                 <c:if test="${clubList.firstClubType != null || clubList.firstClubType != ''}">
@@ -240,30 +265,44 @@
                 </c:if>
             </td>
             <td>
-                <c:if test="${clubList.addTime != null || clubList.addTime != '' || clubList.addTime ne null}">
-                    ${clubList.addTime}
+                <c:if test="${clubList.registerTime ne null}">
+                    ${clubList.registerTime}
                     <%--<fmt:formatDate value="${clubList.addTime}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate>--%>
                 </c:if>
-                <c:if test="${clubList.addTime == null || clubList.addTime == '' || clubList.addTime eq null}">
+                <c:if test="${clubList.registerTime eq null}">
+                    ---
+                </c:if>
+            </td>
+            <td>
+                <c:if test="${clubList.behaviorTime ne null}">
+                    ${clubList.behaviorTime}
+                </c:if>
+                <c:if test="${clubList.behaviorTime eq null}">
                     ---
                 </c:if>
             </td>
-            <td class="td-none">${clubList.orderCountMonth}</td>
-            <td class="td-none">${clubList.orderCountYear}</td>
-            <td class="td-none">${clubList.payTotalMonth}</td>
-            <td class="td-none">${clubList.payTotalYear}</td>
-            <td class="td-none">${clubList.payTotal}</td>
-            <td class="td-none">
-                <c:if test="${clubList.pageLabel ne null}">
-                    ${clubList.pageLabel}
+            <td>
+                <c:if test="${clubList.recentlyTime ne null}">
+                    ${clubList.recentlyTime}
+                </c:if>
+                <c:if test="${clubList.recentlyTime eq null}">
+                    ---
+                </c:if>
+            </td>
+            <td>
+                <c:if test="${clubList.lastOrderTime ne null}">
+                    ${clubList.lastOrderTime}
                 </c:if>
-                <c:if test="${clubList.pageLabel eq null}">
+                <c:if test="${clubList.lastOrderTime eq null}">
                     ---
                 </c:if>
             </td>
-            <td class="td-none">${clubList.lastOrderTime}</td>
             <td>
-                <a href="${ctx}/new/user/agency/clubPortrait?clubID=${clubList.clubID}&clubName=${clubList.name}&dateType=0&type=4">查看详情</a>
+                <a href="${ctx}/new/user/agency/clubPortrait?clubID=${clubList.clubID}&clubName=${clubList.name}&dateType=0&type=4">机构画像</a>
+                <a href="javascript: void(0);"
+                   onclick="goNewBack(1, '${clubList.addTime}', ${clubList.userIdentity}, '${clubList.name}', '${clubList.linkMan}','${clubList.clubID}')">访问记录</a>
+                <a href="javascript: void(0);"
+                   onclick="goNewBack(2, '${clubList.addTime}', ${clubList.userIdentity}, '${clubList.name}', '${clubList.linkMan}','${clubList.clubID}')">咨询记录</a>
             </td>
         </tr>
     </c:forEach>
@@ -277,15 +316,98 @@
         $('#searchForm').submit();
         return false;
     }
+    // 活跃、不活跃查询
+    $('#activeClub > li').click(function () {
+        console.log($(this).val());
+        const activeStatus = $(this).val() * 1;
+        $('#activeStatus').val(activeStatus);
+        console.log('---------', $('#activeStatus').val());
+        if (activeStatus === 0) {
+            // 活跃机构
+            $('.icon-activeClub').attr("class", "redAddClass")
+        } else {
+            // 不活跃机构
+            $('.icon-ubActiveClub').attr("class", "redAddClass")
+        }
+        $('#searchForm').submit();
+    })
+
+    function goNewBack(type, addTime, userIdentity, name, linkMan, clubId) {
+        // 跳转到新后台查询数据 type: 1 访问记录 2：咨询记录
+        const date = getZeroTimeToday();
+        console.log(date)
+        const addDateTime = stringToDate(addTime.toString());
+        console.log('addDateTime----', addDateTime);
+        if (type === 1) {
+            // 若是今天以前注册的机构，点击访问记录，跳转到新后台【用户行为记录】-【过往数据】页面，
+            // 页面展示以公司名称（个人机构以联系人当公司名称）筛选后的结果；
+            // 若是今天注册的机构，点击访问记录，跳转到新后台【用户行为记录】-【今日数据】页面，
+            // 页面展示以公司名称（个人机构以联系人当公司名称）筛选后的结果。
+            if (addDateTime < date) {
+                // 过往数据
+                if (userIdentity === 4) {
+                    $.get("${ctx}/jump/link", function (data) {
+                        link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName=" + linkMan + "&clubId=" + clubId + "&token=" + data;
+                        window.open(link, "_blank");
+                    });
+                } else {
+                    $.get("${ctx}/jump/link", function (data) {
+                        link = "https://manager.caimei365.com/#/user/record-list?type=second&corporateName=" + name + "&clubId=" + clubId + "&token=" + data;
+                        window.open(link, "_blank");
+                    });
+                }
+            } else {
+                // 今日数据
+                if (userIdentity === 4) {
+                    $.get("${ctx}/jump/link", function (data) {
+                        link = "https://manager.caimei365.com/#/user/record-list?type=first&corporateName=" + linkMan + "&clubId=" + clubId + "&token=" + data;
+                        window.open(link, "_blank");
+                    });
+                } else {
+                    $.get("${ctx}/jump/link", function (data) {
+                        link = "https://manager.caimei365.com/#/user/record-list?type=first&corporateName=" + name + "&clubId=" + clubId + "&token=" + data;
+                        window.open(link, "_blank");
+                    });
+                }
+
+            }
+        } else {
+            // 点击咨询记录，跳转到新后台【用户咨询记录汇总】页面，页面展示以机构名称筛选后的结果
+            if (userIdentity === 4) {
+                $.get("${ctx}/jump/link", function (data) {
+                    link = "https://manager.caimei365.com/#/user/consult/list?clubName=" + linkMan + "&clubId=" + clubId + "&token=" + data;
+                    window.open(link, "_blank");
+                });
+            } else {
+                $.get("${ctx}/jump/link", function (data) {
+                    link = "https://manager.caimei365.com/#/user/consult/list?clubName=" + name + "&clubId=" + clubId + "&token=" + data;
+                    window.open(link, "_blank");
+                });
+            }
+
+        }
+    }
+
     $(function () {
+        console.log('$("#orderByType").val()', $("#orderByType").val());
+        console.log('$("#activeStatus").val()', $("#activeStatus").val());
+        console.log('----****-----', $('#activeStatus').val());
+        const activeStatus = $('#activeStatus').val() * 1;
+        if (activeStatus === 0) {
+            // 活跃机构
+            $('.icon-activeClub').attr("class", "redAddClass")
+        } else {
+            // 不活跃机构
+            $('.icon-ubActiveClub').attr("class", "redAddClass")
+        }
         const typeMap = {
             1: {
-                val: $("#orderCountMonthType").val() ? $("#orderCountMonthType").val() * 1 : null,
+                val: $("#orderByType").val() ? $("#orderByType").val() * 1 : null,
                 dom: $('#sort-button1')
             },
             2: {
-                val: $("#orderCountYearType").val() ? $("#orderCountYearType").val() * 1 : null,
-                dom: $('#sort-button2')
+                val: $("#activeStatus").val() ? $("#activeStatus").val() * 1 : null,
+                dom: $('#activeClub')
             }
         }
         const setActiveFn = function (type,num){
@@ -295,24 +417,23 @@
                 typeMap[num].dom.find('.icon-down').addClass('active');
             }
         }
+        const setActiveClub = function (type,num){
+            if( type === 0){
+                console.log('***************');
+                typeMap[num].dom.find('.icon-activeClub').addClass('active').addClass('redAddClss');
+            }else{
+                typeMap[num].dom.find('.icon-unActiveClub').addClass('active').addClass('redAddClss');
+            }
+        }
         // 最近访问时间 1 降序  2 升序
         if(typeMap[1].val || typeMap[1].val === 0) {
             setActiveFn(typeMap[1].val,1)
         }
-        // 最近访问时间  1 降序  2 升序
+        // 活跃、不活跃机构
         if(typeMap[2].val || typeMap[2].val === 0) {
-            setActiveFn(typeMap[2].val,2)
+            setActiveClub(typeMap[2].val,2)
         }
-        $("#export").click(function () {
-            var formData = $('#searchForm').serialize()
-            window.location.href= "${ctx}/new/user/agency/club/export?"+formData
-        })
         $('#btnSubmit').click(function () {
-            const payTotalMonth = $('#payTotalMonth').val();
-            const payTotalYear = $('#payTotalYear').val();
-            const customStartTime = $('#customStartTime').val();
-            const customEndTime = $('#customEndTime').val();
-            const payTotal = $('#payTotal').val();
             $('#searchForm').submit();
         })
     })

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

@@ -269,7 +269,7 @@
     <li class="active"><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
     <li><a href="${ctx}/new/user/agency/statisticsList">机构分析统计列表</a></li>
     <li><a href="${ctx}/new/user/agency/cmSpClubTrackList">新分配机构跟踪管理</a></li>
-    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+<%--    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
     <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
     <li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
     <li><a href="${ctx}/new/user/agency/distributionCLubList">分销系统机构列表</a></li>
@@ -371,6 +371,29 @@
             <form:input path="allocationEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${endTime}"
                         onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
         </div>
+        <div class="item">
+            <label>动态标签：</label>
+            <form:select path="trendsLabel" class="input-medium">
+                <form:option value="" label="全部"/>
+                <form:options items="${trendsLabel}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+            </form:select>
+        </div>
+        <div class="item">
+            <label>静态标签：</label>
+            <form:select path="stateLabel" class="input-medium">
+                <form:option value="" label="全部"/>
+                <form:options items="${stateLabel}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+            </form:select>
+        </div>
+        <div class="item">
+            <label>需求跨度：</label>
+            <form:input path="labelStartTime" type="text" maxlength="20" class="input-mini Wdate"
+                        value="${labelStartTime}"
+                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            -
+            <form:input path="labelEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${labelEndTime}"
+                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+        </div>
         <div class="item">
             <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         </div>

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

@@ -58,7 +58,7 @@
     <li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
     <li class="active"><a href="${ctx}/new/user/agency/statisticsList">机构分析统计列表</a></li>
     <li><a href="${ctx}/new/user/agency/cmSpClubTrackList">新分配机构跟踪管理</a></li>
-    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+<%--    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
     <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
     <li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 </ul>

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

@@ -20,7 +20,7 @@
     <li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
     <li><a href="${ctx}/new/user/agency/statisticsList">机构分析统计列表</a></li>
     <li><a href="${ctx}/new/user/agency/cmSpClubTrackList">新分配机构跟踪管理</a></li>
-    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+<%--    <li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
     <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
     <li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
     <li><a href="${ctx}/new/user/agency/distributionCLubList">分销系统机构列表</a></li>
@@ -106,7 +106,7 @@
         <div class="flex-box clubProportion">
             <div class="box-title">
                 <H4 class="H_tag">机构活跃占比</H4>
-                <a id="clubActiceDetails" href="javaScript: void(0)">详情></a>
+                <a id="clubActiceDetails" href="${ctx}/new/user/agency/findActiveClubInfo?orderByType=1&activeStatus=0">详情></a>
             </div>
             <div class="box-eachts">
                 <div class="eachts-data" id="clubProportion" style="">

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

@@ -106,7 +106,7 @@
 	<li><a href="${ctx}/new/user/agency/list">机构基本资料列表</a></li>
 	<li><a href="${ctx}/new/user/agency/statisticsList">机构分析统计列表</a></li>
 	<li class="active"><a href="${ctx}/new/user/agency/cmSpClubTrackList">新分配机构跟踪管理</a></li>
-	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+<%--	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
 	<li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
 	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 </ul>

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

@@ -72,6 +72,10 @@
 				<th>类型</th>
 				<%--<th>身份</th>--%>
 				<th>创建时间</th>
+				<th>活跃机构</th>
+				<th>不活跃机构</th>
+				<th>活跃机构占比</th>
+				<th>不活跃机构占比</th>
 				<shiro:hasPermission name="user:newCmClub:edit"><th>操作</th></shiro:hasPermission>
 			</tr>
 		</thead>
@@ -100,6 +104,10 @@
 				</td>
 				<%--<td>${newCmSp.spIdentity}</td>--%>
 				<td>${newCmSp.addTime}</td>
+				<td>${newCmSp.livelyClub}</td>
+				<td>${newCmSp.nolivelyClub}</td>
+				<td>${newCmSp.livelyClubProportion}%</td>
+				<td>${newCmSp.nolivelyClubProportion}%</td>
 				<shiro:hasPermission name="user:newCmClub:edit">
 					<td>
 					<c:if test="${newCmSp.status eq 90 || newCmSp.status eq 91}">
@@ -110,11 +118,14 @@
                             <a href="${ctx}/new/user/cmSp/cmSpOnLine?id=${newCmSp.serviceProviderID}" onclick="return confirmx('确定上线该协销人员吗？', this.href)">上线</a>
                         </c:if>
 						<a href="javascript:void(0);" onclick="updatePwd(${newCmSp.serviceProviderID})">重置密码</a>
-						<a href="javascript:void(0);" onclick="sendMsg(${newCmSp.serviceProviderID})">发送消息</a>
+						<%--<a href="javascript:void(0);" onclick="sendMsg(${newCmSp.serviceProviderID})">发送消息</a>--%>
 						<a href="${ctx}/new/user/cmSp/cmSpEdit?id=${newCmSp.serviceProviderID}">编辑</a>
 						<%--<shiro:hasPermission name="user:newCmClub:delete">
 						<a href="${ctx}/new/user/cmSp/cmSpDelete?id=${newCmSp.serviceProviderID}" onclick="return confirmx('确认要删除该协销人员吗？', this.href)">删除</a>
 						</shiro:hasPermission>--%>
+						<c:if test="${newCmSp.status eq 90}">
+						<a href="${ctx}/new/user/cmSp/cmSpLivelyClubFrom?spID=${newCmSp.serviceProviderID}">机构详情</a>
+						</c:if>
 					</c:if>
 					<c:if test="${newCmSp.status eq 1 || newCmSp.status eq 92}">
 						<a href="javascript:void(0);" onclick="audit('${newCmSp.serviceProviderID}','${newCmSp.name}', '${newCmSp.contractMobile}', '${hasManager}')">审核</a>

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

@@ -87,13 +87,14 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-	<li><a href="${ctx}/new/user/cmSp/cmSpList/">协销人员列表</a></li>
+	<%--<li><a href="${ctx}/new/user/cmSp/cmSpList/">协销人员列表</a></li>
 	<shiro:hasPermission name="user:newCmClub:edit">
 		<li><a href="${ctx}/new/user/cmSp/cmSpForm">添加协销人员</a></li>
 	</shiro:hasPermission>
 	<li><a href="${ctx}/serviceteam/cmServiceteamRole/">协销小组</a></li>
 	<li><a href="${ctx}/new/user/cmSp/leader/">协销总管理员</a></li>
-	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+	<li><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
+	<li><a href="${ctx}/new/user/cmSp/cmSpList/">协销人员列表</a></li>
 	<li class="active"><a href="${ctx}/new/user/cmSp/cmSpLivelyClubFrom?spID=${spId}">查看详情</a></li>
 </ul>
 

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

@@ -53,7 +53,7 @@
 	<li><a href="${ctx}/new/user/agency/">机构基本资料列表</a></li>
 	<li><a href="${ctx}/new/user/agency/statisticsList">机构分析统计列表</a></li>
 	<li><a href="${ctx}/new/user/agency/cmSpClubTrackList">新分配机构跟踪管理</a></li>
-	<li class="active"><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>
+<%--	<li class="active"><a href="${ctx}/new/user/cmSp/cmSpLivelyClubList/">机构活跃分析</a></li>--%>
 	<li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
 	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 	<li><a href="${ctx}/new/user/agency/distributionCLubList">分销系统机构列表</a></li>