Trang chủ Khám phá Trợ giúp
Đăng nhập
caimei365
/
caimei365-manager
3
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu khéo về 0 Wiki
Browse Source

用户咨询记录添加查询

huangzhiguo 2 năm trước cách đây
mục cha
64111d6837
commit
d264e7e22d
4 tập tin đã thay đổi với 69 bổ sung và 40 xóa
Split View Hiển thị tình trạng sai khác
  1. 13 0
      src/main/java/com/caimei/modules/user/entity/CmClubRemarks.java
  2. 4 0
      src/main/java/com/caimei/modules/user/service/NewCmClubService.java
  3. 4 1
      src/main/resources/mappings/modules/user/NewCmClubMapper.xml
  4. 48 39
      src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp

+ 13 - 0
src/main/java/com/caimei/modules/user/entity/CmClubRemarks.java
Xem Tập Tin 

@@ -45,6 +45,11 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
 
     private List<CmConsulttype> consults;
 
     //记录的咨询类别
 
     private String consultType;
 
+
 
+    /**
 
+     * 手机号
 
+     */
 
+    private String contractMobile;
 
     /**
 
      * 咨询类别
 
      */
 
@@ -212,6 +217,14 @@ public class CmClubRemarks extends DataEntity<CmClubRemarks> {
 
         this.consultType = consultType;
 
     }
 
 
+    public String getContractMobile() {
 
+        return contractMobile;
 
+    }
 
+
 
+    public void setContractMobile(String contractMobile) {
 
+        this.contractMobile = contractMobile;
 
+    }
 
+
 
     public String getStartAddTime() {
 
         return startAddTime;
 
     }

+ 4 - 0
src/main/java/com/caimei/modules/user/service/NewCmClubService.java
Xem Tập Tin 

@@ -11,6 +11,7 @@ import com.caimei.modules.oss.service.CmOssArchiveService;
 
 import com.caimei.modules.oss.utils.OSSUtils;
 
 import com.caimei.modules.project.model.ServiceProviderModel;
 
 import com.caimei.modules.user.entity.*;
 
+import com.caimei.utils.AppUtils;
 
 import com.thinkgem.jeesite.common.utils.StringUtils;
 
 import org.apache.commons.collections.CollectionUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -145,6 +146,9 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
 
             List<String> imageList = newCmClubDao.getRemarksImageList(remarks.getRemarksId());
 
             List<RemarksFileVo> fileList = newCmClubDao.getRemarksFileList(remarks.getRemarksId());
 
             fileList.forEach(f -> f.setFileUrl(OSSUtils.getOssUrl(f.getOssName())));
 
+            if (StringUtils.isNotBlank(remarks.getMainImage())) {
 
+                remarks.setMainImage(AppUtils.getImageURL("product", remarks.getMainImage(), 0, ""));
 
+            }
 
             remarks.setImageList(imageList);
 
             remarks.setFileList(fileList);
 
         });

+ 4 - 1
src/main/resources/mappings/modules/user/NewCmClubMapper.xml
Xem Tập Tin 

@@ -492,7 +492,7 @@
 
         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,c.newDeal,
 
+        clubName,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,c.newDeal,c.contractMobile,
 
         (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,
 
@@ -516,6 +516,9 @@
 
             <if test="clubId != null">
 
                 AND c.clubID = #{clubId}
 
             </if>
 
+            <if test="contractMobile != null and contractMobile != ''">
 
+                AND c.contractMobile = #{contractMobile}
 
+            </if>
 
             <if test="clubName !=null and clubName !=''">
 
                 AND c.Name like concat('%',#{clubName},'%')
 
             </if>

+ 48 - 39
src/main/webapp/WEB-INF/views/modules/userNew/cmRegistRemarksList.jsp
Xem Tập Tin 

@@ -1,3 +1,4 @@
 
+
 
 <%@ page contentType="text/html;charset=UTF-8" %>
 
 <%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 
 <html>
 
@@ -111,6 +112,10 @@
 
             <label>机构名称：</label>
 
             <form:input path="clubName" class="input-medium" maxlength="50"/>
 
         </div>
 
+        <div class="item">
 
+            <label>手机号：</label>
 
+            <form:input path="contractMobile" class="input-medium" maxlength="11"/>
 
+        </div>
 
         <div class="item">
 
             <label>小组：</label>
 
             <form:select path="leaderId" class="input-medium" onchange="getmember()">
 
@@ -168,10 +173,14 @@
 
                         <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 style="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.contractMobile}</div>
 
                         <div style="width: 100px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 
                             机构名称：
 
                         </div>
 
@@ -184,53 +193,53 @@
 
                         </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 style="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>
 
+                        <div style="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 style="width: 90px;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}
 
+                                                                                       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 style="width: 300px;font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 
                                 供应商名称:${clubRemarks.shopName}
 
 
                             </div>
 
-<%--                            <span style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.shopName}</span>--%>
 
+                            <%--                            <span style="width: 300px;float: left;margin: 10px 0;">${clubRemarks.shopName}</span>--%>
 
                         </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>
 
+                        <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 style="font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 
                                 价格敏感度 :
 
                             </div>
 
                             <c:if test="${clubRemarks.pinceSensitve eq 1}">
 
@@ -282,7 +291,7 @@
 
                         </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="font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 
                             关键词记录:
 
                         </div>
 
                         <div style="width: 800px;float: left;margin: 10px 0;">
 
@@ -291,7 +300,7 @@
 
                     </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 style="font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 
                                 额外说明:
 
                             </div>
 
                             <div style="width: 800px;float: left;margin: 10px 0;">
 
@@ -301,7 +310,7 @@
 
                     </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 style="font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 
                                 图片:
 
                             </div>
 
                             <div style="width: 1000px;float: left;">
 
@@ -317,7 +326,7 @@
 
                     <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 style="font-weight: bold;margin: 10px 0;float: left;text-align: right;margin-right: 10px;">
 
                                 文件:
 
                             </div>
 
                             <div style="width: 1000px;float: left;margin: 10px 0;">
 
@@ -335,9 +344,9 @@
 
         </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>--%>
 
+    <%--    <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>