瀏覽代碼

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

huangzhiguo 2 年之前
父節點
當前提交
79157c74c0

+ 37 - 0
src/main/java/com/caimei/modules/user/entity/CmBehaviorRecord.java

@@ -38,6 +38,11 @@ public class CmBehaviorRecord extends DataEntity<CmBehaviorRecord> {
     private String behaviorType;  //是否是roos页面行为 1:用户行为、2:roos行为统计
     private String behaviorType;  //是否是roos页面行为 1:用户行为、2:roos行为统计
     private Integer count;
     private Integer count;
 
 
+    private String companyType; //公司类型
+    private String corporateName;   // 公司名称
+    private String contacts;    //联系人
+    private String phoneNumber; //手机号码
+
     private Integer numbers;    //访问页面总数
     private Integer numbers;    //访问页面总数
     private String userIdentity; //公司类型
     private String userIdentity; //公司类型
 
 
@@ -222,6 +227,38 @@ public class CmBehaviorRecord extends DataEntity<CmBehaviorRecord> {
         this.count = count;
         this.count = count;
     }
     }
 
 
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
+    public String getCorporateName() {
+        return corporateName;
+    }
+
+    public void setCorporateName(String corporateName) {
+        this.corporateName = corporateName;
+    }
+
+    public String getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
     public Integer getNumbers() {
     public Integer getNumbers() {
         return numbers;
         return numbers;
     }
     }

+ 1 - 14
src/main/java/com/caimei/modules/user/web/CmUserBehaviorRecordController.java

