更新版本

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

@@ -121,6 +121,30 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
      */
     private String oldName;
 
+    private Integer newDeal;//新分配机构状态 0.否，1.是
+
+    private String productName; //咨询商品名称
+
+    private String mainImage;//咨询商品主图
+
+    private String shopName;//供应商名称
+
+    private String productMainImage;//关联报备商品主图
+
+    private String proName;//关联报备商品名称
+
+    private String reportText;//关联事由
+
+    private String auditName;
+
+    private Integer reportStatus;//状态 1.已审核 2.待审核 3.审核未通过
+
+    private String auditTime;//审核时间
+
+
+
+
+
     public String getOldName() {
         return oldName;
     }
@@ -314,4 +338,84 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
     public void setQuestionMan(String questionMan) {
         this.questionMan = questionMan;
     }
+
+    public Integer getNewDeal() {
+        return newDeal;
+    }
+
+    public void setNewDeal(Integer newDeal) {
+        this.newDeal = newDeal;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getMainImage() {
+        return mainImage;
+    }
+
+    public void setMainImage(String mainImage) {
+        this.mainImage = mainImage;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getProductMainImage() {
+        return productMainImage;
+    }
+
+    public void setProductMainImage(String productMainImage) {
+        this.productMainImage = productMainImage;
+    }
+
+    public String getProName() {
+        return proName;
+    }
+
+    public void setProName(String proName) {
+        this.proName = proName;
+    }
+
+    public String getReportText() {
+        return reportText;
+    }
+
+    public void setReportText(String reportText) {
+        this.reportText = reportText;
+    }
+
+    public Integer getReportStatus() {
+        return reportStatus;
+    }
+
+    public void setReportStatus(Integer reportStatus) {
+        this.reportStatus = reportStatus;
+    }
+
+    public String getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(String auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public String getAuditName() {
+        return auditName;
+    }
+
+    public void setAuditName(String auditName) {
+        this.auditName = auditName;
+    }
 }

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

@@ -89,6 +89,7 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private String endTime;        //注册时间结束  查询条件
     private String userIdentity;  //用户身份
     private Integer svipUserFlag;   //超级会员用户标识，1是，2不是
+    private Integer newDeal;//新分配机构状态 0.否，1.是
     public String getCheckMan() {
         return checkMan;
     }
@@ -1009,4 +1010,12 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     public void setLinkManIdentity(Integer linkManIdentity) {
         this.linkManIdentity = linkManIdentity;
     }
+
+    public Integer getNewDeal() {
+        return newDeal;
+    }
+
+    public void setNewDeal(Integer newDeal) {
+        this.newDeal = newDeal;
+    }
 }

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

@@ -125,6 +125,26 @@ public class VisitRemarkVo extends DataEntity<VisitRemarkVo> {
      */
     private String oldName;
 
+
+    private String productName; //咨询商品名称
+
+    private String mainImage;//咨询商品主图
+
+    private String shopName;//供应商名称
+
+    private String productMainImage;//关联报备商品主图
+
+    private String proName;//关联报备商品名称
+
+    private String reportText;//关联事由
+
+    private String auditName;
+
+    private Integer reportStatus;//状态 1.已审核 2.待审核 3.审核未通过
+
+    private String auditTime;//审核时间
+
+
     public String getOldName() {
         return oldName;
     }
@@ -350,4 +370,76 @@ public class VisitRemarkVo extends DataEntity<VisitRemarkVo> {
     public void setFileList(List<RemarksFileVo> fileList) {
         this.fileList = fileList;
     }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getMainImage() {
+        return mainImage;
+    }
+
+    public void setMainImage(String mainImage) {
+        this.mainImage = mainImage;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getProductMainImage() {
+        return productMainImage;
+    }
+
+    public void setProductMainImage(String productMainImage) {
+        this.productMainImage = productMainImage;
+    }
+
+    public String getProName() {
+        return proName;
+    }
+
+    public void setProName(String proName) {
+        this.proName = proName;
+    }
+
+    public String getReportText() {
+        return reportText;
+    }
+
+    public void setReportText(String reportText) {
+        this.reportText = reportText;
+    }
+
+    public String getAuditName() {
+        return auditName;
+    }
+
+    public void setAuditName(String auditName) {
+        this.auditName = auditName;
+    }
+
+    public Integer getReportStatus() {
+        return reportStatus;
+    }
+
+    public void setReportStatus(Integer reportStatus) {
+        this.reportStatus = reportStatus;
+    }
+
+    public String getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(String auditTime) {
+        this.auditTime = auditTime;
+    }
 }

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -116,7 +116,9 @@
         co.sendOutStatus AS sendOutStatus,
         co.receiptStatus AS receiptStatus,
         co.productCount AS productCount,
-        (SELECT IFNULL(sum(cop.shouldPayFee),0) FROM cm_order_product cop WHERE cop.orderId=co.orderID) AS
+        (SELECT IFNULL(sum(cop.shouldPayFee),0)
+        FROM cm_order_product cop
+        WHERE cop.orderId=co.orderID) AS
         "shouldPayProduct",
         co.status AS status,
         co.splitFlag AS splitFlag,

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

@@ -42,7 +42,8 @@
 		a.firstClubType AS "firstClubType",
 		a.secondClubType AS "secondClubType",
 		a.department AS "department",
-		a.medicalPracticeLicenseImg AS "medicalPracticeLicenseImg"
+		a.medicalPracticeLicenseImg AS "medicalPracticeLicenseImg",
+        a.newDeal as "newDeal"
     </sql>
 
     <sql id="otherColumns">
@@ -143,6 +144,9 @@
             <if test="userIdentity != null and userIdentity != '' and userIdentity == '8'.toString()">
                 AND csu.delFlag = '0' and now() <![CDATA[ < ]]> csu.endTime
             </if>
+            <if test="newDeal != null">
+                AND a.newDeal =#{newDeal}
+            </if>
             AND (u.userOrganizeID IN(0,1) or u.clubStatus != 92)
         </where>
         <choose>
@@ -369,6 +373,9 @@
         <if test="medicalPracticeLicenseImg != null and medicalPracticeLicenseImg != ''">
             medicalPracticeLicenseImg=#{medicalPracticeLicenseImg},
         </if>
+        <if test="status == 90">
+            newDeal=1,
+        </if>
         userID = #{userID}
         WHERE clubID = #{clubID}
     </update>
@@ -403,7 +410,12 @@
                         s.linkMan                                                                     as spName,
                         ccr.addTime,
                         ccr.questionMan,
-                        ccr.consultType as consult,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
+                        ccr.consultType                                                               as consult,
+                        ccr.clubType,
+                        ccr.pinceSensitve,
+                        ccr.satisfied,
+                        ccr.followup,
+                        ccr.extra,
                         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName
         from cm_club_remarks ccr
                  left join serviceprovider s on ccr.serviceProviderId = s.serviceProviderID
@@ -449,16 +461,24 @@
     <select id="findRegistList" resultType="com.caimei.modules.user.entity.CmClubRemarks">
         SELECT DISTINCT
         ccr.id AS remarksId, ccr.remarks,s.linkman AS spName, ccr.addTime,ccr.questionMan,
-        csr.leaderId AS leaderId,ifnull(ccr.consultType,'') as consult, c.Name as
-        clubName,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
-        (SELECT name FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName
-#         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID= ccr.serviceProviderID) AS oldName
+        csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') AS consult, c.Name AS
+        clubName,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,c.newDeal,
+        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
+        (SELECT mainImage FROM product p WHERE p.productID= ccre.productID) AS productMainImage,
+        (SELECT NAME FROM product p WHERE p.productID= ccre.productID) AS proName,
+        # (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID= ccr.serviceProviderID) AS oldName
+        ccre.reportText AS reportText,ccre.status AS reportStatus,ccre.auditName AS auditName,ccre.auditTime AS
+        auditTime,p.mainImage
+        AS mainImage,p.name AS productName,sh.name AS shopName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
-#         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN club c ON c.clubId=ccr.clubId
+        # LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
+        LEFT JOIN cm_club_report ccre ON ccre.remarksID = ccr.Id
+        LEFT JOIN product p ON p.productID = ccr.productID
+        LEFT JOIN shop sh ON sh.shopID = p.shopID
         <where>
             <if test="remarks != null and remarks !=''">
                 AND ccr.remarks LIKE concat('%',#{remarks},'%')
@@ -478,6 +498,9 @@
             <if test="endAddTime != null and endAddTime != ''">
                 and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
             </if>
+            <if test="newDeal !=null">
+                and c.newDeal=#{newDeal}
+            </if>
         </where>
         ORDER BY ADDTIME DESC
         <choose>
@@ -538,24 +561,24 @@
         WHERE clubId = #{clubID}
     </select>
 
-<!--    <insert id="oldname">-->
-<!--        INSERT INTO `cm_old_remarks`(serviceProviderId, `serviceProviderName`)-->
-<!--        VALUES (#{serviceProviderId}, #{serviceProviderName})-->
-<!--    </insert>-->
+    <!--    <insert id="oldname">-->
+    <!--        INSERT INTO `cm_old_remarks`(serviceProviderId, `serviceProviderName`)-->
+    <!--        VALUES (#{serviceProviderId}, #{serviceProviderName})-->
+    <!--    </insert>-->
 
     <update id="oldname">
-    UPDATE `cm_club_remarks`
-    SET oldserviceProviderId = #{oldserviceProviderId},
-        serviceProviderId=#{newSpID}
-    WHERE clubId = #{clubID}
-      AND serviceProviderId=#{oldSpID}
-</update>
+        UPDATE `cm_club_remarks`
+        SET oldserviceProviderId = #{oldserviceProviderId},
+            serviceProviderId=#{newSpID}
+        WHERE clubId = #{clubID}
+          AND serviceProviderId = #{oldSpID}
+    </update>
 
     <update id="oldnames">
         UPDATE `cm_club_remarks`
         SET serviceProviderId=#{newSpID}
         WHERE clubId = #{clubID}
-          AND serviceProviderId=#{oldSpID}
+          AND serviceProviderId = #{oldSpID}
     </update>
 
 </mapper>

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

@@ -75,14 +75,20 @@
     <select id="findRegistList" resultType="com.caimei.modules.user.entity.VisitRemarkVo">
         SELECT DISTINCT
         ccr.id AS remarksId, ccr.remarks,s.name AS spName, ccr.addTime,ccr.questionMan,
-        csr.leaderId AS leaderId,ifnull(ccr.consultType,'') as
+        csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') AS
         consult,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS serviceName,
-        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName
+        (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName,
+        (SELECT mainImage FROM product p WHERE p.productID= ccre.productID) AS productMainImage,
+        (SELECT NAME FROM product p WHERE p.productID= ccre.productID) AS proName,
+        ccre.reportText AS reportText,ccre.status AS reportStatus,ccre.auditName,ccre.auditTime AS auditTime,p.mainImage AS mainImage,p.name AS productName,sh.name AS shopName
         FROM cm_visitor_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
+        LEFT JOIN cm_club_report ccre ON ccre.visitorID = ccr.Id
+        LEFT JOIN product p ON p.productID = ccr.productID
+        LEFT JOIN shop sh ON sh.shopID = p.shopID
         <where>
             <if test="remarks != null and remarks !=''">
                 AND ccr.remarks LIKE concat('%',#{remarks},'%')

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

@@ -99,6 +99,14 @@
             <form:input path="searchEndTime" type="text" maxlength="20" class="input-mini Wdate" value="${endTime}"
                         onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
         </div>
+        <div class="item">
+            <label>新分配机构：</label>
+            <form:select path="newDeal" class="input-medium">
+                <form:option value="" label="请选择"/>
+                <form:option value="0">否</form:option>
+                <form:option value="1">是</form:option>
+            </form:select>
+        </div>
         <div class="item">
             <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         </div>

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

@@ -60,6 +60,15 @@
             return false;
         }
     </script>
+    <style>
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+    </style>
 </head>
 <body>
 <ul class="nav nav-tabs">
@@ -76,7 +85,7 @@
     <div class="flex-wrap">
         <div>
             <label>关键词：</label>
-            <form:input path="remarks"  htmlEscape="false" class="input-medium" maxlength="10"/>
+            <form:input path="remarks" htmlEscape="false" class="input-medium" maxlength="10"/>
         </div>
         <div class="item">
             <label>咨询类别：</label>
@@ -116,6 +125,14 @@
                         value="${cmClubRemarks.endAddTime}" cssStyle="width: 130px"
                         onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
         </div>
+        <div class="item">
+            <label>新分配机构：</label>
+            <form:select path="newDeal" class="input-medium">
+                <form:option value="" label="请选择"/>
+                <form:option value="0">否</form:option>
+                <form:option value="1">是</form:option>
+            </form:select>
+        </div>
         <div class="item">
             &nbsp;&nbsp;&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         </div>
@@ -128,12 +145,12 @@
             <c:forEach items="${page.list}" var="clubRemarks" varStatus="remark">
                 <div class="td clear" style="dashed:#0066CC;">
                     <div style="font-weight: bold;width: 100%;float: left;">
-<%--                        <c:if test="${not empty clubRemarks.oldName}">--%>
-<%--                            <span style="float: left;">${clubRemarks.oldName}</span>--%>
-<%--                        </c:if>--%>
-<%--                        <c:if test="${empty clubRemarks.oldName}">--%>
-<%--                            <span style="float: left;">${clubRemarks.spName}</span>--%>
-<%--                        </c:if>--%>
+                            <%--                        <c:if test="${not empty clubRemarks.oldName}">--%>
+                            <%--                            <span style="float: left;">${clubRemarks.oldName}</span>--%>
+                            <%--                        </c:if>--%>
+                            <%--                        <c:if test="${empty clubRemarks.oldName}">--%>
+                            <%--                            <span style="float: left;">${clubRemarks.spName}</span>--%>
+                            <%--                        </c:if>--%>
                         <span style="float: left;">${clubRemarks.spName}</span>
                         <span style="float: left;margin-left:20px;"><fmt:formatDate value="${clubRemarks.addTime}"
                                                                                     pattern="yyyy-MM-dd HH:mm"/></span>
@@ -147,25 +164,63 @@
                         <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                             机构名称：
                         </div>
-                        <div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.clubName}</div>
+                        <div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.clubName}<c:if test="${clubRemarks.newDeal eq 1}"><span style="color: red">（新分配）</span></c:if></div>
                         <c:if test="${not empty clubRemarks.clubType}">
-                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-                            机构类型：
-                        </div>
-                        <div style=" width: 150px;float: left;margin: 10px 0;position: relative;">${clubRemarks.clubType}</div>
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                机构类型：
+                            </div>
+                            <div style=" width: 150px;float: left;margin: 10px 0;position: relative;">${clubRemarks.clubType}</div>
                         </c:if>
                     </div>
                     <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                        <div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
                             咨询类别:
                         </div>
                         <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.consultType}</div>
+                        <c:if test="${not empty clubRemarks.productName}">
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                咨询商品:
+                            </div>
+                            <div style="width: 300px;float: left;margin: 10px 0;"><img src="${clubRemarks.mainImage}"
+                                width="50"
+                                height="50"> ${clubRemarks.productName}
+                            </div>
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                供应商名称:
+                            </div>
+                            <div style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.shopName}</div>
+                        </c:if>
                     </div>
+                    <c:if test="${not empty clubRemarks.proName}">
+                    <table id="contentTable" class="table table-striped table-bordered table-condensed">
+                    <thead>
+                    <tr>
+                        <th>商品图片</th>
+                        <th>商品名称</th>
+                        <th>报备事由</th>
+                        <th>审核状态</th>
+                        <th>审核人</th>
+                        <th>审核时间</th>
+                    </tr>
+                    <td><img src="${clubRemarks.productMainImage}"
+                             width="50"
+                             height="50"></td>
+                    <td>${clubRemarks.proName}</td>
+                    <td>${clubRemarks.reportText}</td>
+                    <td><c:if test="${clubRemarks.reportStatus eq 1}">已审核</c:if>
+                        <c:if test="${clubRemarks.reportStatus eq 2}">待审核</c:if>
+                        <c:if test="${clubRemarks.reportStatus eq 3}">审核未通过</c:if>
+                    </td>
+                    <td>${clubRemarks.auditName}</td>
+                    <td>${clubRemarks.auditTime}</td>
+                    </thead>
+                    </table>
+                    </c:if>
                     <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
                         <c:if test="${not empty clubRemarks.pinceSensitve}">
-                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-                            价格敏感度 :
-                        </div>
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                价格敏感度 :
+                            </div>
                             <c:if test="${clubRemarks.pinceSensitve eq 1}">
                                 <div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
                             </c:if>
@@ -181,9 +236,9 @@
 
                         </c:if>
                         <c:if test="${not empty clubRemarks.satisfied}">
-                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-                            意向程度：
-                        </div>
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                意向程度：
+                            </div>
                             <c:if test="${clubRemarks.satisfied eq 1}">
                                 <div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
                             </c:if>
@@ -199,9 +254,9 @@
 
                         </c:if>
                         <c:if test="${not empty clubRemarks.followup}">
-                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-                            跟进状态：
-                        </div>
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                跟进状态：
+                            </div>
                             <c:if test="${clubRemarks.followup eq 1}">
                                 <div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
                             </c:if>
@@ -223,14 +278,14 @@
                         </div>
                     </div>
                     <c:if test="${not empty clubRemarks.extra}">
-                    <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-                        <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-                            额外说明:
-                        </div>
-                        <div style="width: 800px;float: left;margin: 10px 0;">
-                                ${clubRemarks.extra}
+                        <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                额外说明:
+                            </div>
+                            <div style="width: 800px;float: left;margin: 10px 0;">
+                                    ${clubRemarks.extra}
+                            </div>
                         </div>
-                    </div>
                     </c:if>
                     <div class="td-text" style="width: 100%;float: left;">
                         <c:if test="${not empty clubRemarks.imageList}">

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

@@ -1,57 +1,59 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-	<title>未注册用户咨询记录</title>
-	<meta name="decorator" content="default"/>
-	<script type="text/javascript">
-		$(document).ready(function() {
-			//$("#name").focus();cmOrderRemarksFormNew.jsp
-			$("#inputForm").validate({
-				submitHandler: function(form){
-					loading('正在提交，请稍等...');
-					form.submit();
-				},
-				errorContainer: "#messageBox",
-				errorPlacement: function(error, element) {
-					$("#messageBox").text("输入有误，请先更正。");
-					if (element.is(":checkbox")||element.is(":radio")||element.parent().is(".input-append")){
-						error.appendTo(element.parent().parent());
-					} else {
-						error.insertAfter(element);
-					}
-				}
-			});
-		});
+    <title>未注册用户咨询记录</title>
+    <meta name="decorator" content="default"/>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            //$("#name").focus();cmOrderRemarksFormNew.jsp
+            $("#inputForm").validate({
+                submitHandler: function (form) {
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function (error, element) {
+                    $("#messageBox").text("输入有误，请先更正。");
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+        });
 
-		function previewFile(url) {
-			var index = url.lastIndexOf(".");
-			var suffix = url.substring(index);
-			if (suffix.startsWith(".png") || suffix.startsWith(".jpg") || suffix.startsWith(".pdf")) {
-				window.open(url, '_blank');
-			} else {
-				var previewUrl = "https://view.officeapps.live.com/op/view.aspx?src="+encodeURIComponent(url);
-				window.open(previewUrl, '_blank');
-			}
-		}
+        function previewFile(url) {
+            var index = url.lastIndexOf(".");
+            var suffix = url.substring(index);
+            if (suffix.startsWith(".png") || suffix.startsWith(".jpg") || suffix.startsWith(".pdf")) {
+                window.open(url, '_blank');
+            } else {
+                var previewUrl = "https://view.officeapps.live.com/op/view.aspx?src=" + encodeURIComponent(url);
+                window.open(previewUrl, '_blank');
+            }
+        }
 
-		function page(n,s){
-			$("#pageNo").val(n);
-			$("#pageSize").val(s);
-			$("#searchForm").submit();
-		}
-	</script>
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+        }
+    </script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
-		<li class="active"><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
-		<li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
-		<li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
-	</ul><br/>
-<form:form id="searchForm" modelAttribute="visit" action="${ctx}/new/user/visit/unregist" 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}"/>
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
+    <li class="active"><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
+    <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
+    <li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
+</ul>
+<br/>
+<form:form id="searchForm" modelAttribute="visit" action="${ctx}/new/user/visit/unregist" 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}"/>
     <div class="flex-wrap">
         <div>
             <label>关键词：</label>
@@ -83,146 +85,200 @@
         </div>
         <div class="item">
             <label class="control-label">添加日期：</label>
-			<form:input path="startAddTime" type="text" maxlength="20" class="input-mini Wdate" value="${visit.startAddTime}" cssStyle="width: 130px"
-						onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-			-
-			<form:input path="endAddTime" type="text" maxlength="20" class="input-mini Wdate" value="${visit.endAddTime}" cssStyle="width: 130px"
-						onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            <form:input path="startAddTime" type="text" maxlength="20" class="input-mini Wdate"
+                        value="${visit.startAddTime}" cssStyle="width: 130px"
+                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            -
+            <form:input path="endAddTime" type="text" maxlength="20" class="input-mini Wdate"
+                        value="${visit.endAddTime}" cssStyle="width: 130px"
+                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
         </div>
         <div class="item">
-			&nbsp;&nbsp;&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
+            &nbsp;&nbsp;&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
         </div>
     </div>
 </form:form>
 <form:form id="inputForm" modelAttribute="visit" action="${ctx}" method="post" class="form-horizontal">
-	<sys:message content="${message}"/>
-	<c:if test="${not empty page.list}">
-	<div style="overflow-x: hidden;word-break:break-all">
-		<c:forEach items="${page.list}" var="visitRemarks" varStatus="remark">
-			<div class="td clear">
-				<div style="font-weight: bold;width: 100%;float: left;">
-<%--					<c:if test="${not empty visitRemarks.oldName}">--%>
-<%--						<span style="float: left;">${visitRemarks.oldName}</span>--%>
-<%--					</c:if>--%>
-<%--					<c:if test="${empty visitRemarks.oldName}">--%>
-<%--						<span style="float: left;">${visitRemarks.serviceName}</span>--%>
-<%--					</c:if>--%>
-                    <span style="float: left;">${visitRemarks.serviceName}</span>
-					<span style="float: left;margin-left:10px;"><fmt:formatDate value="${visitRemarks.addTime}" pattern="yyyy-MM-dd HH:mm"/></span>
-                    <span style="float: left;margin-left:120px;">管理员：${visitRemarks.leaderName}</span>
-                </div>
-				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询人:</div>
-					<div style="width: 150px;float: left;margin: 10px 0;">${visitRemarks.questionMan}</div>
-					<c:if test="${not empty visitRemarks.clubType}">
-						<div style="width: 350px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
-							机构类型：
-						</div>
-						<div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.clubType}</div>
-					</c:if>
-				</div>
-				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">咨询类别:</div>
-					<div style="width: 800px;float: left;margin: 10px 0;">${visitRemarks.consultType}</div>
-				</div>
-				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<c:if test="${not empty visitRemarks.pinceSensitve}">
-						<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-							价格敏感度 :
-						</div>
-						<c:if test="${visitRemarks.pinceSensitve eq 1}">
-							<div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
-						</c:if>
-						<c:if test="${visitRemarks.pinceSensitve eq 2}">
-							<div style="width: 150px;float: left;margin: 10px 0;">适中</div>
-						</c:if>
-						<c:if test="${visitRemarks.pinceSensitve eq 3}">
-							<div style="width: 150px;float: left;margin: 10px 0;">不敏感</div>
-						</c:if>
-						<c:if test="${visitRemarks.pinceSensitve eq 4}">
-							<div style="width: 150px;float: left;margin: 10px 0;">不明确</div>
-						</c:if>
+    <sys:message content="${message}"/>
+    <c:if test="${not empty page.list}">
+        <div style="overflow-x: hidden;word-break:break-all">
+            <c:forEach items="${page.list}" var="visitRemarks" varStatus="remark">
+                <div class="td clear">
+                    <div style="font-weight: bold;width: 100%;float: left;">
+                            <%--					<c:if test="${not empty visitRemarks.oldName}">--%>
+                            <%--						<span style="float: left;">${visitRemarks.oldName}</span>--%>
+                            <%--					</c:if>--%>
+                            <%--					<c:if test="${empty visitRemarks.oldName}">--%>
+                            <%--						<span style="float: left;">${visitRemarks.serviceName}</span>--%>
+                            <%--					</c:if>--%>
+                        <span style="float: left;">${visitRemarks.serviceName}</span>
+                        <span style="float: left;margin-left:10px;"><fmt:formatDate value="${visitRemarks.addTime}"
+                                                                                    pattern="yyyy-MM-dd HH:mm"/></span>
+                        <span style="float: left;margin-left:120px;">管理员：${visitRemarks.leaderName}</span>
+                    </div>
+                    <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+                        <div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                            咨询人:
+                        </div>
+                        <div style="width: 150px;float: left;margin: 10px 0;">${visitRemarks.questionMan}</div>
+                        <c:if test="${not empty visitRemarks.clubType}">
+                            <div style="width: 350px;font-weight: bold;margin: 10px 0;float: left;text-align: right;">
+                                机构类型：
+                            </div>
+                            <div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.clubType}</div>
+                        </c:if>
+                    </div>
+                    <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+                        <div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                            咨询类别:
+                        </div>
+                        <div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.consultType}</div>
+                        <c:if test="${not empty visitRemarks.productName}">
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                咨询商品:
+                            </div>
+                            <div style="width: 300px;float: left;margin: 10px 0;"><img src="${visitRemarks.mainImage}"
+                               width="50"
+                               height="50"> ${visitRemarks.productName}
+                            </div>
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                供应商名称:
+                            </div>
+                            <div style="width: 300px;float: left;margin: 10px 0;">${visitRemarks.shopName}</div>
+                        </c:if>
+                    </div>
+                    <c:if test="${not empty visitRemarks.proName}">
+                        <table id="contentTable" class="table table-striped table-bordered table-condensed">
+                            <thead>
+                            <tr>
+                                <th>商品图片</th>
+                                <th>商品名称</th>
+                                <th>报备事由</th>
+                                <th>审核状态</th>
+                                <th>审核人</th>
+                                <th>审核时间</th>
+                            </tr>
+                            <td><img src="${visitRemarks.productMainImage}"
+                                     width="50"
+                                     height="50"></td>
+                            <td>${visitRemarks.proName}</td>
+                            <td>${visitRemarks.reportText}</td>
+                            <td><c:if test="${visitRemarks.reportStatus eq 1}">已审核</c:if>
+                                <c:if test="${visitRemarks.reportStatus eq 2}">待审核</c:if>
+                                <c:if test="${visitRemarks.reportStatus eq 3}">审核未通过</c:if>
+                            </td>
+                            <td>${visitRemarks.auditName}</td>
+                            <td>${visitRemarks.auditTime}</td>
+                            </thead>
+                        </table>
+                    </c:if>
+                    <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+                        <c:if test="${not empty visitRemarks.pinceSensitve}">
+                            <div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                价格敏感度 :
+                            </div>
+                            <c:if test="${visitRemarks.pinceSensitve eq 1}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
+                            </c:if>
+                            <c:if test="${visitRemarks.pinceSensitve eq 2}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">适中</div>
+                            </c:if>
+                            <c:if test="${visitRemarks.pinceSensitve eq 3}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">不敏感</div>
+                            </c:if>
+                            <c:if test="${visitRemarks.pinceSensitve eq 4}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">不明确</div>
+                            </c:if>
 
