机构分析统计

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -248,8 +248,9 @@ public class ProductNewController extends BaseController {
         model.addAttribute("brandList", brandList);
         model.addAttribute("classify", classify);
         model.addAttribute("page", page);
+        model.addAttribute("product",product);
         //搜索条件保存
-        model.addAttribute("searchShopName", product.getShopName());
+        /*model.addAttribute("searchShopName", product.getShopName());
         model.addAttribute("searchName", product.getName());
         model.addAttribute("searchShopID", product.getShopID());
         model.addAttribute("searchCommodityType", ("".equals(product.getCommodityType()) || product.getCommodityType() == null) ? product.getCommodityType() : Integer.parseInt(product.getCommodityType()));
@@ -261,16 +262,12 @@ public class ProductNewController extends BaseController {
         model.addAttribute("searchBrandID", product.getBrandID());
         model.addAttribute("searchPreferredFlag", product.getPreferredFlag());
         model.addAttribute("searchProductCategory", product.getProductCategory());
-        model.addAttribute("searchValidFlag", product.getSearchValidFlag());
+        model.addAttribute("searchValidFlag", product.getSearchValidFlag());*/
         if (StringUtils.isNotEmpty(id)) {
             // 单个商品搜索
             model.addAttribute("editFlag", "1");
         }
-        /**
-         * 初始化回显字段
-         */
-        product.setNewProductType(null);
-        product.setNewvalidFlag(null);
+
         if ("1".equals(product.getProductCategory())) {
 
             return "modules/product-new/productList";

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

@@ -88,5 +88,7 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     List<ClubStatistics> selStatisticsList(ClubStatistics statistics);
 
+    List<CmBehaviorRecord> selPageLable();
+
     List<easyExcel> findExcelList(ClubStatistics statistics);
 }

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

@@ -1,5 +1,6 @@
 package com.caimei.modules.user.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.thinkgem.jeesite.common.utils.excel.annotation.ExcelField;
 
@@ -7,24 +8,40 @@ import com.thinkgem.jeesite.common.utils.excel.annotation.ExcelField;
  * @author zzj
  */
 public class easyExcel {
-
+    @ExcelIgnore
     private String firstClubType;  // 机构一级分类
+    @ExcelIgnore
     private String classify;  // 机构二级分类
+    @ExcelIgnore
     private String address;         //详细地址
+    @ExcelIgnore
     private String businessLicenseImage;    //营业执照
+    @ExcelIgnore
     private String userIdentity;    //用户身份
+    @ExcelIgnore
     private String linkManIdentity;    //用户身份
+    @ExcelIgnore
     private String sname;   //机构简称
+    @ExcelIgnore
     private String contractEmail;   //联系邮箱
+    @ExcelIgnore
     private String contractPhone;   //联系电话
+    @ExcelIgnore
     private String fax;     //传真
+    @ExcelIgnore
     private String headpic;     //门头照
+    @ExcelIgnore
     private String socialCreditCode;    //统一社会信用代码 --- 营业执照编号
+    @ExcelIgnore
     private String info;    //公司简介
-    //机构ID
+    @ExcelIgnore
+    private Integer number;    //百分比数值
+    @ExcelIgnore
+    private Integer userID;    //user
+
 
     @ExcelProperty(value = "机构Id",index = 0)
-    private String clubId;
+    private String clubId;  //机构ID
     @ExcelProperty(value = "机构名称",index = 1)
     private String name; //机构名称
     @ExcelProperty(value = "联系人",index = 2)
@@ -163,6 +180,22 @@ public class easyExcel {
         this.info = info;
     }
 
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public Integer getUserID() {
+        return userID;
+    }
+
+    public void setUserID(Integer userID) {
+        this.userID = userID;
+    }
+
     public String getClubId() {
         return clubId;
     }

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

@@ -2,10 +2,8 @@ package com.caimei.modules.user.service;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import com.caimei.modules.bulkpurchase.dao.CmClubDao;
 import com.caimei.modules.consult.entity.type.CmConsulttype;
@@ -238,21 +236,55 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         calendar.setTime(time);
         calendar.add(Calendar.YEAR,-1);
         statistics.setYearStartTime(dateFormat.format(calendar.getTime()));
-        List<ClubStatistics> selStatisticsList = newCmClubDao.selStatisticsList(statistics);
-        setListData(selStatisticsList);
-        page.setList(selStatisticsList);
+        List<ClubStatistics> selStatisticsList = new ArrayList<>();
+        if (StringUtils.isNotBlank(statistics.getClubDataIntegrity())) {
+            ClubStatistics clubData = new ClubStatistics();
+            clubData.setMonthStartTime(statistics.getMonthStartTime());
+            clubData.setMonthEndTime(statistics.getMonthEndTime());
+            clubData.setYearStartTime(statistics.getYearStartTime());
+            clubData.setYearEndTime(statistics.getYearEndTime());
+            clubData.setClubDataIntegrity(statistics.getClubDataIntegrity());
+            selStatisticsList = newCmClubDao.selStatisticsList(clubData);
+        } else {
+            selStatisticsList = newCmClubDao.selStatisticsList(statistics);
+        }
+        List<ClubStatistics> statisticsList = setListData(selStatisticsList, statistics);
+        if (StringUtils.isNotBlank(statistics.getClubDataIntegrity())) {
+            int pageNo = page.getPageNo();
+            int pageSize = page.getPageSize();
+            int number = 0;
+            if (pageNo == 1) {
+                number = 0;
+            } else {
+                number = (pageNo - 1) * pageSize;
+            }
+            List<ClubStatistics> list = new ArrayList<>();
+            for (int i = 0; i <= statisticsList.size()-1 ; i++) {
+                if (i >= number && i < number+pageSize) {
+                    list.add(statisticsList.get(i));
+                }
+            }
+            page.setCount(statisticsList.size());
+            page.setList(list);
+        } else {
+            page.setList(statisticsList);
+        }
         return page;
     }
 
     public List<easyExcel> exportExcel(ClubStatistics statistics) {
         List<easyExcel> statisticsList = newCmClubDao.findExcelList(statistics);
-        setExData(statisticsList);
-        return statisticsList;
+        List<easyExcel> easyExcels = setExData(statisticsList, statistics);
+        return easyExcels;
     }
 
-    public List<easyExcel> setExData(List<easyExcel> selStatisticsList) {
+    public List<easyExcel> setExData(List<easyExcel> selStatisticsList, ClubStatistics statistics) {
         int number = 0;
         String type = "" ;
+        Integer item = 0 ;
+//        List<ClubStatistics> clubStatisticsList = selStatisticsList;
+        List<CmBehaviorRecord> pageLableList = newCmClubDao.selPageLable();
+
         for (easyExcel clubStatistics : selStatisticsList) {
             // 机构类型
             if (StringUtils.isNotBlank(clubStatistics.getFirstClubType())) {
@@ -305,16 +337,43 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
             if (StringUtils.isNotBlank(clubStatistics.getInfo())) {
                 number += 5;
             }
+            clubStatistics.setNumber(number);
             clubStatistics.setClubDataIntegrity(number+"%");
+
             number=0;
             type = "";
+            // 处理最常搜索词
+            List<CmBehaviorRecord> collect = pageLableList.stream().filter(data -> data.getUserID().equals(clubStatistics.getUserID())).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                clubStatistics.setPageLabel(collect.get(0).getPageLabel());
+                item = collect.get(0).getNumber();
+                for (int i = 0; i < collect.size()-1; i++) {
+                    if (item < collect.get(i).getNumber()) {
+                        item = collect.get(i).getNumber();
+                        clubStatistics.setPageLabel(collect.get(i).getPageLabel());
+                    }
+                }
+            }
+        }
+        // 资料完整度处理
+        if (StringUtils.isNotBlank(statistics.getClubDataIntegrity())) {
+            if ("1".equals(statistics.getClubDataIntegrity())) {
+                selStatisticsList = selStatisticsList.stream().filter(data -> (data.getNumber() > 20 && data.getNumber() < 70)).collect(Collectors.toList());
+            } else {
+                selStatisticsList = selStatisticsList.stream().filter(data -> data.getNumber() > 70).collect(Collectors.toList());
+            }
         }
         return selStatisticsList;
+
     }
 
-    public List<ClubStatistics> setListData(List<ClubStatistics> selStatisticsList) {
+    public List<ClubStatistics> setListData(List<ClubStatistics> selStatisticsList, ClubStatistics statistics) {
         int number = 0;
         String type = "" ;
+        Integer item = 0 ;
+//        List<ClubStatistics> clubStatisticsList = selStatisticsList;
+        List<CmBehaviorRecord> pageLableList = newCmClubDao.selPageLable();
+
         for (ClubStatistics clubStatistics : selStatisticsList) {
             // 机构类型
             if (StringUtils.isNotBlank(clubStatistics.getFirstClubType())) {
@@ -367,9 +426,31 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
             if (StringUtils.isNotBlank(clubStatistics.getInfo())) {
                 number += 5;
             }
+            clubStatistics.setNumber(number);
             clubStatistics.setClubDataIntegrity(number+"%");
+
             number=0;
             type = "";
+            // 处理最常搜索词
+            List<CmBehaviorRecord> collect = pageLableList.stream().filter(data -> data.getUserID().equals(clubStatistics.getUserID())).collect(Collectors.toList());
+            if (collect.size() > 0) {
+                clubStatistics.setPageLabel(collect.get(0).getPageLabel());
+                item = collect.get(0).getNumber();
+                for (int i = 0; i < collect.size()-1; i++) {
+                    if (item < collect.get(i).getNumber()) {
+                        item = collect.get(i).getNumber();
+                        clubStatistics.setPageLabel(collect.get(i).getPageLabel());
+                    }
+                }
+            }
+        }
+        // 资料完整度处理
+        if (StringUtils.isNotBlank(statistics.getClubDataIntegrity())) {
+            if ("1".equals(statistics.getClubDataIntegrity())) {
+                selStatisticsList = selStatisticsList.stream().filter(data -> (data.getNumber() > 20 && data.getNumber() < 70)).collect(Collectors.toList());
+            } else {
+                selStatisticsList = selStatisticsList.stream().filter(data -> data.getNumber() > 70).collect(Collectors.toList());
+            }
         }
         return selStatisticsList;
     }

src/main/java/com/caimei/modules/user/web/CmUserBehaviorRecordController.java

@@ -146,6 +146,8 @@ public class CmUserBehaviorRecordController extends BaseController {
         cmClubinfo.setMedicalPracticeLicenseImg(newCmClub.getMedicalPracticeLicenseImg());
         cmClubinfo.setContractEmail(newCmClub.getContractEmail());
         cmClubinfo.setLinkManIdentity(newCmClub.getLinkManIdentity());
+        cmClubinfo.setUserIdentity(newCmClub.getUserIdentity());
+        cmClubinfo.setSvipUserFlag(newCmClub.getSvipUserFlag());
 
         String wwwServer = Global.getConfig("wwwServer");
         //营业执照

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

@@ -385,6 +385,7 @@ public class AgencyController extends BaseController {
         cmClubinfo.setMedicalPracticeLicenseImg(newCmClub.getMedicalPracticeLicenseImg());
         cmClubinfo.setContractEmail(newCmClub.getContractEmail());
         cmClubinfo.setLinkManIdentity(newCmClub.getLinkManIdentity());
+
         model.addAttribute("cmClubinfo", cmClubinfo);
         model.addAttribute("newCmClub", newCmClub);
 
@@ -1424,7 +1425,7 @@ public class AgencyController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/club/export")
     public void easyExcel(ClubStatistics statistics, HttpServletResponse response, RedirectAttributes redirectAttributes) {
-        String name = "club_Data.xlsx";
+        String name = "club_Data";
         try {
 
             List<easyExcel> statisticsList = newCmClubService.exportExcel(statistics);

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

@@ -31,6 +31,9 @@
         (CASE WHEN c.secondClubType=1 THEN '诊所'
               WHEN c.secondClubType=2 THEN '门诊'
               WHEN c.secondClubType=3 THEN '医院'
+              WHEN c.secondClubType=5 THEN '美容院'
+              WHEN c.secondClubType=6 THEN '养生馆'
+              WHEN c.secondClubType=7 THEN '其他'
             END) AS classify,
         c.addTime AS addTime
         FROM club c

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

@@ -758,6 +758,9 @@
         (CASE WHEN c.secondClubType=1 THEN '诊所'
         WHEN c.secondClubType=2 THEN '门诊'
         WHEN c.secondClubType=3 THEN '医院'
+        WHEN c.secondClubType=5 THEN '美容院'
+        WHEN c.secondClubType=6 THEN '养生馆'
+        WHEN c.secondClubType=7 THEN '其他'
         END) AS classify,
         c.addTime AS addTime,
         IF(csu.delFlag = '0' AND NOW() <![CDATA[ < ]]> csu.endTime,1,0) AS svipUserFlag,
@@ -767,7 +770,6 @@
         IFNULL(orderYesr.payTotalYesr,0) AS payTotalYear,
         IFNULL(orderYesr.orderCountYesr,0) AS orderCountYear,
         IFNULL(orderTotal.payTotal,0) AS payTotal,
-        pb.pageLabel,
         MAX(cor.orderTime) AS lastOrderTime
         FROM club c
         LEFT JOIN cm_order cor ON c.userID = cor.userID
@@ -813,13 +815,6 @@
         </where>
         GROUP BY co.userid) AS orderTotal ON c.userId=orderTotal.userId
 
-        LEFT JOIN
-        (
-        SELECT c.userID, COUNT(cbr.pageLabel), cbr.pageLabel
-        FROM cm_behavior_record cbr
-        LEFT JOIN club c ON cbr.userID = c.userID
-        <where> cbr.userID = c.userID</where>
-        GROUP BY cbr.pageLabel) AS pb ON c.userID = pb.userID
         <where>
             <if test="registerStartTime != null and registerStartTime != ''">
                 AND (c.addTime > #{registerStartTime} or c.addTime = #{registerStartTime} )
@@ -836,9 +831,12 @@
             <if test="customerValue != null and customerValue != ''">
                 AND c.firstClubType = #{customerValue}
             </if>
-            <if test="searchUserIdentity != null and searchUserIdentity != ''">
+            <if test="searchUserIdentity != null and searchUserIdentity != '' and searchUserIdentity != '8'.toString()">
                 AND u.userIdentity = #{searchUserIdentity}
             </if>
+            <if test="searchUserIdentity != null and searchUserIdentity != '' and searchUserIdentity == '8'.toString()">
+                AND csu.delFlag = '0' and now() <![CDATA[ < ]]> csu.endTime
+            </if>
             <if test="searchStatus != null and searchStatus != ''">
                 AND c.status = #{searchStatus}
             </if>
@@ -934,6 +932,13 @@
             </if>
         </if>
     </select>
+    <select id="selPageLable" resultType="com.caimei.modules.user.entity.CmBehaviorRecord">
+        SELECT  c.userID, COUNT(pageType) AS number, cbr.pageLabel
+        FROM club c
+        LEFT JOIN cm_behavior_record cbr ON cbr.userID = c.userID
+        WHERE cbr.userID = c.userID AND cbr.pageType in (8,9)
+        GROUP BY  c.userID, cbr.pageLabel
+    </select>
     <select id="findExcelList" resultType="com.caimei.modules.user.entity.easyExcel">
         SELECT
         u.userId,
@@ -973,6 +978,9 @@
         (CASE WHEN c.secondClubType=1 THEN '诊所'
         WHEN c.secondClubType=2 THEN '门诊'
         WHEN c.secondClubType=3 THEN '医院'
+        WHEN c.secondClubType=5 THEN '美容院'
+        WHEN c.secondClubType=6 THEN '养生馆'
+        WHEN c.secondClubType=7 THEN '其他'
         END) AS classify,
         c.addTime AS addTime,
         IF(csu.delFlag = '0' AND NOW() <![CDATA[ < ]]> csu.endTime,1,0) AS svipUserFlag,
@@ -1051,9 +1059,12 @@
             <if test="customerValue != null and customerValue != ''">
                 AND c.firstClubType = #{customerValue}
             </if>
-            <if test="searchUserIdentity != null and searchUserIdentity != ''">
+            <if test="searchUserIdentity != null and searchUserIdentity != '' and searchUserIdentity != '8'.toString()">
                 AND u.userIdentity = #{searchUserIdentity}
             </if>
+            <if test="searchUserIdentity != null and searchUserIdentity != '' and searchUserIdentity == '8'.toString()">
+                AND csu.delFlag = '0' and now() <![CDATA[ < ]]> csu.endTime
+            </if>
             <if test="searchStatus != null and searchStatus != ''">
                 AND c.status = #{searchStatus}
             </if>

src/main/webapp/WEB-INF/views/modules/sys/officeForm.jsp

@@ -27,7 +27,7 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/sys/office/list?id=${office.parent.id}&parentIds=${office.parentIds}">机构列表</a></li>
+		<li><a href="${ctx}/sys/office/list?id=${office.parent.id}&parentIds=${office.parentIds}">机构基本资料列表</a></li>
 		<li class="active"><a href="${ctx}/sys/office/form?id=${office.id}&parent.id=${office.parent.id}">机构<shiro:hasPermission name="sys:office:edit">${not empty office.id?'修改':'添加'}</shiro:hasPermission><shiro:lacksPermission name="sys:office:edit">查看</shiro:lacksPermission></a></li>
 	</ul><br/>
 	<form:form id="inputForm" modelAttribute="office" action="${ctx}/sys/office/save" method="post" class="form-horizontal">
@@ -155,4 +155,4 @@
 		</div>
 	</form:form>
 </body>
-</html>
+</html>

src/main/webapp/WEB-INF/views/modules/sys/officeList.jsp

@@ -29,7 +29,7 @@
 </head>
 <body>
 	<ul class="nav nav-tabs">
-		<li class="active"><a href="${ctx}/sys/office/list?id=${office.id}&parentIds=${office.parentIds}">机构列表</a></li>
+		<li class="active"><a href="${ctx}/sys/office/list?id=${office.id}&parentIds=${office.parentIds}">机构基本资料列表</a></li>
 		<shiro:hasPermission name="sys:office:edit"><li><a href="${ctx}/sys/office/form?parent.id=${office.id}">机构添加</a></li></shiro:hasPermission>
 	</ul>
 	<sys:message content="${message}"/>
@@ -47,9 +47,9 @@
 			<shiro:hasPermission name="sys:office:edit"><td>
 				<a href="${ctx}/sys/office/form?id={{row.id}}">修改</a>
 				<a href="${ctx}/sys/office/delete?id={{row.id}}" onclick="return confirmx('要删除该机构及所有子机构项吗？', this.href)">删除</a>
-				<a href="${ctx}/sys/office/form?parent.id={{row.id}}">添加下级机构</a> 
+				<a href="${ctx}/sys/office/form?parent.id={{row.id}}">添加下级机构</a>
 			</td></shiro:hasPermission>
 		</tr>
 	</script>
 </body>
-</html>
+</html>

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

@@ -4,12 +4,13 @@
 <head>
     <title>机构信息</title>
     <meta name="decorator" content="default"/>
+    <link href="${ctxStatic}/modules/cmClubData/cmClubData.css" rel="stylesheet">
     <script src="/static/modules/bulkpurchase/loadAddressById.js"></script>
     <script type="text/javascript">
 
     </script>
     <style>
-        #auditBox {
+        <%--#auditBox {
             padding: 20px;
             line-height: 30px;
         }
@@ -161,7 +162,7 @@
             text-align: right;
             vertical-align: top;
             margin-top: 10px;
-        }
+        }--%>
     </style>
 </head>
 <body>
@@ -190,250 +191,155 @@
 <form:hidden path="clubInfoID"/>
 <form:hidden path="userID"/>
 <form:hidden path="clubID"/>
-<div style="max-width:1200px;padding:15px;">
-    <table border="0" cellspacing="0" cellpadding="0" width="100%">
-        <tr height="28">
-            <th width="12%">状态：</th>
-            <td width="13%">${fns:getDictLabel(newCmClub.status, 'club_status', newCmClub.status)}</td>
-            <th width="12%">注册时间：</th>
-            <td width="13%"><fmt:formatDate value="${newCmClub.registerTime}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate></td>
-        </tr>
-        <tr height="28">
-            <th width="12%">机构名称：</th>
-            <td width="13%">${newCmClub.name}
-            <th width="12%">机构简称：</th>
-            <td width="13%">${newCmClub.sname}
-            <th width="12%">注册邮箱：</th>
-            <td width="13%">${newCmClub.contractEmail}
-        </tr>
-        <tr height="28">
-            <th width="12%">联系人：</th>
-            <td width="13%">${newCmClub.userName}
-            </td>
-            <th width="12%">手机号：</th>
-            <td width="13%">${newCmClub.bindMobile}
-            <th width="12%">联系人身份：</th>
-            <td width="13%">
-                <c:if test="${newCmClub.linkManIdentity eq '1'}">老板</c:if>
-                <c:if test="${newCmClub.linkManIdentity eq '2'}">采购</c:if>
-                <c:if test="${newCmClub.linkManIdentity eq '3'}">运营</c:if>
-            </td>
-        </tr>
-    </table>
-</div>
+    <div class="main-content">
+        <div class="flex-header">
+            <div class="flex-header-main">
+                <div class="header-main-box">
+                    <c:if test="${newCmClub.name ne null}"><p>机构名称：<span>${newCmClub.name}</span></p></c:if>
+                    <c:if test="${newCmClub.userName ne null}"> <p>联系人：<span>${newCmClub.userName}</span></p></c:if>
+                    <c:if test="${newCmClub.linkManIdentity ne null}">
+                        <p>联系人身份：
+                            <span>
+                                <c:if test="${newCmClub.linkManIdentity eq '1'}">老板</c:if>
+                                <c:if test="${newCmClub.linkManIdentity eq '2'}">采购</c:if>
+                                <c:if test="${newCmClub.linkManIdentity eq '3'}">运营</c:if>
+                                <c:if test="${newCmClub.linkManIdentity ne '1' || newCmClub.linkManIdentity ne '2' || newCmClub.linkManIdentity ne '3'}">其他</c:if>
+                            </span>
+                        </p>
+                    </c:if>
+                    <c:if test="${newCmClub.bindMobile ne null}"><p>手机号：<span>${newCmClub.bindMobile}</span></p></c:if>
+                    <c:if test="${cmClubinfo.firstClubType ne null and cmClubinfo.secondClubType ne null}">
+                        <p>机构类型：
+                            <span>
+                                <c:if test="${cmClubinfo.firstClubType == '1'}">医美</c:if>
+                                <c:if test="${cmClubinfo.firstClubType == '2'}">生美</c:if>
+                                <c:if test="${cmClubinfo.firstClubType == '3'}">项目公司</c:if>
+                                <c:if test="${cmClubinfo.firstClubType == '4'}">个人</c:if>
+                                <c:if test="${cmClubinfo.firstClubType == '5'}">其他</c:if>
 
-<input type="hidden" id="curProvince" name="curProvince" value="${newCmClub.province }" disabled="disabled">
-<input type="hidden" id="curCity" name="curCity" value="${newCmClub.city }" disabled="disabled">
-<input type="hidden" id="curTown" name="curTown" value="${newCmClub.town }" disabled="disabled">
-<sys:message content="${message}"/>
-<hr class="detailLine">
-<div>
-    <table border="0" cellspacing="0" cellpadding="0" width="100%">
-        <tr>
-            <td colspan="2">
-                <div class="control-group">
-                    <label class="control-label"><b>地址：</b></label>
-                    <div class="controls">
-                        <form:select path="provinceID" class="input-xlarge" id="province"
-                                     onchange="loadCity()" disabled="true" style="width:100px;">
-                            <form:option value="" label="省" provinceId=""/>
-                        </form:select>
-                        <form:select path="cityID" class="input-xlarge" id="city" onchange="loadTown()" disabled="true"
-                                     style="width:100px;">
-                            <form:option value="" label="市" cityId=""/>
-                        </form:select>
-                        <form:select path="townID" class="input-xlarge" id="town" disabled="true" style="width:100px;">
-                            <form:option value="" label="区"/>
-                        </form:select>
-                        ${newCmClub.address}
+                                <c:if test="${cmClubinfo.secondClubType eq '1'}"> - 诊所</c:if>
+                                <c:if test="${cmClubinfo.secondClubType eq '2'}"> - 门诊</c:if>
+                                <c:if test="${cmClubinfo.secondClubType eq '3'}"> - 医院</c:if>
+                                <c:if test="${cmClubinfo.secondClubType eq '4'}"> - 其他</c:if>
+                                <c:if test="${cmClubinfo.secondClubType eq '5'}"> - 美容院</c:if>
+                                <c:if test="${cmClubinfo.secondClubType eq '6'}"> - 养生馆</c:if>
+                                <c:if test="${cmClubinfo.secondClubType eq '7'}"> - 其他</c:if>
+                            </span>
+                        </p>
+                    </c:if>
+                    <c:if test="${newCmClub.province ne null and newCmClub.city ne null and newCmClub.town ne null and newCmClub.address ne null}"><p>地址：<span>${newCmClub.province } ${newCmClub.city } ${newCmClub.town } ${newCmClub.address}</span></p></c:if>
+                    <c:if test="${newCmClub.status ne null}"><p>状态：<span>${fns:getDictLabel(newCmClub.status, 'club_status', newCmClub.status)}</span></p></c:if>
+                    <c:if test="${newCmClub.registerTime ne null}"><p>注册时间：<span><fmt:formatDate value="${newCmClub.registerTime}" pattern="yyyy-MM-dd HH:mm:ss"></fmt:formatDate></span></p></c:if>
+                </div>
+                <div class="header-main-box">
+                    <div class="main-box">
+                        <c:if test="${cmClubinfo.userIdentity ne null and cmClubinfo.svipUserFlag ne null}">
+                            <div class="main-box-tp">
+                                <p>机构类别：
+                                    <span>
+                                        <c:if test="${cmClubinfo.userIdentity eq 4}">个人机构</c:if>
+                                        <c:if test="${cmClubinfo.userIdentity eq 2}">资质机构</c:if>
+                                        <c:if test="${cmClubinfo.svipUserFlag eq 1}"><font color="red">(超级会员)</font></c:if>
+                                        <c:if test="${cmClubinfo.userIdentity eq 2 and cmClubinfo.svipUserFlag eq 0}"><font color="red">(普通会员)</font></c:if>
+                                    </span>
+                                </p>
+                            </div>
+                        </c:if>
+                        <c:if test="${cmClubinfo.medicalPracticeLicenseImg ne null}">
+                            <div class="main-box-bt">
+                                <p>医疗许可证：</p>
+                                <a class="main-box-img" target="_blank" href="${cmClubinfo.medicalPracticeLicenseImg}"><img src="${cmClubinfo.medicalPracticeLicenseImg}"/></a>
+                            </div>
+                        </c:if>
+                    </div>
+                    <div class="main-box">
+                        <c:if test="${newCmClub.socialCreditCode ne null}">
+                            <div class="main-box-tp">
+                                <p>营业执照编号：<span>${newCmClub.socialCreditCode}</span></p>
+                            </div>
+                        </c:if>
+                        <c:if test="${newCmClub.businessLicenseImage ne null}">
+                            <div class="main-box-bt">
+                                <p>营业执照：</p>
+                                <a class="main-box-img" target="_blank" href="${newCmClub.businessLicenseImage}"><img src="${newCmClub.businessLicenseImage}"/></a>
+                            </div>
+                        </c:if>
                     </div>
                 </div>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2">
-                <div class="control-group">
-                    <label class="control-label"><b>营业执照编号：</b></label>
-                    <div class="controls">${newCmClub.socialCreditCode}</div>
+            </div>
+        </div>
+        <div class="flex-content">
+            <c:if test="${newCmClub.sname ne null}">
+                <div class="flex-p">
+                    <p>机构简称：<span>${newCmClub.sname}</span></p>
                 </div>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <div class="control-group">
-                    <label class="control-label"><b>营业执照：</b></label>
-                    <img width="100" height="100" src="${newCmClub.businessLicenseImage}">
+            </c:if>
+            <c:if test="${newCmClub.contractEmail ne null}">
+                <div class="flex-p">
+                    <p>注册邮箱：<span>${newCmClub.contractEmail}</span></p>
                 </div>
-            </td>
-            <td>
-                <div class="control-group">
-                    <label class="control-label"><b>门头照：</b></label>
-                    <img width="100" height="100" src="${newCmClub.headpic}">
+            </c:if>
+            <c:if test="${newCmClub.headpic ne null}">
+                <div class="flex-p">
+                    <p>门头照：<span></span></p>
+                    <a class="flex-p-img" target="_blank" href="${newCmClub.headpic}"><img src="${newCmClub.headpic}" alt=""></a>
                 </div>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <div class="control-group">
-                    <label class="control-label" for=""><b>机构类型：</b></label>
-                    <div class="medical-radio the-oradio">
-                        <input value="${cmClubinfo.firstClubType}" class="hide" type="text" id="firstClubType"/>
-                        <div class="med-beauty">
-                            <c:if test="${cmClubinfo.firstClubType == '1'}">医美</c:if>
-                            <c:if test="${cmClubinfo.firstClubType == '2'}">生美</c:if>
-                            <c:if test="${cmClubinfo.firstClubType == '3'}">项目公司</c:if>
-                            <c:if test="${cmClubinfo.firstClubType == '4'}">个人</c:if>
-                            <c:if test="${cmClubinfo.firstClubType == '5'}">其他</c:if>
-
-                            <c:if test="${cmClubinfo.secondClubType eq '1'}"> - 诊所</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '2'}"> - 门诊</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '3'}"> - 医院</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '4'}"> - 其他</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '5'}"> - 美容院</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '6'}"> - 养生馆</c:if>
-                            <c:if test="${cmClubinfo.secondClubType eq '7'}"> - 其他</c:if>
-                        </div>
-                    </div>
-                    <div class="qualification control-group" style="display: none">
-                        <label class="control-label"><b>医疗许可证：</b></label>
-                        <img width="100" height="100" src="${cmClubinfo.medicalPracticeLicenseImg}">
-                    </div>
-                </div>
-                <div class="control-group epart" style="display: none">
-                    <label class="control-label"><b>科室：</b></label>
-                    <input class="reg-input" type="text" name="department" id="Department"
-                           placeholder="请填写您的所经营的科室，用逗号隔开。（至少三个）" value="${cmClubinfo.department}"
-                           style="margin-left: 10px;"/>
-                    <span class="err-tip"></span>
+            </c:if>
+            <c:if test="${cmClubinfo.department ne null}">
+                <div class="flex-p">
+                    <p>科室：<span>${cmClubinfo.department}</span></p>
                 </div>
-                <div class="control-group" >
-                    <label class="control-label"><b>主营内容：</b></label>
-                    <font size="3">${cmClubinfo.mainpro}</font>
+            </c:if>
+            <c:if test="${cmClubinfo.mainpro ne null}">
+                <div class="flex-p">
+                    <p>主营内容：<span>${cmClubinfo.mainpro}</span></p>
                 </div>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <div class="control-group">
-                    <label class="control-label"><b>固定电话：</b></label>
-                    <div class="controls">${cmClubinfo.contractPhone}</div>
+            </c:if>
+            <c:if test="${cmClubinfo.contractPhone ne null}">
+                <div class="flex-p">
+                    <p>固定电话：<span>${cmClubinfo.contractPhone}</span></p>
                 </div>
-            </td>
-            <td>
-                <div class="control-group">
-                    <label class="control-label"><b>传真：</b></label>
-                    <div class="controls">${cmClubinfo.fax}</div>
+            </c:if>
+            <c:if test="${cmClubinfo.fax ne null}">
+                <div class="flex-p">
+                    <p>传真：<span>${cmClubinfo.fax}</span></p>
                 </div>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2">
-                <div class="control-group">
-                    <label class="control-label"><b>员工人数：</b></label>
-                    <div class="controls">${cmClubinfo.empnum}</div>
+            </c:if>
+            <c:if test="${cmClubinfo.empnum ne null}">
+                <div class="flex-p">
+                    <p>员工人数：<span>${cmClubinfo.empnum}</span></p>
                 </div>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2">
-                <div class="control-group">
-                    <label class="control-label"><b>公司简介：</b></label>
-                    <div class="controls">${cmClubinfo.info}</div>
+            </c:if>
+            <c:if test="${cmClubinfo.info ne null}">
+                <div class="flex-p">
+                    <p>公司简介：<span>${cmClubinfo.info}</span></p>
                 </div>
-            </td>
-        </tr>
-    </table>
-    <div>
-        <div class="clubInfo">
-            <div class="clubInfoTitle">基本信息</div>
-            <table border="0" cellspacing="0" cellpadding="0" width="100%">
-                <tr height="28">
-                    <th>机构面积：</th>
-                    <td>${cmClubinfo.area}
-                    </td>
-                </tr>
-                <tr height="28">
-                    <th>美容床数：</th>
-                    <td>${cmClubinfo.bedNums}
-                    </td>
-                </tr>
-                <tr height="28">
-                    <th>美容师数：</th>
-                    <td>${cmClubinfo.beauticians}
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div class="clubInfo">
-            <div class="clubInfoTitle">业绩信息</div>
-            <table border="0" cellspacing="0" cellpadding="0" width="100%">
-                <tr height="28">
-                    <th>月业绩：</th>
-                    <td>${cmClubinfo.monthAchievement}
-                    </td>
-                </tr>
-                <tr height="28">
-                    <th>促销业绩：</th>
-                    <td>${cmClubinfo.promotionAchievement}
-                    </td>
-                </tr>
-                <tr height="28">
-                    <th>年业绩：</th>
-                    <td>${cmClubinfo.yearAchievement}
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div class="clubInfo">
-            <div class="clubInfoTitle">会员信息及消费情况</div>
-            <table border="0" cellspacing="0" cellpadding="0" width="100%">
-                <tr height="28">
-                    <th>A类会员：</th>
-                    <td colspan="3" style="padding-top: 6px;">${cmClubinfo.cateA}人&nbsp;${cmClubinfo.consumeA}元
-                    </td>
-                </tr>
-                <tr height="28">
-                    <th>B类会员：</th>
-                    <td colspan="3" style="padding-top: 6px;">${cmClubinfo.cateB}人&nbsp;${cmClubinfo.consumeB}元
-                    </td>
-                </tr>
-                <tr height="28">
-                    <th>C类会员：</th>
-                    <td colspan="3" style="padding-top: 6px;">${cmClubinfo.cateC}人&nbsp;${cmClubinfo.consumeC}元
-                    </td>
-                </tr>
-            </table>
-        </div>
-        <div class="clubInfo">
-            <div class="clubInfoTitle">活动业绩</div>
-            <table border="0" cellspacing="0" cellpadding="0" width="100%">
-                <tr height="28">
-                    <th>最高业绩：</th>
-                    <td>${cmClubinfo.highestAchievement}
-                    </td>
-                </tr>
-                <tr height="28">
-                    <th>到店人数：</th>
-                    <td>${cmClubinfo.reachPepole}
-                    </td>
-                </tr>
-                <tr height="28">
-                    <th>成交人数：</th>
-                    <td>${cmClubinfo.clinchPepole}
-                    </td>
-                </tr>
-            </table>
+            </c:if>
+            <div style="display: none">
+                <div class="flex-p"><p>基本信息：</p></div>
+                <div class="flex-p"><p>机构面积：<span>${cmClubinfo.area}</span></p></div>
+                <div class="flex-p"><p>美容床数：<span>${cmClubinfo.bedNums}</span></p></div>
+                <div class="flex-p"><p>美容师数：<span>${cmClubinfo.beauticians}</span></p></div>
+                <div class="flex-p"><p>机构面积：<span>${cmClubinfo.area}</span></p></div>
+                <div class="flex-p"><p>机构面积：<span>${cmClubinfo.area}</span></p></div>
+                <div class="flex-p"><p>机构面积：<span>${cmClubinfo.area}</span></p></div>
+                <div class="flex-p"><p>业绩信息：</p></div>
+                <div class="flex-p"><p>月业绩：<span>${cmClubinfo.monthAchievement}</span></p></div>
+                <div class="flex-p"><p>促销业绩：<span>${cmClubinfo.promotionAchievement}</span></p></div>
+                <div class="flex-p"><p>年业绩：<span>${cmClubinfo.yearAchievement}</span></p></div>
+                <div class="flex-p"><p>会员信息及消费情况：</p></div>
+                <div class="flex-p"><p>A类会员：<span>${cmClubinfo.cateA}</span></p></div>
+                <div class="flex-p"><p>B类会员：<span>${cmClubinfo.cateB}</span></p></div>
+                <div class="flex-p"><p>C类会员：<span>${cmClubinfo.cateC}</span></p></div>
+                <div class="flex-p"><p>活动业绩：</p></div>
+                <div class="flex-p"><p>最高业绩：<span>${cmClubinfo.highestAchievement}</span></p></div>
+                <div class="flex-p"><p>到店人数：<span>${cmClubinfo.reachPepole}</span></p></div>
+                <div class="flex-p"><p>成交人数：<span>${cmClubinfo.clinchPepole}</span></p></div>
+                <div class="flex-p"><p>店内所经营品牌及推广优势：<span>${cmClubinfo.brandSuperiority}</span><</p></div>
+                <div class="flex-p"><p>临近一次促销的模式及达成业绩：<span>${cmClubinfo.lastPromotion}</span><</p></div>
+            </div>
+
         </div>
-        <table border="0" cellspacing="0" cellpadding="0" width="100%">
-            <tr height="28">
-                <th>店内所经营品牌及推广优势：</th>
-                <td colspan="10" width="25%">${cmClubinfo.brandSuperiority}
-                </td>
-                <th>临近一次促销的模式及达成业绩：</th>
-                <td colspan="10" width="25%">${cmClubinfo.lastPromotion}
-                </td>
-            </tr>
-        </table>
     </div>
     </form:form>
 </body>

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

@@ -27,7 +27,6 @@
     </c:if>
     <li class="active"><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">查看详情</a></li>
 </ul>
-<br/>
 <form:form id="searchForm" modelAttribute="cmBehaviorRecord" action="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}" 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}"/>

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

@@ -60,7 +60,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><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
     <li class="active"><a href="${ctx}/user/clubTemporary/confirmRecord?id=${clubTemporary.id}">确认记录</a></li>
 </ul>

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

@@ -391,7 +391,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><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
 	<li class="active"><a href="">未确认机构编辑</a></li>
 </ul>

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

@@ -22,7 +22,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}/user/clubTemporary/">未确认机构</a></li>
 	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 </ul>

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

