bug修改

dgtly-goods/dgtly-goods-admin/src/main/resources/templates/goods/info/edit.html

@@ -540,7 +540,9 @@
             });
             //隐藏选择图片按钮
             $(".btn.btn-white.btn-file").hide();
-            $(".thumbnail.slideshow_span").hide();
+            // $(".thumbnail.slideshow_span").hide();
+            $(".close-link").hide();
+            $("#btn-slideshow-add").hide();
             $("#btn-size-add").hide();
             $("#btn-color-add").hide();
             //禁用富文本编辑器

dgtly-member/dgtly-member-admin/src/main/java/com/dgtly/notice/controller/NoticeDemandController.java

@@ -1,6 +1,8 @@
 package com.dgtly.notice.controller;
 
 import java.util.List;
+
+import com.dgtly.system.service.ISysDictDataService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,6 +35,8 @@ public class NoticeDemandController extends BaseController
 
     @Autowired
     private INoticeDemandService noticeDemandService;
+    @Autowired
+    private ISysDictDataService dictDataService;
 
     @RequiresPermissions("notice:demand:view")
     @GetMapping()
@@ -63,6 +67,9 @@ public class NoticeDemandController extends BaseController
     public AjaxResult export(NoticeDemand noticeDemand)
     {
         List<NoticeDemand> list = noticeDemandService.selectNoticeDemandList(noticeDemand);
+        for (NoticeDemand nd:list) {
+            nd.setStatus(dictDataService.selectDictLabel("conduct_status",nd.getStatus()));
+        }
         ExcelUtil<NoticeDemand> util = new ExcelUtil<NoticeDemand>(NoticeDemand.class);
         return util.exportExcel(list, "demand");
     }

dgtly-member/dgtly-member-admin/src/main/java/com/dgtly/notice/controller/NoticeSupplyController.java

@@ -126,6 +126,7 @@ public class NoticeSupplyController extends BaseController
     public String details(@PathVariable("id") Long id, ModelMap mmap)
     {
         NoticeSupply noticeSupply = noticeSupplyService.selectNoticeSupplyById(id);
+
         mmap.put("noticeSupply", noticeSupply);
         return prefix + "/details";
     }

dgtly-member/dgtly-member-admin/src/main/resources/templates/notice/supply/details.html

@@ -10,17 +10,17 @@
         <form class="form-horizontal m" id="form-supply-edit" th:object="${noticeSupply}">
             <input name="id" th:field="*{id}" type="hidden">
             <div class="form-group">    
-                <label class="col-sm-3 control-label">关联商品类别表id：</label>
+                <label class="col-sm-3 control-label">关联商品类别名称：</label>
                 <div class="col-sm-8">
-                    <input name="typeId" disabled="" th:field="*{typeId}" class="form-control" type="text" required>
+                    <input name="typeId" disabled="" th:field="*{typeName}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">商户表id：</label>
+            <!--<div class="form-group">
+                <label class="col-sm-3 control-label">商户名称：</label>
                 <div class="col-sm-8">
                     <input name="merchantId" disabled="" th:field="*{merchantId}" class="form-control" type="text" required>
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">    
                 <label class="col-sm-3 control-label">供应信息标题：</label>
                 <div class="col-sm-8">

dgtly-member/dgtly-member-admin/src/main/resources/templates/notice/supply/edit.html

@@ -30,12 +30,12 @@
 <!--                    <input name="typeId" th:field="*{typeId}" class="form-control" type="text" required>-->
 <!--                </div>-->
 <!--            </div>-->
-            <div class="form-group">    
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">商户名称</label>
                 <div class="col-sm-8">
                     <input name="merchantId" th:field="*{merchantId}" class="form-control" type="text" required>
                 </div>
-            </div>
+            </div>-->
             <div class="form-group">    
                 <label class="col-sm-3 control-label">供应信息标题：</label>
                 <div class="col-sm-8">

dgtly-member/dgtly-member-api/src/main/java/com/dgtly/member/controller/DemandInfoController.java