-					</c:if>
-					<c:if test="${not empty visitRemarks.satisfied}">
-						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-							意向程度：
-						</div>
-						<c:if test="${visitRemarks.satisfied eq 1}">
-							<div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
-						</c:if>
-						<c:if test="${visitRemarks.satisfied eq 2}">
-							<div style="width: 150px;float: left;margin: 10px 0;">意向一般</div>
-						</c:if>
-						<c:if test="${visitRemarks.satisfied eq 3}">
-							<div style="width: 150px;float: left;margin: 10px 0;">意向平淡</div>
-						</c:if>
-						<c:if test="${visitRemarks.satisfied eq 4}">
-							<div style="width: 150px;float: left;margin: 10px 0;">随便看看</div>
-						</c:if>
+                        </c:if>
+                        <c:if test="${not empty visitRemarks.satisfied}">
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                意向程度：
+                            </div>
+                            <c:if test="${visitRemarks.satisfied eq 1}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
+                            </c:if>
+                            <c:if test="${visitRemarks.satisfied eq 2}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">意向一般</div>
+                            </c:if>
+                            <c:if test="${visitRemarks.satisfied eq 3}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">意向平淡</div>
+                            </c:if>
+                            <c:if test="${visitRemarks.satisfied eq 4}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">随便看看</div>
+                            </c:if>
 