@@ -28,7 +28,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><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/user/registerPage.jsp

@@ -114,7 +114,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><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
     <li class="active"><a href="${ctx}/user/clubTemporary/registerPage?id=${clubTemporary.id}">确认注册</a></li>
 </ul>

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

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-    <title>机构列表</title>
+    <title>机构基本资料列表</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
         .reg-row .new-tag.active {

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

@@ -492,7 +492,7 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li><a href="${ctx}/new/user/agency/?searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}">机构列表</a></li>
+    <li><a href="${ctx}/new/user/agency/?searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}">机构基本资料列表</a></li>
     <li class="active"><a href="${ctx}/new/user/agency/form?id=${newCmClub.clubID}&source=${source}&searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}">机构信息</a></li>
 </ul>
 <form:form id="inputForm" modelAttribute="cmClubinfo" action="${ctx}/new/user/agency/save?searchName=${newCmClub.searchName}&searchUserName=${newCmClub.searchUserName}&searchBindMobile=${newCmClub.searchBindMobile}&searchEmail=${newCmClub.searchEmail}&searchUserOrganizeID=${newCmClub.searchUserOrganizeID}&searchStatus=${newCmClub.searchStatus}&searchUserIdentity=${newCmClub.searchUserIdentity}&searchStartTime=${newCmClub.searchStartTime}&searchEndTime=${newCmClub.searchEndTime}" method="post"
@@ -504,8 +504,25 @@
 <div style="max-width:1200px;padding:15px;">
     <table border="0" cellspacing="0" cellpadding="0" width="100%">
         <tr height="28">
-            <th>状态：</th>
-            <td colspan="5">${fns:getDictLabel(newCmClub.status, 'club_status', newCmClub.status)}</td>
+            <th width="12%">状态：</th>
+            <td width="13%">${fns:getDictLabel(newCmClub.status, 'club_status', newCmClub.status)}</td>
+            <th width="12%">机构级别：</th>
+            <td width="13%">
+                <c:if test="${newCmClub.userIdentity eq 4}">
+                    个人机构
+                </c:if>
+                <c:if test="${newCmClub.userIdentity eq 2}">
+                    资质机构
+                </c:if>
+                <c:if test="${newCmClub.svipUserFlag eq 1}">
+                    <font color="red">(超级会员)</font>
+                </c:if>
+                <c:if test="${newCmClub.userIdentity eq 2 and newCmClub.svipUserFlag eq 0}">
+                    <font color="red">(普通会员)</font>
+                </c:if>
+            </td>
+            <th width="12%">注册时间：</th>
+            <td width="13%">${newCmClub.addTime}</td>
         </tr>
         <tr height="28">
             <th width="12%">机构名称：</th>

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

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-    <title>机构列表</title>
+    <title>机构基本资料列表</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
         .reg-row .new-tag.active{border:1px solid #de5801}
@@ -50,7 +50,7 @@
 </head>
 <body>
 <ul class="nav nav-tabs">
-    <li class="active"><a href="${ctx}/new/user/agency/">机构机构基本资料列表</a></li>
+    <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}/user/clubTemporary/">未确认机构</a></li>
     <li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
@@ -89,7 +89,7 @@
             </form:select>
         </div>
         <div class="item">
-            <label>机构类别：</label>
+            <label>机构级别：</label>
             <form:select path="searchUserIdentity" class="input-medium">
                 <form:option value="" label="请选择"/>
                 <form:option value="4" label="个人机构"/>
@@ -159,7 +159,7 @@
         <th>协销人员</th>
         <th>状态</th>
         <th>审核人</th>
-        <th>机构类别</th>
+        <th>机构级别</th>
         <th>活跃状态<span class="acticer_span" onmousemove="activeStageMessage(1)">?</span></th>
         <th>客户价值<span class="acticer_span" onmousemove="activeStageMessage(2)">?</span></th>
         <th>注册IP</th>
@@ -319,7 +319,7 @@
                     </shiro:hasPermission>
                 </c:if>
                 <shiro:hasPermission name="club:cmAgency:category">
-                    <a href="javascript:void(0);" onclick="showClubAlert(${newCmClubList.clubID},${newCmClubList.userIdentity})">设置机构类别</a>
+                    <a href="javascript:void(0);" onclick="showClubAlert(${newCmClubList.clubID},${newCmClubList.userIdentity})">设置机构级别</a>
                 </shiro:hasPermission>
                 <c:if test="${newCmClubList.status eq 92 || newCmClubList.status eq 93}">
                     <shiro:hasPermission name="club:cmAgency:conform">
@@ -394,14 +394,14 @@
         </div><!-- /.modal-content -->
     </div><!-- /.modal -->
 </div>
-<%--设置机构类别弹窗--%>
+<%--设置机构级别弹窗--%>
 <div class="alert-modal" id="alertModal">
     <div class="title">
-        <p>机构类别</p>
+        <p>机构级别</p>
         <i class="close" id="alertModal-close">X</i>
     </div>
     <div class="alert-content">
-        <p>请选择类别</p>
+        <p>请选择级别</p>
         <div class="from-radio">
             <input type="radio" value="1" name="clubType">资质机构
             <input type="radio" value="2" name="clubType">个人机构
@@ -688,7 +688,7 @@
     var $alertModalCloseBtn = $('#close-clubleibie ');
     var $alertModalConfirm = $('#confirm-clubleibie ');
 
-    //选择机构类别
+    //选择机构级别
     function showClubAlert(clubID, type) {
         if (type == 2) {
             $ClubAlertContent.find("input[type=radio][value='1']").attr("checked", true);

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

@@ -27,7 +27,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="javascript:;">运营人员列表</a></li>
 </ul>
 <div>

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">

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

@@ -2,7 +2,7 @@
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-    <title>机构列表</title>
+    <title>机构基本资料列表</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
         .reg-row .new-tag.active{border:1px solid #de5801}
@@ -54,7 +54,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/statisticsList">机构分析统计列表</a></li>
     <li><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
     <li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
@@ -142,7 +142,7 @@
                 <form:option value="3" label="10万至100万"/>
                 <form:option value="4" label="大于100万"/>
             </form:select>
-            <label class="control-label">近一个年购买额：</label>
+            <label class="control-label">近一年购买额：</label>
             <form:select id ="payTotalYear" path="payTotalYear" class="input-medium">
                 <form:option value="" label="请选择"/>
                 <form:option value="1" label="小于1万"/>
@@ -192,7 +192,7 @@
             </div>
         </th>
         <th class="th-sort">
-            近一个年订单数
+            近一年订单数
             <div class="sort sort-button" id="sort-button2">
                 <a href="${ctx}/new/user/agency/statisticsList?orderCountYearType=0" class="icon icon-up"></a>
                 <a href="${ctx}/new/user/agency/statisticsList?orderCountYearType=1" class="icon icon-down"></a>
@@ -206,7 +206,7 @@
             </div>
         </th>
         <th class="th-sort">
-            近一个年购买额
+            近一年购买额
             <div class="sort sort-button" id="sort-button4">
                 <a href="${ctx}/new/user/agency/statisticsList?payTotalYearType=0" class="icon icon-up"></a>
                 <a href="${ctx}/new/user/agency/statisticsList?payTotalYearType=1" class="icon icon-down"></a>
@@ -389,7 +389,7 @@ $(function () {
     }
     $("#export").click(function () {
         var formData = $('#searchForm').serialize()
-        window.location.href= "${ctx}/new/user/agency/club/export"
+        window.location.href= "${ctx}/new/user/agency/club/export?"+formData
     })
     // $('.sort-button .icon').click(function () {
     //     $(this).addClass('active')

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

@@ -10,7 +10,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/clubPortrait?clubID=${newCmClub.clubID}">机构画像</a></li>
 </ul>
 <div class="ul-form">

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

@@ -9,7 +9,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/clubPortrait?clubID=${cmPortrait.clubID}&clubName=${cmPortrait.clubName}&dateType=0&type=4">机构画像</a></li>
 </ul>
 <div class="ul-form">

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

@@ -115,7 +115,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><a href="${ctx}/user/clubTemporary/">未确认机构</a></li>
 	<li><a href="${ctx}/user/cmOperational/">操作日志</a></li>
 	<li class="active"><a href="${ctx}/new/user/agency/recordLinkage?clubId=${clubId}">生成行为记录链接</a></li>

src/main/webapp/WEB-INF/views/modules/weisha/addClubUserForm.jsp

@@ -61,7 +61,7 @@
 <body>
 	<ul class="nav nav-tabs">
 		<li><a href="${ctx}/weisha/cmMallOrganize">组织列表</a></li>
-		<li><a href="${ctx}/weisha/user/organizeClubList?userOrganizeID=${userOrganizeID}">机构列表</a></li>
+		<li><a href="${ctx}/weisha/user/organizeClubList?userOrganizeID=${userOrganizeID}">机构基本资料列表</a></li>
 		<c:if test="${not empty newCmClub.clubID && not empty newCmClub.userID}">
 			<li class="active"><a href="${ctx}/user/cmUserOrganize/toAddClubUser?id=${userOrganizeID}&clubID=${newCmClub.clubID}&userID=${newCmClub.userID}">上线会所</a></li>
 		</c:if>
@@ -73,7 +73,7 @@
 		<input type="hidden" id="curProvince" name="curProvince" value="${newCmClub.province }" disabled="disabled">
 		<input type="hidden" id="curCity" name="curCity" value="${newCmClub.city }" disabled="disabled">
 		<input type="hidden" id="curTown" name="curTown" value="${newCmClub.town }" disabled="disabled">
-		<sys:message content="${message}"/>		
+		<sys:message content="${message}"/>
 		<div class="control-group">
 			<label class="control-label"><b><font color="red">*</font>机构名称：</b></label>
 			<div class="controls">

src/main/webapp/WEB-INF/views/modules/weisha/organizeClubList.jsp

@@ -10,7 +10,7 @@
 	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
-			
+
 		});
 		function page(n,s){
 			$("#pageNo").val(n);
@@ -23,7 +23,7 @@
 <body>
 	<ul class="nav nav-tabs">
 		<li><a href="${ctx}/weisha/cmMallOrganize">组织列表</a></li>
-		<li class="active"><a href="${ctx}/weisha/user/organizeClubList?userOrganizeID=${mallOrganize.id}">机构列表</a></li>
+		<li class="active"><a href="${ctx}/weisha/user/organizeClubList?userOrganizeID=${mallOrganize.id}">机构基本资料列表</a></li>
 	</ul>
 	<form:form id="searchForm" modelAttribute="cmUser" action="${ctx}/weisha/user/organizeClubList?userOrganizeID=${mallOrganize.id}" method="post" class="breadcrumb form-search">
 		<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -105,4 +105,4 @@
 	</c:if>
 	<div class="pagination">${page}</div>
 </body>
-</html>
+</html>