更新版本

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

@@ -59,4 +59,14 @@ public interface NewCmClubDao extends CrudDao<NewCmClub> {
 
     void oldname(@Param("oldserviceProviderId")Integer oldserviceProviderId,@Param("clubID")Integer clubID,@Param("oldSpID")Integer oldSpID,@Param("newSpID")Integer newSpID);
     void oldnames(@Param("clubID")Integer clubID,@Param("oldSpID")Integer oldSpID,@Param("newSpID")Integer newSpID);
+
+    List<CmReport> ReportList(CmReport cmReport);
+
+    List<VisitRemarkVo> findRegistLists(CmClubRemarks cmClubRemarks);
+
+    Integer visitorRemarksConut(Integer reportID);
+
+    Integer clubRemarksConut(Integer reportID);
+
+    void updateRemarks(@Param("reportID")Integer reportID,@Param("auditText")String auditText,@Param("status")Integer status);
 }

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

@@ -141,9 +141,16 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
 
     private String auditTime;//审核时间
 
+    private Integer reportID;
 
 
+    public Integer getReportID() {
+        return reportID;
+    }
 
+    public void setReportID(Integer reportID) {
+        this.reportID = reportID;
+    }
 
     public String getOldName() {
         return oldName;

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

@@ -0,0 +1,194 @@
+package com.caimei.modules.user.entity;
+
+import com.thinkgem.jeesite.common.persistence.DataEntity;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/8/10
+ */
+public class CmReport extends DataEntity<CmReport> {
+
+    private Integer reportId;
+
+    private Integer remarksID; //咨询记录ID
+
+    private Integer productID; //关联商品
+
+    private Integer clubID;  //报备机构ID
+
+    private Integer visitorID; //未注册机构咨询ID
+
+    private String reportName; //报备人
+
+    private String reportText;  //报备事由
+
+    private String addTime; //创建时间
+
+    private Integer status; //状态 1.已审核 2.待审核 3.审核未通过
+
+    private String auditName; //审核人
+
+    private String auditTime; //审核时间
+
+    private String productName; //咨询商品名称
+
+    private String mainImage;//咨询商品主图
+
+    private String clubName;//机构名称
+
+    private String startAddTime;
+
+
+    private String endAddTime;
+
+    private Integer newDeal;//新分配机构状态 0.否，1.是
+
+    private String auditText;
+
+
+    public Integer getRemarksID() {
+        return remarksID;
+    }
+
+    public void setRemarksID(Integer remarksID) {
+        this.remarksID = remarksID;
+    }
+
+    public Integer getProductID() {
+        return productID;
+    }
+
+    public void setProductID(Integer productID) {
+        this.productID = productID;
+    }
+
+    public Integer getClubID() {
+        return clubID;
+    }
+
+    public void setClubID(Integer clubID) {
+        this.clubID = clubID;
+    }
+
+    public String getReportName() {
+        return reportName;
+    }
+
+    public void setReportName(String reportName) {
+        this.reportName = reportName;
+    }
+
+    public String getReportText() {
+        return reportText;
+    }
+
+    public void setReportText(String reportText) {
+        this.reportText = reportText;
+    }
+
+    public String getAddTime() {
+        return addTime;
+    }
+
+    public void setAddTime(String addTime) {
+        this.addTime = addTime;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getAuditName() {
+        return auditName;
+    }
+
+    public void setAuditName(String auditName) {
+        this.auditName = auditName;
+    }
+
+    public String getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(String auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public Integer getVisitorID() {
+        return visitorID;
+    }
+
+    public void setVisitorID(Integer visitorID) {
+        this.visitorID = visitorID;
+    }
+
+    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 getClubName() {
+        return clubName;
+    }
+
+    public void setClubName(String clubName) {
+        this.clubName = clubName;
+    }
+
+    public Integer getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(Integer reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getStartAddTime() {
+        return startAddTime;
+    }
+
+    public void setStartAddTime(String startAddTime) {
+        this.startAddTime = startAddTime;
+    }
+
+    public String getEndAddTime() {
+        return endAddTime;
+    }
+
+    public void setEndAddTime(String endAddTime) {
+        this.endAddTime = endAddTime;
+    }
+
+    public Integer getNewDeal() {
+        return newDeal;
+    }
+
+    public void setNewDeal(Integer newDeal) {
+        this.newDeal = newDeal;
+    }
+
+    public String getAuditText() {
+        return auditText;
+    }
+
+    public void setAuditText(String auditText) {
+        this.auditText = auditText;
+    }
+}

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

@@ -195,4 +195,12 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
 
         newCmClubDao.oldnames(clubID,oldSpID,newSpID);
     }
+
+    public Page<CmReport> ReportList(Page<CmReport> cmReports ,CmReport cmReport){
+       cmReport.setPage(cmReports);
+       List<CmReport>list= newCmClubDao.ReportList(cmReport);
+       cmReports.setList(list);
+       return cmReports;
+    }
+
 }

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

@@ -12,6 +12,8 @@ import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.sys.utils.UploadImageUtils;
 import com.caimei.modules.user.aop.OperationLogAnnotation;
 import com.caimei.modules.user.dao.MessageCenterDao;
+import com.caimei.modules.user.dao.NewCmClubDao;
+import com.caimei.modules.user.dao.VisitRemarkDao;
 import com.caimei.modules.user.entity.*;
 import com.caimei.modules.user.service.*;
 import com.caimei.utils.AppKeys;
@@ -28,6 +30,7 @@ import com.thinkgem.jeesite.common.web.BaseController;
 import com.thinkgem.jeesite.modules.sys.security.SystemAuthorizingRealm;
 import com.thinkgem.jeesite.modules.sys.utils.UserUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -89,6 +92,11 @@ public class AgencyController extends BaseController {
     private NewShopOrderDao newShopOrderDao;
     @Autowired
     private WeChatService weChatService;
+    @Autowired
+    private NewCmClubDao newCmClubDao;
+@Autowired
+private VisitRemarkDao visitRemarkDao;
+
     @ModelAttribute
     public NewCmClub get(@RequestParam(required = false) String id) {
         NewCmClub entity = null;
@@ -1164,6 +1172,21 @@ public class AgencyController extends BaseController {
         return "modules/userNew/cmRegistRemarksList";
     }
 
+    @RequestMapping("cmRegistReportList")
+    public String cmRegistReportList(CmClubRemarks cmClubRemarks, HttpServletRequest request, HttpServletResponse response, Model model) {
+        List<VisitRemarkVo> remarksLists = newCmClubDao.findRegistLists(cmClubRemarks);
+        List<CmClubRemarks> remarksList = newCmClubDao.findRegistList(cmClubRemarks);
+        cmClubRemarks.setConsults(newCmClubService.findConsults());
+        cmClubRemarks.setTeams(newCmClubService.findTeams());
+        model.addAttribute("cmClubRemarks", cmClubRemarks);
+        model.addAttribute("remarksList", remarksList);
+        model.addAttribute("remarksLists", remarksLists);
+        return "modules/userNew/cmRegistReportList";
+    }
+
+
+
+
     /**
      * 资料备注列表
      */
@@ -1214,4 +1237,31 @@ public class AgencyController extends BaseController {
         return "redirect:" + Global.getAdminPath() + "/new/user/agency/cmrenaksList";
     }
 
+
+    @RequestMapping("ReportList")
+    public String ReportList(CmReport cmReport,HttpServletRequest request, HttpServletResponse response, Model model) {
+
+        Page<CmReport> page = newCmClubService.ReportList(new Page<CmReport>(request, response,20), cmReport);
+        model.addAttribute("page",page);
+        model.addAttribute("cmReport", cmReport);
+        return "modules/userNew/ReportList";
+    }
+    @ResponseBody
+    @RequestMapping("ReportCount")
+    public Map<String, Object> ReportCount(Integer reportId,String auditText,Integer status,Model model) {
+        Map<String, Object> map = new HashedMap();
+       Integer clubCount= newCmClubDao.clubRemarksConut(reportId);
+        Integer visitorCount=newCmClubDao.visitorRemarksConut(reportId);
+         if((clubCount+=visitorCount)>0){
+             map.put("success", false);
+             newCmClubDao.updateRemarks(reportId,auditText,status);
+             System.out.println(">>>>>>>>"+(clubCount+=visitorCount));
+         }else {
+             System.out.println(">>>>>>>>"+(clubCount+=visitorCount));
+             map.put("success", true);
+         }
+        return map;
+    }
+
+
 }

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

@@ -476,7 +476,7 @@
         # 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 cm_club_report ccre ON  ccre.Id= ccr.reportID
         LEFT JOIN product p ON p.productID = ccr.productID
         LEFT JOIN shop sh ON sh.shopID = p.shopID
         <where>
@@ -501,6 +501,9 @@
             <if test="newDeal !=null">
                 and c.newDeal=#{newDeal}
             </if>
+            <if test="reportID !=null">
+                and ccr.reportID=#{reportID}
+            </if>
         </where>
         ORDER BY ADDTIME DESC
         <choose>
@@ -581,4 +584,90 @@
           AND serviceProviderId = #{oldSpID}
     </update>
 
+    <select id="ReportList" resultType="com.caimei.modules.user.entity.CmReport">
+        SELECT ccr.Id as reportId, p.mainImage AS mainImage,p.`name` AS productName,c.`name` AS clubName,ccr.reportName AS reportName,
+        ccr.reportText AS reportText,ccr.addTime AS ADDTIME,ccr.status AS STATUS,ccr.auditName AS auditName,ccr.auditTime AS auditTime,c.newDeal,ccr.auditText
+        FROM cm_club_report ccr
+        LEFT JOIN product p ON p.productID = ccr.productID
+        LEFT JOIN club c ON c.clubID = ccr.clubID
+        <where>
+        <if test="reportId!=null and reportId!=''">
+            AND  ccr.id=#{reportId}
+        </if>
+            <if test="productName!=null and productName!=''">
+                AND p.name LIKE concat('%',#{productName},'%')
+            </if>
+            <if test="clubName!=null and clubName!=''">
+                AND c.name LIKE concat('%',#{clubName},'%')
+            </if>
+            <if test="newDeal!=null">
+                AND c.newDeal =#{newDeal}
+            </if>
+            <if test="startAddTime != null and startAddTime != ''">
+                and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
+            </if>
+            <if test="endAddTime != null and endAddTime != ''">
+                and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
+            </if>
+
+        </where>
+    </select>
+
+    <select id="findRegistLists" 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
+        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 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.Id= ccr.reportID
+        LEFT JOIN product p ON p.productID = ccr.productID
+        LEFT JOIN shop sh ON sh.shopID = p.shopID
+        LEFT JOIN club c ON c.clubID = ccr.clubID
+        <where>
+            <if test="remarks != null and remarks !=''">
+                AND ccr.remarks LIKE concat('%',#{remarks},'%')
+            </if>
+            <if test="leaderId != null">
+                and csr.leaderId = #{leaderId}
+            </if>
+            <if test="serviceProviderId != null">
+                and csg.serviceId = #{serviceProviderId}
+            </if>
+            <if test="startAddTime != '' and startAddTime != null">
+                and ccr.addTime <![CDATA[  >  ]]> #{startAddTime}
+            </if>
+            <if test="endAddTime != '' and endAddTime != null">
+                and ccr.addTime <![CDATA[  <  ]]> #{endAddTime}
+            </if>
+            <if test="reportID !=null">
+                and ccr.reportID=#{reportID}
+            </if>
+            <if test="newDeal !=null">
+                and c.newDeal=#{newDeal}
+            </if>
+            and ccr.remarks IS NOT NULL
+        </where>
+        ORDER BY ADDTIME DESC
+    </select>
+
+    <select id="visitorRemarksConut" resultType="integer">
+        SELECT COUNT(*) FROM cm_visitor_remarks WHERE reportID=#{reportID}
+    </select>
+
+    <select id="clubRemarksConut" resultType="integer">
+        SELECT COUNT(*) FROM cm_club_remarks WHERE reportID=#{reportID}
+    </select>
+
+<update id="updateRemarks">
+    UPDATE cm_club_report SET status=#{status}, auditText=#{auditText},auditTime=now() WHERE id=#{reportID}
+</update>
+
 </mapper>

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

@@ -86,7 +86,7 @@
         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 cm_club_report ccre ON  ccre.Id= ccr.reportID
         LEFT JOIN product p ON p.productID = ccr.productID
         LEFT JOIN shop sh ON sh.shopID = p.shopID
         <where>

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

@@ -0,0 +1,452 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
+<html>
+<head>
+    <title>机构列表</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .reg-row .new-tag.active {
+            border: 1px solid #de5801
+        }
+
+        .reg-row {
+            margin-bottom: 20px
+        }
+
+        .reg-row .reg-label {
+            display: inline-block;
+            width: 120px;
+            text-align: right;
+            font-size: 13px
+        }
+
+        .the-oradio {
+            display: inline-block;
+            vertical-align: top
+        }
+
+        .the-oradio div {
+            width: 85px;
+            display: inline-block;
+            font-size: 12px;
+            color: #666
+        }
+
+        .the-oradio div input[type="radio"] {
+            width: 17px;
+            height: 17px;
+            margin-right: 5px;
+            vertical-align: text-top
+        }
+
+        .med-option {
+            display: block;
+            margin: 10px 0 0 125px
+        }
+
+        .reg-row .business-license {
+            position: relative;
+            display: inline-block;
+            width: 166px;
+            height: 123px;
+            border-radius: 6px;
+            margin: 18px 0 0 125px
+        }
+
+        #medicalPracticeLicenseImgPreview {
+            display: inline-block
+        }
+
+        .qualification {
+            margin-top: 20px
+        }
+
+        .reg-row .tags-area {
+            display: inline-block;
+            width: 420px
+        }
+
+        .reg-row .new-tag {
+            display: inline-block;
+            width: 70px;
+            border: 1px solid #e5e5e5;
+            border-radius: 6px;
+            padding: 5px;
+            margin-right: 14px;
+            margin-bottom: 14px;
+            text-align: center;
+            font-size: 10px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            cursor: pointer
+        }
+
+        .reg-row .tags-operate {
+            margin-left: 125px
+        }
+
+        .reg-row .reg-input {
+            width: 336px;
+            height: 32px;
+            padding: 0 8px;
+            margin-right: 20px;
+            border: 1px solid #dcdcdc;
+            border-radius: 6px
+        }
+
+        .reg-row .tags-operate .tag-input {
+            width: 159px;
+            margin-right: 13px;
+            display: none;
+            vertical-align: top
+        }
+
+        .reg-row .tags-operate .tag-add {
+            line-height: 20px;
+            vertical-align: middle;
+            margin-bottom: 0;
+            vertical-align: top
+        }
+
+        .reg-row .tags-area {
+            vertical-align: top
+        }
+
+        .tag-add {
+            display: none
+        }
+
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+
+        .modal {
+            width: 700px;
+            margin-left: -350px
+        }
+
+        #myModal {
+            display: none
+        }
+
+        .modal-body {
+            max-height: 300px !important
+        }
+
+        .modal.fade.in {
+            top: 0 !important
+        }
+
+        #btnSubmit {
+            margin-left: 20px
+        }
+
+        .flex-wrap .item {
+            margin-right: 20px
+        }
+
+        #auditBox {
+            padding: 20px;
+            line-height: 30px
+        }
+
+        #auditBox .bd-row {
+            display: flex;
+            margin-bottom: 15px
+        }
+
+        #auditBox .bd-row > span {
+            display: inline-block;
+            width: 60px
+        }
+
+        #auditBox .auditCheckBox {
+            width: 250px
+        }
+
+        #auditBox .auditCheckBox label {
+            margin: 0 5px 5px 0
+        }
+
+        #auditBox .auditCheckBox input {
+            display: none
+        }
+
+        #auditBox .auditCheckBox input + span {
+            display: inline-block;
+            line-height: 24px;
+            padding: 0 12px;
+            border: 1px solid #666;
+            border-radius: 5px
+        }
+
+        #auditBox .auditCheckBox input:checked + span {
+            background-color: #E6633A
+        }
+
+        #alertModal {
+            width: 300px;
+            height: 200px;
+            border: 1px solid #ebebeb;
+            border-radius: 10px;
+            position: fixed;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            margin: auto;
+            background: #FFFFFF;
+            display: none
+        }
+
+        #alertModal .title {
+            height: 50px;
+            line-height: 50px;
+            font-size: 14px;
+            font-weight: bold;
+            text-align: center;
+            position: relative;
+            border-bottom: 1px solid #EBEBEB
+        }
+
+        #alertModal .close {
+            width: 50px;
+            height: 50px;
+            display: block;
+            position: absolute;
+            right: 0;
+            top: 0;
+            line-height: 50px;
+            color: #000;
+            font-weight: bold;
+            text-align: center;
+            font-style: normal;
+            font-size: 18px
+        }
+
+        #alertModal .alert-content {
+            width: 260px;
+            height: 60px;
+            padding: 20px
+        }
+
+        #alertModal .alertModal-btn {
+            width: 260px;
+            height: 49px;
+            padding: 0 20px;
+            border-top: 1px solid #EBEBEB
+        }
+
+        #alertModal .alertModal-btn button {
+            float: right;
+            margin: 5px
+        }
+    </style>
+</head>
+<body>
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
+    <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
+    <li class="active"><a href="${ctx}/new/user/agency/ReportList">报备列表</a></li>
+    <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
+    <li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
+</ul>
+<form:form id="searchForm" modelAttribute="cmReport" action="${ctx}/new/user/agency/ReportList" 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 class="item">
+            <label>ID：</label>
+            <form:input path="reportId" htmlEscape="false" maxlength="50" class="input-medium"/>
+        </div>
+        <div class="item">
+            <label>商品名称：</label>
+            <form:input path="productName" htmlEscape="false" maxlength="50" class="input-medium"/>
+        </div>
+        <div class="item">
+            <label>机构名称：</label>
+            <form:input path="clubName" htmlEscape="false" maxlength="50" class="input-medium"/>
+        </div>
+
+        <div class="item">
+            <label>提交时间：</label>
+            <form:input path="startAddTime" type="text" maxlength="20" class="input-mini Wdate" value="${startTime}"
+                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            -
+            <form:input path="endAddTime" 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>
+    </div>
+</form:form>
+<sys:message content="${message}"/>
+<table id="contentTable" class="table table-striped table-bordered table-condensed">
+    <thead>
+    <tr>
+        <th>ID</th>
+        <th>商品图片</th>
+        <th>商品名称</th>
+        <th>机构名称</th>
+        <th>报备人</th>
+        <th>报备事由</th>
+        <th>创建时间</th>
+        <th>审核状态</th>
+        <th>审核人</th>
+        <th>审核时间</th>
+        <th>操作</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${page.list}" var="list">
+        <tr>
+            <td>
+                    ${list.reportId}
+            </td>
+            <td>
+                <c:if test="${not empty list.mainImage}">
+                    <img src="${list.mainImage}"
+                         width="50"
+                         height="50">
+                </c:if>
+                <c:if test="${empty list.mainImage}">
+                    -----
+                </c:if>
+            </td>
+            <td>
+                <c:if test="${not empty list.productName}">
+                    ${list.productName}
+                </c:if>
+                <c:if test="${empty list.productName}">
+                    -----
+                </c:if>
+            </td>
+
+            <td>
+                <c:if test="${not empty list.clubName}">
+                    ${list.clubName}<c:if test="${list.newDeal eq 1}"><span style="color: red">(新分配)</span></c:if>
+                </c:if>
+                <c:if test="${empty list.clubName}">
+                    -----
+                </c:if>
+
+            </td>
+            <td>
+                    ${list.reportName}
+            </td>
+            <td>
+                    ${list.reportText}
+            </td>
+            <td>
+                    ${list.addTime}
+            </td>
+            <td>
+                <c:if test="${empty list.auditText}">
+                <c:if test="${list.status eq 1}"><span style="color: #00aa00">已审核 </span></c:if>
+                <c:if test="${list.status eq 2}"><span style="color: red">待审核</span></c:if>
+                <c:if test="${list.status eq 3}">审核未通过</c:if>
+                </c:if>
+                <c:if test="${not empty list.auditText}">
+                    <c:if test="${list.status eq 1}"><a href="javascript:void(0)" onclick="audit('${list.auditText}')" style="color: #00aa00">已审核</a></c:if>
+                    <c:if test="${list.status eq 2}"><a href="javascript:void(0)" onclick="audit(${list.auditText})" style="color: red">待审核</a></c:if>
+                    <c:if test="${list.status eq 3}"><a href="javascript:void(0)" onclick="audit(${list.auditText})">审核未通过</a></c:if>
+                </c:if>
+
+            </td>
+            <td>${list.auditName} </td>
+            <td>${list.auditTime}</td>
+            <td>
+                <a href="javascript:void(0)" onclick="auditShop(${list.reportId})">审核</a>
+                <a href="${ctx}/new/user/agency/cmRegistReportList?reportID=${list.reportId}">查看</a>
+                <a href="${ctx}/new/user/agency/form">删除</a>
+            </td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>
+<div class="pagination">${page}</div>
+
+<script type="text/javascript">
+
+
+    function auditShop(reportId) {
+        var htmls = "<div id='auditBox'>"
+            + "   <div class='bd-row'>"
+            + "  该报备未关联任何咨询记录，无需审核。"
+            + "   </div>";
+
+        var html = "<div id='auditBox'>"
+            + "   <div class='bd-row'>"
+            + "       <span><font color='red'>*</font>审核：</span>"
+            + "       <select name='auditStatus' id='auditStatus'>"
+            + "           <option value='1'>审核通过</option>"
+            + "           <option value='3'>审核未通过</option>"
+            + "       <select/>"
+            + "   </div>"
+            + "   <div id='auditNopass'>"
+            + "       <div class='bd-row'>"
+            + "           <span></span>"
+            + "           <div class='auditNote'>"
+            + "               <textarea name='auditNote' placeholder='不超过200个字'></textarea>"
+            + "           </div>"
+            + "       </div>"
+            + "   </div>"
+            + "</div>";
+        var submit = function (v, h, f) {
+            if (f.auditNote.length > 200) {
+                $.jBox.tip("内容过长", 'error', {focusId: "auditNote"});
+                return false;
+            }
+            console.log(reportId)
+            $.post("${ctx}/new/user/agency/ReportCount", {
+                'reportId': reportId,
+                'auditText': f.auditNote,
+                'status': f.auditStatus
+            }, function (data) {
+                console.log(data.success)
+                console.log(true == data.success)
+                if (true == data.success) {
+                    $.jBox(htmls, {title: "提示"});
+
+                }else {
+                    location.reload()
+                }
+            }, "JSON");//这里返回的类型有：json,html,xml,text
+        };
+        $.jBox(html, {title: "审核", submit: submit});
+    }
+
+    function audit(auditText){
+        console.log(111)
+        var html = "<div id='auditBox'>"
+            + "   <div class='bd-row'>"
+            +   auditText
+            + "   </div>";
+        $.jBox(html, {title: "审核"});
+    }
+
+    // $(document).on("change", "#auditStatus", function () {
+    //     if ($("#auditStatus").val() == 2) {
+    //         $("#auditNopass").show();
+    //     } else {
+    //         $("#auditNopass").hide();
+    //     }
+    // });
+</script>
+</body>
+</html>

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