@@ -99,6 +99,7 @@ public class DemandInfoController extends ApiBaseController {
         ParameterObject obj =  getParameterObject();
         NoticeDemand noticeDemand = obj.parseBean(NoticeDemand.class);
         startPage(obj);/*向分页传递 分页参数*/
+        noticeDemand.setStatus("0");//求购信息中查询正在征集的信息
         List<NoticeDemand> noticeDemandList = noticeDemandService.selectNoticeDemandList(noticeDemand);
         return AjaxResult.success(getDataTable(noticeDemandList));
     }

dgtly-member/dgtly-member-common/src/main/java/com/dgtly/notice/domain/NoticeDemand.java

@@ -20,7 +20,6 @@ public class NoticeDemand extends BaseEntity
     private Long id;
 
     /** 会员信息表id */
-    @Excel(name = "会员信息表id")
     private Long memberId;
 
     /** 求购标题 */
@@ -48,27 +47,21 @@ public class NoticeDemand extends BaseEntity
     private Date releaseTime;
 
     /** 求购标题 */
-    @Excel(name = "求购标题英文字段")
     private String purchaseTitleEn;
 
     /** 需求概要 */
-    @Excel(name = "需求概要英文字段")
     private String summaryOfNeedsEn;
 
     /** 需求详情 */
-    @Excel(name = "需求详情英文字段")
     private String demandDetailsEn;
 
     /** 联系人 */
-    @Excel(name = "联系人英文字段")
     private String contactsEn;
 
     /** 联系电话 */
-    @Excel(name = "联系电话英文字段")
     private String contactNumberEn;
 
     /** 发布时间 */
-    @Excel(name = "发布时间英文字段", width = 30, dateFormat = "yyyy-MM-dd")
     private Date releaseTimeEn;
 
     /** 需求信息状态 */

dgtly-member/dgtly-member-common/src/main/resources/mapper/notice/NoticeDemandMapper.xml

@@ -30,12 +30,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectNoticeDemandVo"/>
         <where>  
             <if test="memberId != null "> and member_id = #{memberId}</if>
-            <if test="purchaseTitle != null  and purchaseTitle != ''"> and purchase_title = #{purchaseTitle} or purchase_title_en = #{purchaseTitle}</if>
-            <if test="summaryOfNeeds != null  and summaryOfNeeds != ''"> and summary_of_needs = #{summaryOfNeeds} or summary_of_needs_en = #{summaryOfNeeds}</if>
-            <if test="demandDetails != null  and demandDetails != ''"> and demand_details = #{demandDetails} or demand_details_en = #{demandDetails}</if>
-            <if test="contacts != null  and contacts != ''"> and contacts = #{contacts} or contacts_en = #{contacts}</if>
-            <if test="contactNumber != null  and contactNumber != ''"> and contact_number = #{contactNumber} or contact_number_en = #{contactNumber}</if>
-            <if test="releaseTime != null "> and release_time = #{releaseTime} or release_time_en = #{releaseTime}</if>
+            <if test="purchaseTitle != null  and purchaseTitle != ''"> and (purchase_title like concat('%', #{purchaseTitle}, '%') or purchase_title_en like concat('%', #{purchaseTitle}, '%'))</if>
+            <if test="summaryOfNeeds != null  and summaryOfNeeds != ''"> and (summary_of_needs like concat('%', #{summaryOfNeeds}, '%') or summary_of_needs_en like concat('%', #{summaryOfNeeds}, '%'))</if>
+            <if test="demandDetails != null  and demandDetails != ''"> and (demand_details = #{demandDetails} or demand_details_en = #{demandDetails})</if>
+            <if test="contacts != null  and contacts != ''"> and (contacts like concat('%', #{contacts}, '%') or contacts_en like concat('%', #{contacts}, '%'))</if>
+            <if test="contactNumber != null  and contactNumber != ''"> and (contact_number like concat('%', #{contactNumber}, '%') or contact_number_en like concat('%', #{contactNumber}, '%'))</if>
+            <if test="params.beginReleaseTime != null and params.beginReleaseTime != ''"><!-- 发布开始时间检索 -->
+                AND date_format(release_time,'%y%m%d') &gt;= date_format(#{params.beginReleaseTime},'%y%m%d')
+            </if>
+            <if test="params.endReleaseTime != null and params.endReleaseTime != ''"><!-- 发布结束时间检索 -->
+                AND date_format(release_time,'%y%m%d') &lt;= date_format(#{params.endReleaseTime},'%y%m%d')
+            </if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
         </where>
     </select>