合并2

935090232@qq.com

2021-03-21 956e7866c8a3cbd8b72e4882333a42ab8c56a9c0

合并2

 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopProductComment.java

@@ -3,6 +3,7 @@
import com.matrix.core.anotations.Extend;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.common.bean.EntityDTOExt;
import org.springframework.format.annotation.DateTimeFormat;

import java.util.Date;

@@ -130,14 +131,14 @@
    /**
     * 开始时间
     */
    @Extend
    private String commentBeginTime;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    private Date commentBeginTime;

    /**
     * 结束时间
     */
    @Extend
    private String commentEndTime;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
    private Date commentEndTime;
    private Long companyId;
    public Long getCompanyId() {
        return companyId;
@@ -157,19 +158,19 @@
        this.dateToStrTime = dateToStrTime;
    }

    public String getCommentBeginTime() {
    public Date getCommentBeginTime() {
        return commentBeginTime;
    }

    public void setCommentBeginTime(String commentBeginTime) {
    public void setCommentBeginTime(Date commentBeginTime) {
        this.commentBeginTime = commentBeginTime;
    }

    public String getCommentEndTime() {
    public Date getCommentEndTime() {
        return commentEndTime;
    }

    public void setCommentEndTime(String commentEndTime) {
    public void setCommentEndTime(Date commentEndTime) {
        this.commentEndTime = commentEndTime;
    }


 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml

@@ -104,7 +104,7 @@
            </if>

             <if test="record.companyId != null and record.companyId !='' ">
                 and company_id = #{record.companyId}
                 and c.company_id = #{record.companyId}
             </if>

            <if test="(record.comContent!=null and record.comContent!='') or  (record.comContent!='' and record.comContent==0)  ">
@@ -455,6 +455,7 @@
                    and c.product_id = #{record.productId}
                </if>
            </if>
            and c.com_audit_status=1
            AND p.del_flag = 2
            AND o.del_flag = 2
            AND c.del_flag = 2

 zq-erp/src/main/resources/templates/views/admin/shop/shopProductComment-list.html

@@ -52,6 +52,22 @@
                                        <input autocomplete="off"   id="search-text" name="nickName" placeholder="输入查询关键词"
                                            type="text" class="form-control">
                                    </div>
                                    <div class="form-group mr-20 ml-20">
                                        <select class="form-control select2" size="1"
                                                name="comAuditStatus"
                                                id="comAuditStatus" style="width: 98%">
                                            <option value="">请选择</option>
                                            <option value="0" >未审核</option>
                                            <option value="1" >审核通过</option>
                                            <option value="2" >审核不通过</option>
                                        </select>
                                    </div>
                                    <div class="form-group mr-20 ml-20">
                                        <input autocomplete="off"   name="commentBeginTime"
                                               type="text" class="form-control datetimepicker" >
                                        <input autocomplete="off"   name="commentEndTime"
                                               type="text" class="form-control datetimepicker">
                                    </div>
                                    <div class="form-group">
                                        <button onclick="myGrid.serchData(1)" type="button"
                                            class="btn btn-info">
@@ -62,64 +78,10 @@
                                        </button>
                                    </div>
                                </div>
                                <!-- 高级搜索 -->
                                <div class="senior-content">
                                    <!-- <div><a class="serch-close closestyle">×</a></div> -->
                                    <div class="serch-headline">高级搜索</div>
                                    <div>
                                        <div style="margin-bottom: 20px!important;">
                                            <div class="col-sm-6" style="text-align: right!important;">
                                                <label class="col-sm-12 control-label">
                                                    开始日期：
                                                </label>
                                            </div>
                                            <div class="col-sm-6">
                                                <input autocomplete="off"   name="commentBeginTime" readonly="readonly"
                                                       type="text" class="form-control datetimepicker" style="width: 98%">
                                            </div>
                                        </div>

                                        <div style="margin-bottom: 20px!important;">
                                            <div class="col-sm-6" style="text-align: right!important;">
                                                <label class="col-sm-12 control-label">
                                                    结束日期：
                                                </label>
                                            </div>
                                            <div class="col-sm-6">
                                                <input autocomplete="off"   name="commentEndTime" readonly="readonly"
                                                       type="text" class="form-control datetimepicker" style="width: 98%">
                                            </div>
                                        </div>

                                        <div style="margin-bottom: 20px!important;">
                                            <div class="col-sm-6" style="text-align: right!important;">
                                                <label class="col-sm-12 control-label">
                                                    审核状态：
                                                </label>
                                            </div>
                                            <div class="col-sm-6">
                                                <select class="form-control select2" size="1"
                                                        name="comAuditStatus"
                                                        id="comAuditStatus" style="width: 98%">
                                                    <option value="">请选择</option>
                                                    <option value="0" >未审核</option>
                                                    <option value="1" >审核通过</option>
                                                    <option value="2" >审核不通过</option>
                                                </select>
                                            </div>
                                        </div>

                                    </div>
                                    <div class="button col-sm-12">
                                        <button type="button" class="btn btn-sm btn-info mr20" onclick="myGrid.serchData()">确认</button>
                                        <button type="button" class="btn btn-warning serch-close">取消</button>
                                    </div>
                                </div>
                            </form>
                        </div>
                        <div class="col-md-1 text-r layui-anim" data-anim="layui-anim-up">
                            <a class="senior-serch">高级搜索</a>
                        </div>

                    </div>
                </div>
            </div>
@@ -151,7 +113,14 @@
    <script type="text/javascript">
         var myGrid;
        $(function(){
            MTools.ininDatetimepicker(".datetimepicker");
            var _initParam = {format : 'yyyy-mm-dd hh:ii',
                todayBtn : true,
                autoclose : true,
                startView : 2,
                maxView : 3,
                minView : 0};
            MTools.ininDatetimepicker(_initParam);
            MTools.limitStartEndTime(_initParam);
            var delUrl="";
            delUrl=basePath+"/admin/shopProductComment/del" ;
            myGrid=MGrid.initGrid({