@@ -58,19 +58,6 @@ public class CmUserBehaviorRecordController extends BaseController {
     public String List(CmBehaviorRecord cmBehaviorRecord, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException {
     public String List(CmBehaviorRecord cmBehaviorRecord, HttpServletRequest request, HttpServletResponse response, Model model)  throws IOException {
         Page<CmBehaviorRecord> page = cmBehaviorRecordService.findPageList(new Page<>(request, response,20), cmBehaviorRecord);
         Page<CmBehaviorRecord> page = cmBehaviorRecordService.findPageList(new Page<>(request, response,20), cmBehaviorRecord);
         for(CmBehaviorRecord record: page.getList()) {
         for(CmBehaviorRecord record: page.getList()) {
-            // 是roos页面统计判断咨询人信息是否为空并赋值
-            if ("2".equals(cmBehaviorRecord.getBehaviorType())) {
-                CmBehaviorRecord consult = cmBehaviorRecordDao.selConsult(record);
-                if (consult != null) {
-                    if (StringUtils.isNotEmpty(consult.getConsultName())) {
-                        record.setConsultName(consult.getConsultName());
-                    }
-                    if (StringUtils.isNotEmpty(consult.getConsultMobile())) {
-                        record.setConsultMobile(consult.getConsultMobile());
-                    }
-                }
-
-            }
             // 计算访问时长
             // 计算访问时长
             String time = cmBehaviorRecordService.calculationTime(record.getAccessDuration());
             String time = cmBehaviorRecordService.calculationTime(record.getAccessDuration());
             record.setAccessDuration(time);
             record.setAccessDuration(time);
@@ -115,7 +102,7 @@ public class CmUserBehaviorRecordController extends BaseController {
     public String behaviorRecordAgency(CmBehaviorRecord cmBehaviorRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
     public String behaviorRecordAgency(CmBehaviorRecord cmBehaviorRecord, HttpServletRequest request, HttpServletResponse response, Model model) {
         NewCmClub newCmClub = new NewCmClub();
         NewCmClub newCmClub = new NewCmClub();
         if (cmBehaviorRecord.getUserID() == 0) {
         if (cmBehaviorRecord.getUserID() == 0) {
-            newCmClub.setClubID(1);
+            newCmClub.setClubID(0);
         } else {
         } else {
             newCmClub.setClubID(cmBehaviorRecord.getClubID());
             newCmClub.setClubID(cmBehaviorRecord.getClubID());
         }
         }

+ 37 - 45
src/main/resources/mappings/modules/user/CmBehaviorRecordMapper.xml

@@ -14,65 +14,57 @@
     </sql>
     </sql>
     <select id="findList" resultType="CmBehaviorRecord">
     <select id="findList" resultType="CmBehaviorRecord">
         SELECT
         SELECT
-          <include refid="behaviorRecord"/>
-          ,SUM(b.accessDuration) AS accessDuration,
-          u.userIdentity,
-          u.userName,
-          c.sname AS cSname,
-          c.name,
-          c.linkMan,
-          c.contractMobile,
-          s.name AS sname,
-          s.linkMan AS slinkMan,
-          s.contractMobile AS scontractMobile,
-          c.clubID as clubID,
-          s.shopID as shopID,
-          b.accessClient,
-          max(b.region) as region,
-          max(accessTime) AS lastAccessTime,
-          (SELECT CASE STATUS WHEN 91 THEN '采美默认协销经理(官方账号)' ELSE linkMan END FROM serviceprovider WHERE serviceProviderID = c.spID) AS spName,
-          COUNT(b.IP) as numbers
-        FROM cm_behavior_record b
-        LEFT JOIN USER u ON b.userID = u.userID
-        LEFT JOIN club c ON b.userID = c.userID
-        LEFT JOIN shop s ON b.userID = s.userID
-        LEFT JOIN serviceprovider sp on c.spID = sp.serviceProviderID
+        IP,
+        userID,
+        clubID,
+        lastAccessTime,
+        companyType,
+        corporateName,
+        contacts,
+        phoneNumber,
+        spName,
+        number as numbers,
+        consultName,
+        consultMobile,
+        behaviorType,
+        productID,
+        accessTime,
+        accessDuration,
+        accessDate,
+        accessClient,
+        region
+        FROM cm_behavior_record_index
         <where>
         <where>
-            b.IP != '106.55.202.118' AND b.delFlag = 0
+            delFlag = 0
             <if test="behaviorType == 2">
             <if test="behaviorType == 2">
-                AND b.behaviorType = #{behaviorType}
+                AND behaviorType = #{behaviorType}
             </if>
             </if>
             <if test="IP != null and IP != ''">
             <if test="IP != null and IP != ''">
-                AND b.IP = #{IP}
+                AND IP = #{IP}
             </if>
             </if>
-            <if test="name != null and name != ''">
-                AND (c.name like concat('%',#{name},'%')  or s.name like concat ('%',#{name},'%'))
+            <if test="corporateName != null and corporateName != ''">
+                AND corporateName like concat('%',#{corporateName},'%')
             </if>
             </if>
-            <if test="userIdentity != null and userIdentity != ''">
-                <if test="userIdentity == 2">
-                    AND u.userIdentity in (2, 4)
-                </if>
-                <if test="userIdentity == 3">
-                    AND u.userIdentity = 3
-                </if>
-                <if test="userIdentity == 1">
-                    AND  b.userID = 0
-                </if>
+            <if test="companyType != null and companyType != ''">
+                AND companyType = #{companyType}
             </if>
             </if>
-            <if test="userName != null and userName != ''">
-                AND u.userName = #{userName}
+            <if test="accessClient != null and accessClient != ''">
+                AND accessClient =#{accessClient}
             </if>
             </if>
-            <if test="contractMobile != null and contractMobile != ''">
-                AND (c.contractMobile = #{contractMobile} or s.contractMobile = #{contractMobile})
+            <if test="contacts != null and contacts != ''">
+                AND contacts = #{contacts}
+            </if>
+            <if test="phoneNumber != null and phoneNumber != ''">
+                AND phoneNumber = #{phoneNumber}
             </if>
             </if>
             <if test="spName != null and spName != ''">
             <if test="spName != null and spName != ''">
-                AND sp.name = #{spName}
+                AND spName = #{spName}
             </if>
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND b.accessDate between #{startTime} and #{endTime}
+                AND accessDate between #{startTime} and #{endTime}
             </if>
             </if>
         </where>
         </where>
-        GROUP BY b.IP, b.accessDate,b.userID ORDER BY b.accessTime DESC
+        ORDER BY accessTime DESC
     </select>
     </select>
 
 
     <select id="findListBefore" resultType="com.caimei.modules.user.entity.CmBehaviorRecord">
     <select id="findListBefore" resultType="com.caimei.modules.user.entity.CmBehaviorRecord">

+ 7 - 7
src/main/webapp/WEB-INF/views/modules/user/behaviorNewOrder.jsp

@@ -41,20 +41,20 @@
     <c:if test="${cmBehaviorRecord.behaviorType eq '1'}">
     <c:if test="${cmBehaviorRecord.behaviorType eq '1'}">
         <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">用户行为记录</a></li>
         <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">用户行为记录</a></li>
     </c:if>
     </c:if>
-    <li class="active"><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">查看详情</a></li>
+    <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>
 </ul>
 <sys:message content="${message}"/>
 <sys:message content="${message}"/>
-<form:form id="searchForm" modelAttribute="cmBehaviorRecord" action="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}" method="post" class="breadcrumb form-search">
+<form:form id="searchForm" modelAttribute="cmBehaviorRecord" action="${ctx}/user/behavior/record/behaviorReport?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="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
     <div class="ul-form">
         <ul class="nav nav-tabs">
         <ul class="nav nav-tabs">
-            <li><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">访问详情</a></li>
-            <li><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
-            <li><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
-            <li><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
-            <li class="active"><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
+            <li><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>
+            <li><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
+            <li><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
+            <li><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
+            <li class="active"><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
         </ul>
         </ul>
     </div>
     </div>
 </form:form>
 </form:form>

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

@@ -172,16 +172,16 @@
     <c:if test="${cmBehaviorRecord.behaviorType eq '1'}">
     <c:if test="${cmBehaviorRecord.behaviorType eq '1'}">
         <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">用户行为记录</a></li>
         <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">用户行为记录</a></li>
     </c:if>
     </c:if>
-    <li class="active"><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">查看详情</a></li>
+    <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>
 </ul>
 <div class="ul-form">
 <div class="ul-form">
     <ul class="nav nav-tabs">
     <ul class="nav nav-tabs">
-        <li><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">访问详情</a></li>
-        <li class="active"><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
-        <li><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
-        <li><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
-        <li><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
+        <li><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>
+        <li class="active"><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
+        <li><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
+        <li><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
+        <li><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
     </ul>
     </ul>
 </div>
 </div>
 <form:form id="inputForm" modelAttribute="cmClubinfo" action="#" method="post"
 <form:form id="inputForm" modelAttribute="cmClubinfo" action="#" method="post"

+ 6 - 15
src/main/webapp/WEB-INF/views/modules/user/behaviorRecordDetailsList.jsp

@@ -33,17 +33,17 @@
     <li class="active"><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">查看详情</a></li>
     <li class="active"><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">查看详情</a></li>
 
 
 </ul>
 </ul>
-<form:form id="searchForm" modelAttribute="cmBehaviorRecord" action="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}" method="post" class="breadcrumb form-search">
+<form:form id="searchForm" modelAttribute="cmBehaviorRecord" action="${ctx}/user/behavior/record/recordList?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="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-    <c:if test="${cmBehaviorRecord.userIdentity == '2' or cmBehaviorRecord.userIdentity == '4'}">
+    <c:if test="${cmBehaviorRecord.companyType == '2'}">
         <div class="ul-form">
         <div class="ul-form">
             <ul class="nav nav-tabs">
             <ul class="nav nav-tabs">
                 <li class="active"><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">访问详情</a></li>
                 <li class="active"><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">访问详情</a></li>
-                <li><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
-                <li><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
-                <li><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
-                <li><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
+                <li><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
+                <li><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
+                <li><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
+                <li><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
             </ul>
             </ul>
         </div>
         </div>
     </c:if>
     </c:if>
@@ -54,7 +54,6 @@
     <tr>
     <tr>
         <th style="width: 350px;">页面路径</th>
         <th style="width: 350px;">页面路径</th>
         <th>访问来源</th>
         <th>访问来源</th>
-        <th>访问客户端</th>
         <th>页面类型</th>
         <th>页面类型</th>
         <th>页面标签</th>
         <th>页面标签</th>
         <th>商品图片</th>
         <th>商品图片</th>
@@ -98,14 +97,6 @@
                     搜狗搜索
                     搜狗搜索
                 </c:if>
                 </c:if>
             </td>
             </td>
-            <td>
-                <c:if test="${cmBehaviorRecord.accessClient == '0'}">
-                    网站
-                </c:if>
-                <c:if test="${cmBehaviorRecord.accessClient == '1'}">
-                    小程序
-                </c:if>
-            </td>
             <td>${cmBehaviorRecord.pageTypes}</td>
             <td>${cmBehaviorRecord.pageTypes}</td>
             <td>${cmBehaviorRecord.pageLabel}</td>
             <td>${cmBehaviorRecord.pageLabel}</td>
             <c:if test="${cmBehaviorRecord.productID == '0'}">
             <c:if test="${cmBehaviorRecord.productID == '0'}">

+ 18 - 30
src/main/webapp/WEB-INF/views/modules/user/behaviorRecordList.jsp

@@ -44,18 +44,24 @@
         <label>IP:</label>
         <label>IP:</label>
             <form:input path="IP" htmlEscape="false" maxlength="15" cssStyle="width: 150px" class="input-mini"/>
             <form:input path="IP" htmlEscape="false" maxlength="15" cssStyle="width: 150px" class="input-mini"/>
         <label>公司名称:</label>
         <label>公司名称:</label>
-            <form:input path="name" htmlEscape="false" cssStyle="width: 150px" class="input-mini"/>
+            <form:input path="corporateName" htmlEscape="false" cssStyle="width: 150px" class="input-mini"/>
         <label>公司类型:</label>
         <label>公司类型:</label>
-            <form:select path="userIdentity" cssStyle="width: 150px" class="input-medium required">
+            <form:select path="companyType" cssStyle="width: 150px" class="input-medium required">
                 <form:option value="" label="请选择"/>
                 <form:option value="" label="请选择"/>
                 <form:option value="2" label="机构"/>
                 <form:option value="2" label="机构"/>
                 <form:option value="3" label="供应商"/>
                 <form:option value="3" label="供应商"/>
                 <form:option value="1" label="游客"/>
                 <form:option value="1" label="游客"/>
             </form:select>
             </form:select>
+        <label>访问客户端</label>
+        <form:select path="accessClient" cssStyle="width: 150px" class="input-medium required">
+            <form:option value="" label="请选择"/>
+            <form:option value="0" label="网站"/>
+            <form:option value="1" label="小程序"/>
+        </form:select>
         <label>联系人:</label>
         <label>联系人:</label>
-            <form:input path="userName" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
+            <form:input path="contacts" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <label>手机号码:</label>
         <label>手机号码:</label>
-            <form:input path="contractMobile" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
+            <form:input path="phoneNumber" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <label>协销:</label>
         <label>协销:</label>
             <form:input path="spName" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
             <form:input path="spName" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <div class="ys-kin" style="margin-top: 20px">
         <div class="ys-kin" style="margin-top: 20px">
@@ -111,16 +117,16 @@
                 </c:if>
                 </c:if>
             </td>
             </td>
            <td>
            <td>
-               <c:if test="${cmBehaviorRecord.userIdentity eq 2 || cmBehaviorRecord.userIdentity eq 4}">
+               <c:if test="${cmBehaviorRecord.companyType eq 2}">
                    机构
                    机构
                </c:if>
                </c:if>
-               <c:if test="${cmBehaviorRecord.userIdentity eq 3}">
+               <c:if test="${cmBehaviorRecord.companyType eq 3}">
                    供应商
                    供应商
                </c:if>
                </c:if>
-               <c:if test="${cmBehaviorRecord.userID == '0'}">
+               <c:if test="${cmBehaviorRecord.companyType == 1}">
                    游客
                    游客
                </c:if>
                </c:if>
-               <c:if test="${cmBehaviorRecord.userID != '0' && (cmBehaviorRecord.userIdentity == null || cmBehaviorRecord.userIdentity == '')}">
+               <c:if test="${cmBehaviorRecord.userID != '0' && (cmBehaviorRecord.companyType == null || cmBehaviorRecord.companyType == '')}">
                    ---
                    ---
                </c:if>
                </c:if>
            </td>
            </td>
@@ -132,31 +138,13 @@
             </c:if>
             </c:if>
             <c:if test="${cmBehaviorRecord.userID != '0'}">
             <c:if test="${cmBehaviorRecord.userID != '0'}">
                <td>
                <td>
-                   <c:if test="${cmBehaviorRecord.userIdentity eq 2}">
-                       ${cmBehaviorRecord.name}
-                   </c:if>
-                   <c:if test="${cmBehaviorRecord.userIdentity eq 4}">
-                       <c:if test="${cmBehaviorRecord.name ne cmBehaviorRecord.userName}">
-                           ${cmBehaviorRecord.name}
-                       </c:if>
-                       <c:if test="${cmBehaviorRecord.name eq cmBehaviorRecord.userName}">
-                           ---
-                       </c:if>
-                   </c:if>
-                   <c:if test="${cmBehaviorRecord.sname ne null || cmBehaviorRecord.sname eq ''}">
-                       ${cmBehaviorRecord.sname}
-                   </c:if>
+                   ${cmBehaviorRecord.corporateName}
                </td>
                </td>
                <td>
                <td>
-                   ${cmBehaviorRecord.userName}
+                   ${cmBehaviorRecord.contacts}
                </td>
                </td>
                <td>
                <td>
-                   <c:if test="${cmBehaviorRecord.userIdentity eq 2 || cmBehaviorRecord.userIdentity eq 4}">
-                       ${cmBehaviorRecord.contractMobile}
-                   </c:if>
-                   <c:if test="${cmBehaviorRecord.userIdentity eq 3}">
-                       ${cmBehaviorRecord.scontractMobile}
-                   </c:if>
+                   ${cmBehaviorRecord.phoneNumber}
                </td>
                </td>
                <td>
                <td>
                    <c:if test="${cmBehaviorRecord.spName ne null}">
                    <c:if test="${cmBehaviorRecord.spName ne null}">
@@ -172,7 +160,7 @@
            <td>${cmBehaviorRecord.accessDate}</td>
            <td>${cmBehaviorRecord.accessDate}</td>
            <td>${cmBehaviorRecord.lastAccessTime}</td>
            <td>${cmBehaviorRecord.lastAccessTime}</td>
            <td>
            <td>
-               <a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=1">查看详情</a>
+               <a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=1">查看详情</a>
            </td>
            </td>
         </tr>
         </tr>
     </c:forEach>
     </c:forEach>

+ 18 - 30
src/main/webapp/WEB-INF/views/modules/user/behaviorRecordRossList.jsp

@@ -44,18 +44,24 @@
         <label>IP:</label>
         <label>IP:</label>
         <form:input path="IP" htmlEscape="false" maxlength="15" cssStyle="width: 150px" class="input-mini"/>
         <form:input path="IP" htmlEscape="false" maxlength="15" cssStyle="width: 150px" class="input-mini"/>
         <label>公司名称:</label>
         <label>公司名称:</label>
-        <form:input path="name" htmlEscape="false" maxlength="11" cssStyle="width: 150px" class="input-mini"/>
+        <form:input path="corporateName" htmlEscape="false" cssStyle="width: 150px" class="input-mini"/>
         <label>公司类型:</label>
         <label>公司类型:</label>
-        <form:select path="userIdentity" cssStyle="width: 150px" class="input-medium required">
+        <form:select path="companyType" cssStyle="width: 150px" class="input-medium required">
             <form:option value="" label="请选择"/>
             <form:option value="" label="请选择"/>
             <form:option value="2" label="机构"/>
             <form:option value="2" label="机构"/>
             <form:option value="3" label="供应商"/>
             <form:option value="3" label="供应商"/>
             <form:option value="1" label="游客"/>
             <form:option value="1" label="游客"/>
         </form:select>
         </form:select>
+        <label>访问客户端</label>
+        <form:select path="accessClient" cssStyle="width: 150px" class="input-medium required">
+            <form:option value="" label="请选择"/>
+            <form:option value="0" label="网站"/>
+            <form:option value="1" label="小程序"/>
+        </form:select>
         <label>联系人:</label>
         <label>联系人:</label>
-        <form:input path="linkMan" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
+        <form:input path="contacts" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <label>手机号码:</label>
         <label>手机号码:</label>
-        <form:input path="contractMobile" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
+        <form:input path="phoneNumber" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <label>协销:</label>
         <label>协销:</label>
         <form:input path="spName" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <form:input path="spName" htmlEscape="false" maxlength="20" cssStyle="width: 150px" class="input-small"/>
         <div class="ys-kin" style="margin-top: 20px">
         <div class="ys-kin" style="margin-top: 20px">
@@ -112,16 +118,16 @@
                 </c:if>
                 </c:if>
             </td>
             </td>
             <td>
             <td>
-                <c:if test="${cmBehaviorRecord.userIdentity eq 2 || cmBehaviorRecord.userIdentity eq 4}">
+                <c:if test="${cmBehaviorRecord.companyType eq 2}">
                     机构
                     机构
                 </c:if>
                 </c:if>
-                <c:if test="${cmBehaviorRecord.userIdentity eq 3}">
+                <c:if test="${cmBehaviorRecord.companyType eq 3}">
                     供应商
                     供应商
                 </c:if>
                 </c:if>
-                <c:if test="${cmBehaviorRecord.userID == '0'}">
+                <c:if test="${cmBehaviorRecord.companyType == 1}">
                     游客
                     游客
                 </c:if>
                 </c:if>
-                <c:if test="${cmBehaviorRecord.userID != '0' && (cmBehaviorRecord.userIdentity == null || cmBehaviorRecord.userIdentity == '')}">
+                <c:if test="${cmBehaviorRecord.userID != '0' && (cmBehaviorRecord.companyType == null || cmBehaviorRecord.companyType == '')}">
                     ---
                     ---
                 </c:if>
                 </c:if>
             </td>
             </td>
@@ -133,31 +139,13 @@
             </c:if>
             </c:if>
             <c:if test="${cmBehaviorRecord.userID != '0'}">
             <c:if test="${cmBehaviorRecord.userID != '0'}">
                 <td>
                 <td>
-                    <c:if test="${cmBehaviorRecord.userIdentity eq 2}">
-                        ${cmBehaviorRecord.cSname}
-                    </c:if>
-                    <c:if test="${cmBehaviorRecord.userIdentity eq 4}">
-                        <c:if test="${cmBehaviorRecord.cSname ne cmBehaviorRecord.userName}">
-                            ${cmBehaviorRecord.cSname}
-                        </c:if>
-                        <c:if test="${cmBehaviorRecord.cSname eq cmBehaviorRecord.userName}">
-                            ---
-                        </c:if>
-                    </c:if>
-                    <c:if test="${cmBehaviorRecord.sname ne null || cmBehaviorRecord.sname eq ''}">
-                        ${cmBehaviorRecord.sname}
-                    </c:if>
+                        ${cmBehaviorRecord.corporateName}
                 </td>
                 </td>
                 <td>
                 <td>
-                        ${cmBehaviorRecord.userName}
+                        ${cmBehaviorRecord.contacts}
                 </td>
                 </td>
                 <td>
                 <td>
-                    <c:if test="${cmBehaviorRecord.userIdentity eq 2 || cmBehaviorRecord.userIdentity eq 4}">
-                        ${cmBehaviorRecord.contractMobile}
-                    </c:if>
-                    <c:if test="${cmBehaviorRecord.userIdentity eq 3}">
-                        ${cmBehaviorRecord.scontractMobile}
-                    </c:if>
+                        ${cmBehaviorRecord.phoneNumber}
                 </td>
                 </td>
                 <td>
                 <td>
                     <c:if test="${cmBehaviorRecord.spName ne null}">
                     <c:if test="${cmBehaviorRecord.spName ne null}">
@@ -187,7 +175,7 @@
             <td>${cmBehaviorRecord.accessDuration}</td>
             <td>${cmBehaviorRecord.accessDuration}</td>
             <td>${cmBehaviorRecord.accessDate}</td>
             <td>${cmBehaviorRecord.accessDate}</td>
             <td>
             <td>
-                <a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=2">查看详情</a>
+                <a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=2">查看详情</a>
             </td>
             </td>
         </tr>
         </tr>
     </c:forEach>
     </c:forEach>

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

@@ -25,19 +25,19 @@
     <c:if test="${cmBehaviorRecord.behaviorType eq '1'}">
     <c:if test="${cmBehaviorRecord.behaviorType eq '1'}">
         <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">用户行为记录</a></li>
         <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">用户行为记录</a></li>
     </c:if>
     </c:if>
-    <li class="active"><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">查看详情</a></li>
+    <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>
 </ul>
 <br/>
 <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}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}" method="post" class="breadcrumb form-search">
+<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="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
     <div class="ul-form">
         <ul class="nav nav-tabs">
         <ul class="nav nav-tabs">
-            <li><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">访问详情</a></li>
-            <li><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
-            <li class="active"><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
-            <li><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
-            <li><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
+            <li><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>
+            <li><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
+            <li class="active"><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
+            <li><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
+            <li><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
         </ul>
         </ul>
     </div>
     </div>
 </form:form>
 </form:form>

+ 7 - 7
src/main/webapp/WEB-INF/views/modules/user/behaviorReport.jsp

@@ -257,19 +257,19 @@
     <c:if test="${cmBehaviorRecord.behaviorType eq '1'}">
     <c:if test="${cmBehaviorRecord.behaviorType eq '1'}">
         <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">用户行为记录</a></li>
         <li><a href="${ctx}/user/behavior/record/list?behaviorType=${cmBehaviorRecord.behaviorType}">用户行为记录</a></li>
     </c:if>
     </c:if>
-    <li class="active"><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">查看详情</a></li>
+    <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>
 </ul>
-<form:form id="searchForm" modelAttribute="cmBehaviorRecord" action="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}" method="post" class="breadcrumb form-search">
+<form:form id="searchForm" modelAttribute="cmBehaviorRecord" action="${ctx}/user/behavior/record/behaviorReport?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="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
     <div class="ul-form">
     <div class="ul-form">
         <ul class="nav nav-tabs">
         <ul class="nav nav-tabs">
-            <li><a href="${ctx}/user/behavior/record/recordList?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">访问详情</a></li>
-            <li><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
-            <li><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
-            <li class="active"><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
-            <li><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&userIdentity=${cmBehaviorRecord.userIdentity}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
+            <li><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>
+            <li><a href="${ctx}/user/behavior/record/recordAgency?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">机构信息</a></li>
+            <li><a href="${ctx}/user/behavior/record/behaviorRemarks?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">咨询记录</a></li>
+            <li class="active"><a href="${ctx}/user/behavior/record/behaviorReport?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">报备记录</a></li>
+            <li><a href="${ctx}/user/behavior/record/behaviorNewOrder?IP=${cmBehaviorRecord.IP}&accessDate=${cmBehaviorRecord.accessDate}&userID=${cmBehaviorRecord.userID}&clubID=${cmBehaviorRecord.clubID}&companyType=${cmBehaviorRecord.companyType}&behaviorType=${cmBehaviorRecord.behaviorType}">订单信息</a></li>
         </ul>
         </ul>
     </div>
     </div>
 </form:form>
 </form:form>