-					</c:if>
-					<c:if test="${not empty visitRemarks.followup}">
-						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-							跟进状态：
-						</div>
-						<c:if test="${visitRemarks.followup eq 1}">
-							<div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
-						</c:if>
-						<c:if test="${visitRemarks.followup eq 2}">
-							<div style="width: 150px;float: left;margin: 10px 0;">跟进完成</div>
-						</c:if>
-						<c:if test="${visitRemarks.followup eq 3}">
-							<div style="width: 150px;float: left;margin: 10px 0;">已放弃</div>
-						</c:if>
+                        </c:if>
+                        <c:if test="${not empty visitRemarks.followup}">
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                跟进状态：
+                            </div>
+                            <c:if test="${visitRemarks.followup eq 1}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
+                            </c:if>
+                            <c:if test="${visitRemarks.followup eq 2}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">跟进完成</div>
+                            </c:if>
+                            <c:if test="${visitRemarks.followup eq 3}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">已放弃</div>
+                            </c:if>
 
-					</c:if>
-				</div>
-				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-					<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">关键词记录:</div>
-					<div style="width: 800px;float: left;margin: 10px 0;">
-						${visitRemarks.remarks}
-					</div>
-				</div>
-				<c:if test="${not empty visitRemarks.extra}">
-					<div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
-						<div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
-							额外说明:
-						</div>
-						<div style="width: 800px;float: left;margin: 10px 0;">
-								${visitRemarks.extra}
-						</div>
-					</div>
-				</c:if>
-				<div class="td-text" style="width: 100%;float: left;">
-					<c:if test="${not empty visitRemarks.imageList}">
-						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">图片:</div>
-						<div style="width: 1000px;float: left;">
-							<c:forEach items="${visitRemarks.imageList}" var="imageUrl" varStatus="remarkImage">
-								<a href="${imageUrl}" target="_blank">
-									<img class="enlarge-pic" style="height: 150px;width: 150px;margin-top: 10px" src="${imageUrl}">&nbsp;
-								</a>
-							</c:forEach>
-						</div>
-					</c:if>
-				</div>
-				<div class="td-text" style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">
-					<c:if test="${not empty visitRemarks.fileList}">
-						<div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">文件:</div>
-						<div style="width: 1000px;float: left;margin: 10px 0;">
-							<c:forEach items="${visitRemarks.fileList}" var="item" varStatus="remarkFile">
-								<p>${item.fileName}&nbsp;&nbsp;&nbsp;&nbsp;
-									<a onclick="previewFile('${item.fileUrl}')" target="_blank">预览</a>&nbsp;&nbsp;&nbsp;&nbsp;
-									<a href="${ctx}/new/user/agency/remarks/download?fileName=${item.fileName}&ossName=${item.ossName}">下载</a></p>
-							</c:forEach>
-						</div>
-					</c:if>
-				</div>
-			</div>
-		</c:forEach>
-	</div>
-	<div class="pagination">${page}</div>
-	</c:if>
+                        </c:if>
+                    </div>
+                    <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+                        <div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                            关键词记录:
+                        </div>
+                        <div style="width: 800px;float: left;margin: 10px 0;">
+                                ${visitRemarks.remarks}
+                        </div>
+                    </div>
+                    <c:if test="${not empty visitRemarks.extra}">
+                        <div class="td-text" style="width: 100%;float: left;margin-top: 20px;">
+                            <div style="width: 80px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                额外说明:
+                            </div>
+                            <div style="width: 800px;float: left;margin: 10px 0;">
+                                    ${visitRemarks.extra}
+                            </div>
+                        </div>
+                    </c:if>
+                    <div class="td-text" style="width: 100%;float: left;">
+                        <c:if test="${not empty visitRemarks.imageList}">
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                图片:
+                            </div>
+                            <div style="width: 1000px;float: left;">
+                                <c:forEach items="${visitRemarks.imageList}" var="imageUrl" varStatus="remarkImage">
+                                    <a href="${imageUrl}" target="_blank">
+                                        <img class="enlarge-pic" style="height: 150px;width: 150px;margin-top: 10px"
+                                             src="${imageUrl}">&nbsp;
+                                    </a>
+                                </c:forEach>
+                            </div>
+                        </c:if>
+                    </div>
+                    <div class="td-text"
+                         style="width: 100%;float: left;margin-top: 20px;border-bottom:1px dashed #999999;padding: 10px 0;">
+                        <c:if test="${not empty visitRemarks.fileList}">
+                            <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
+                                文件:
+                            </div>
+                            <div style="width: 1000px;float: left;margin: 10px 0;">
+                                <c:forEach items="${visitRemarks.fileList}" var="item" varStatus="remarkFile">
+                                    <p>${item.fileName}&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <a onclick="previewFile('${item.fileUrl}')" target="_blank">预览</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <a href="${ctx}/new/user/agency/remarks/download?fileName=${item.fileName}&ossName=${item.ossName}">下载</a>
+                                    </p>
+                                </c:forEach>
+                            </div>
+                        </c:if>
+                    </div>
+                </div>
+            </c:forEach>
+        </div>
+        <div class="pagination">${page}</div>
+    </c:if>
 </form:form>
 </body>
 </html>