@@ -74,6 +74,7 @@
 <ul class="nav nav-tabs">
     <li class="active"><a href="${ctx}/new/user/agency/regist">已注册用户咨询记录</a></li>
     <li><a href="${ctx}/new/user/visit/unregist">未注册用户咨询记录</a></li>
+    <li><a href="${ctx}/new/user/agency/ReportList">报备列表</a></li>
     <li><a href="${ctx}/consult/type/cmConsulttype/">咨询类别设置</a></li>
     <li><a href="${ctx}/new/user/agency/cmrenaksList">关键词库</a></li>
 </ul>

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

@@ -0,0 +1,511 @@
+<%@ page contentType="text/html;charset=UTF-8" %>
+<%@ 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);
+                    }
+                }
+            });
+        });
+
+        function getmember() {
+            var leaderId = $("#leaderId").val();
+            if (leaderId > 0) {
+                $.get("${ctx}/new/user/agency/group", {'leaderId': leaderId}, function (data) {
+                    console.log(data);
+                    var opts = "<option value='" + data[0].serviceProviderID + "'>" + data[0].name + "</option>";
+                    if (data.length > 1) {
+                        for (let i = 1; i < data.length; i++) {
+                            opts += "<option value='" + data[i].serviceProviderID + "' >" + data[i].name + "</option>";
+                        }
+                    }
+                    $("#findgroup").html('').append(opts);
+                });
+            } else {
+                $("#findgroup").html('');
+            }
+        }
+
+        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();
+            return false;
+        }
+    </script>
+    <style>
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+    </style>
+</head>
+<body>
+<ul class="nav nav-tabs">
+
+    <li><a href="${ctx}/new/user/agency/ReportList">报备列表</a></li>
+    <li class="active"><a href="${ctx}/new/user/agency/cmRegistReportList?reportID=${cmClubRemarks.reportID}">详情</a></li>
+
+</ul>
+<br/>
+<form:form id="searchForm" modelAttribute="cmClubRemarks" action="${ctx}/new/user/agency/cmRegistReportList?reportID=${cmClubRemarks.reportID}" 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>
+            <form:input path="remarks" htmlEscape="false" class="input-medium" maxlength="10"/>
+        </div>
+        <div class="item">
+            <label>咨询类别：</label>
+            <form:select path="consult" class="input-medium">
+                <form:option value="" label="全部"/>
+                <c:forEach items="${cmClubRemarks.consults}" var="consults">
+                    <form:option value="${consults.id}">${consults.className}</form:option>
+                </c:forEach>
+            </form:select>
+        </div>
+        <div class="item">
+            <label>机构名称：</label>
+            <form:input path="clubName" class="input-medium" maxlength="50"/>
+        </div>
+        <div class="item">
+            <label>小组：</label>
+            <form:select path="leaderId" class="input-medium" onchange="getmember()">
+                <form:option value="" label="全部"/>
+                <c:forEach items="${cmClubRemarks.teams}" var="team">
+                    <form:option value="${team.leaderId}">${team.leaderName}</form:option>
+                </c:forEach>
+            </form:select>
+        </div>
+        <div class="item">
+            <label>组员：</label>
+            <form:select path="serviceProviderId" class="input-medium" id="findgroup">
+                <form:option value="" label="全部"/>
+            </form:select>
+        </div>
+        <div class="item">
+            <label class="control-label">添加日期：</label>
+            <form:input path="startAddTime" type="text" maxlength="20" class="input-mini Wdate"
+                        value="${cmClubRemarks.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="${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>
+    </div>
+    <sys:message content="${message}"/>
+    <c:if test="${not empty remarksList}">
+        <div style="overflow-x: hidden;word-break:break-all">
+            <c:forEach items="${remarksList}" 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>--%>
+                        <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>
+                        <span style="float: left;margin-left:120px;">管理员：${clubRemarks.leaderName}</span>
+                    </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>
+                        <div style="width: 150px;float: left;margin: 10px 0;">${clubRemarks.questionMan}</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;">${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>
+                        </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;">${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>
+                            <c:if test="${clubRemarks.pinceSensitve eq 1}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">敏感</div>
+                            </c:if>
+                            <c:if test="${clubRemarks.pinceSensitve eq 2}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">适中</div>
+                            </c:if>
+                            <c:if test="${clubRemarks.pinceSensitve eq 3}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">不敏感</div>
+                            </c:if>
+                            <c:if test="${clubRemarks.pinceSensitve eq 4}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">不明确</div>
+                            </c:if>
+
+                        </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>
+                            <c:if test="${clubRemarks.satisfied eq 1}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">意向强烈</div>
+                            </c:if>
+                            <c:if test="${clubRemarks.satisfied eq 2}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">意向一般</div>
+                            </c:if>
+                            <c:if test="${clubRemarks.satisfied eq 3}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">意向平淡</div>
+                            </c:if>
+                            <c:if test="${clubRemarks.satisfied eq 4}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">随便看看</div>
+                            </c:if>
+
+                        </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>
+                            <c:if test="${clubRemarks.followup eq 1}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">跟进中</div>
+                            </c:if>
+                            <c:if test="${clubRemarks.followup eq 2}">
+                                <div style="width: 150px;float: left;margin: 10px 0;">跟进完成</div>
+                            </c:if>
+                            <c:if test="${clubRemarks.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: 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.remarks}
+                        </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>
+                        </div>
+                    </c:if>
+                    <div class="td-text" style="width: 100%;float: left;">
+                        <c:if test="${not empty clubRemarks.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="${clubRemarks.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 clubRemarks.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="${clubRemarks.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 test="${not empty remarksLists}">
+        <div style="overflow-x: hidden;word-break:break-all">
+            <c:forEach items="${remarksLists}" 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.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 test="${empty page.list}">
+        <font size="3" style="text-align: center;display: block;line-height: 80px;" color="#0066CC">暂无任何备注..</font>
+    </c:if>
+</form:form>
+</body>
+</html>