要货查询

suishenbang-order/src/main/java/com/dgtly/order/controller/SalesOrderBaseController.java

@@ -57,19 +57,22 @@ public class SalesOrderBaseController extends BaseController
     public TableDataInfo list(SalesOrderBase salesOrderBase)
     {
         startPage();
-            List<SalesOrderBase> list = salesOrderBaseService.selectSalesOrderBaseList(salesOrderBase);
+        List<SalesOrderBase> list = salesOrderBaseService.selectSalesOrderBaseList(salesOrderBase);
         return getDataTable(list);
     }
 
     /**
      * 导出【要货查询】 列表
      */
-    @RequiresPermissions("oder:salesOrderBase:export")
+    @RequiresPermissions("order:salesOrderBase:export")
     @PostMapping("/export")
     @ResponseBody
     public AjaxResult export(SalesOrderBase salesOrderBase)
     {
         List<SalesOrderBase> list = salesOrderBaseService.selectSalesOrderBaseList(salesOrderBase);
+        if (list.size() >= 10000) {
+            return new AjaxResult(301, "数据大于 10000 条Excel将无法打开，请过滤查询条件");
+        }
         ExcelUtil<SalesOrderBase> util = new ExcelUtil<SalesOrderBase>(SalesOrderBase.class);
         return util.exportExcel(list, "要货查询");
     }

suishenbang-order/src/main/java/com/dgtly/order/domain/SalesOrderBase.java

@@ -1,5 +1,6 @@
 package com.dgtly.order.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.dgtly.common.annotation.Excel;
@@ -22,7 +23,7 @@ public class SalesOrderBase extends BaseEntity
     private Long id;
 
     /** 是否删除 */
-    @Excel(name = "是否删除")
+//    @Excel(name = "是否删除")
     private String isDelete;
 
     /** 订单号 */
@@ -30,31 +31,68 @@ public class SalesOrderBase extends BaseEntity
     private String orderNumber;
 
     /** 订单生成时间 */
-    @Excel(name = "订单生成时间")
+//    @Excel(name = "订单生成时间")
     private String orderCreationTime;
 
     /** 确认人 */
-    @Excel(name = "确认人")
+    @Excel(name = "操作用户")
     private String confirmBy;
 
     /** 期望到货时间 */
-    @Excel(name = "期望到货时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "确认要货时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expectedTime;
 
     /** 订单所属 */
-    @Excel(name = "订单所属")
+//    @Excel(name = "订单所属")
     private String belongTo;
 
     /** 期望到货时间是否通知 */
-    @Excel(name = "期望到货时间是否通知")
+//    @Excel(name = "期望到货时间是否通知")
     private String expectedTimeNotice;
 
     @NotBlank(message = "经销商名称")
+    @Excel(name = "经销商名称")
     private String customerName;
 
     @NotBlank(message = "经销商代码")
+    @Excel(name = "经销商代码")
     private String customerCode;
 
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "操作时间")
+    private Date createTime;
+
+    private String beginCreateTime;
+
+    private String endCreateTime;
+
+    public String getBeginCreateTime() {
+        return beginCreateTime;
+    }
+
+    public void setBeginCreateTime(String beginCreateTime) {
+        this.beginCreateTime = beginCreateTime;
+    }
+
+    public String getEndCreateTime() {
+        return endCreateTime;
+    }
+
+    public void setEndCreateTime(String endCreateTime) {
+        this.endCreateTime = endCreateTime;
+    }
+
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     public String getCustomerName() {
         return customerName;
     }

suishenbang-order/src/main/resources/mapper/order/SalesOrderBaseMapper.xml

@@ -1,121 +1,83 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.dgtly.order.mapper.SalesOrderBaseMapper">
-    
+
     <resultMap type="SalesOrderBase" id="SalesOrderBaseResult">
-        <result property="id"    column="id"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="isDelete"    column="is_delete"    />
-        <result property="orderNumber"    column="order_number"    />
-        <result property="orderCreationTime"    column="order_creation_time"    />
-        <result property="confirmBy"    column="confirm_by"    />
-        <result property="expectedTime"    column="expected_time"    />
-        <result property="belongTo"    column="belong_to"    />
-        <result property="expectedTimeNotice"    column="expected_time_notice"    />
+        <result property="id" column="id"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="isDelete" column="is_delete"/>
+        <result property="orderNumber" column="order_number"/>
+        <result property="orderCreationTime" column="order_creation_time"/>
+        <result property="confirmBy" column="confirm_by"/>
+        <result property="expectedTime" column="expected_time"/>
+        <result property="belongTo" column="belong_to"/>
+        <result property="expectedTimeNotice" column="expected_time_notice"/>
 
     </resultMap>
 
     <sql id="selectSalesOrderBaseVo">
-        SELECT
-            s.id,
-            s.create_by,
-            s.create_time,
-            s.update_by,
-            s.update_time,
-            s.is_delete,
-            s.order_number,
-            s.order_creation_time,
-            s.confirm_by,
-            s.expected_time,
-            s.belong_to,
-            s.expected_time_notice,
-            CustomerCode,
-            CustomerName
-        FROM
-            sales_order_base s
-                LEFT JOIN data_master_customer d ON d.CustomerCode = s.belong_to
+        SELECT s.id,
+               s.create_by,
+               s.create_time,
+               s.update_by,
+               s.update_time,
+               s.is_delete,
+               s.order_number,
+               s.order_creation_time,
+               s.confirm_by,
+               s.expected_time,
+               s.belong_to,
+               s.expected_time_notice,
+               CustomerCode,
+               CustomerName
+        FROM sales_order_base s
+                 LEFT JOIN data_master_customer d ON d.CustomerCode = s.belong_to
     </sql>
 
     <select id="selectSalesOrderBaseList" parameterType="SalesOrderBase" resultMap="SalesOrderBaseResult">
-        <include refid="selectSalesOrderBaseVo"/>
-        <where>  
-            <if test="isDelete != null  and isDelete != ''"> and is_delete = #{isDelete}</if>
-            <if test="orderNumber != null  and orderNumber != ''"> and order_number = #{orderNumber}</if>
-            <if test="orderCreationTime != null  and orderCreationTime != ''"> and order_creation_time = #{orderCreationTime}</if>
-            <if test="confirmBy != null  and confirmBy != ''"> and confirm_by = #{confirmBy}</if>
-            <if test="expectedTime != null "> and expected_time = #{expectedTime}</if>
-            <if test="belongTo != null  and belongTo != ''"> and belong_to = #{belongTo}</if>
-            <if test="expectedTimeNotice != null  and expectedTimeNotice != ''"> and expected_time_notice = #{expectedTimeNotice}</if>
+        SELECT
+        s.create_time,
+        s.order_number,
+        s.confirm_by,
+        s.expected_time,
+        s.expected_time_notice,
+        CustomerCode,
+        CustomerName
+        FROM
+        sales_order_base s
+        LEFT JOIN data_master_customer d ON d.CustomerCode = s.belong_to
+        <where>
+            <if test="customerCode != null  and customerCode != ''">and CustomerCode like concat('%',#{customerCode},'%')</if>
+            <if test="customerName != null  and customerName != ''">and CustomerName like concat('%',#{customerName},'%')</if>
+            <if test="isDelete != null  and isDelete != ''">and is_delete = #{isDelete}</if>
+            <if test="orderNumber != null  and orderNumber != ''">and order_number = #{orderNumber}</if>
+            <if test="orderCreationTime != null  and orderCreationTime != ''">and order_creation_time =
+                #{orderCreationTime}
+            </if>
+            <if test="confirmBy != null  and confirmBy != ''">and confirm_by = #{confirmBy}</if>
+            <if test="expectedTime != null ">and expected_time = #{expectedTime}</if>
+            <if test="belongTo != null  and belongTo != ''">and belong_to = #{belongTo}</if>
+            <if test="expectedTimeNotice != null  and expectedTimeNotice != ''">and expected_time_notice =
+                #{expectedTimeNotice}
+            </if>
+            <if test="beginCreateTime != null and beginCreateTime != ''"><!-- 开始时间检索 -->
+                and date_format(s.create_time,'%y%m%d') &gt;= date_format(#{beginCreateTime},'%y%m%d')
+            </if>
+            <if test="endCreateTime != null and endCreateTime != ''"><!-- 结束时间检索 -->
+                and date_format(s.create_time,'%y%m%d') &lt;= date_format(#{endCreateTime},'%y%m%d')
+            </if>
         </where>
     </select>
-    
+
     <select id="selectSalesOrderBaseById" parameterType="Long" resultMap="SalesOrderBaseResult">
         <include refid="selectSalesOrderBaseVo"/>
         where id = #{id}
     </select>
-        
-    <!--<insert id="insertSalesOrderBase" parameterType="SalesOrderBase" useGeneratedKeys="true" keyProperty="id">
-        insert into sales_order_base
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="createBy != null  and createBy != ''">create_by,</if>
-            <if test="createTime != null ">create_time,</if>
-            <if test="updateBy != null  and updateBy != ''">update_by,</if>
-            <if test="updateTime != null ">update_time,</if>
-            <if test="isDelete != null  and isDelete != ''">is_delete,</if>
-            <if test="orderNumber != null  and orderNumber != ''">order_number,</if>
-            <if test="orderCreationTime != null  and orderCreationTime != ''">order_creation_time,</if>
-            <if test="confirmBy != null  and confirmBy != ''">confirm_by,</if>
-            <if test="expectedTime != null ">expected_time,</if>
-            <if test="belongTo != null  and belongTo != ''">belong_to,</if>
-            <if test="expectedTimeNotice != null  and expectedTimeNotice != ''">expected_time_notice,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="createBy != null  and createBy != ''">#{createBy},</if>
-            <if test="createTime != null ">#{createTime},</if>
-            <if test="updateBy != null  and updateBy != ''">#{updateBy},</if>
-            <if test="updateTime != null ">#{updateTime},</if>
-            <if test="isDelete != null  and isDelete != ''">#{isDelete},</if>
-            <if test="orderNumber != null  and orderNumber != ''">#{orderNumber},</if>
-            <if test="orderCreationTime != null  and orderCreationTime != ''">#{orderCreationTime},</if>
-            <if test="confirmBy != null  and confirmBy != ''">#{confirmBy},</if>
-            <if test="expectedTime != null ">#{expectedTime},</if>
-            <if test="belongTo != null  and belongTo != ''">#{belongTo},</if>
-            <if test="expectedTimeNotice != null  and expectedTimeNotice != ''">#{expectedTimeNotice},</if>
-         </trim>
-    </insert>
-
-    <update id="updateSalesOrderBase" parameterType="SalesOrderBase">
-        update sales_order_base
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="createBy != null  and createBy != ''">create_by = #{createBy},</if>
-            <if test="createTime != null ">create_time = #{createTime},</if>
-            <if test="updateBy != null  and updateBy != ''">update_by = #{updateBy},</if>
-            <if test="updateTime != null ">update_time = #{updateTime},</if>
-            <if test="isDelete != null  and isDelete != ''">is_delete = #{isDelete},</if>
-            <if test="orderNumber != null  and orderNumber != ''">order_number = #{orderNumber},</if>
-            <if test="orderCreationTime != null  and orderCreationTime != ''">order_creation_time = #{orderCreationTime},</if>
-            <if test="confirmBy != null  and confirmBy != ''">confirm_by = #{confirmBy},</if>
-            <if test="expectedTime != null ">expected_time = #{expectedTime},</if>
-            <if test="belongTo != null  and belongTo != ''">belong_to = #{belongTo},</if>
-            <if test="expectedTimeNotice != null  and expectedTimeNotice != ''">expected_time_notice = #{expectedTimeNotice},</if>
-        </trim>
-        where id = #{id}
-    </update>
 
-    <delete id="deleteSalesOrderBaseById" parameterType="Long">
-        delete from sales_order_base where id = #{id}
-    </delete>
 
-    <delete id="deleteSalesOrderBaseByIds" parameterType="String">
-        delete from sales_order_base where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>-->
-    
 </mapper>

suishenbang-order/src/main/resources/templates/order/salesOrderBase/test.html

@@ -20,11 +20,11 @@
                         </li>
                         <li class="select-time">
                             <p>创建时间：</p>
-                            <input type="text" class="time-input" id="startTime" placeholder="开始时间"
-                                   name="params[beginExpectedTime]"/>
+                            <input type="text" class="time-input" placeholder="开始时间"
+                                   name="beginCreateTime"/>
                             <span>-</span>
-                            <input type="text" class="time-input" id="endTime" placeholder="结束时间"
-                                   name="params[endExpectedTime]"/>
+                            <input type="text" class="time-input"  placeholder="结束时间"
+                                   name="endCreateTime"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -39,7 +39,7 @@
 
         <div class="btn-group-sm" id="toolbar" role="group">
             <a class="btn btn-warning" onclick="$.table.exportExcel()"
-               shiro:hasPermission="order:salesOrderBaseTest:export">
+               shiro:hasPermission="order:salesOrderBase:export">
                 <i class="fa fa-download"></i> 导出
             </a>
         </div>
@@ -51,13 +51,13 @@
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('order:salesOrderBaseTest:edit')}]];
-    var removeFlag = [[${@permission.hasPermi('order:salesOrderBaseTest:remove')}]];
     var prefix = ctx + "order/salesOrderBase";
 
     $(function () {
         var options = {
             url: prefix + "/list",
             exportUrl: prefix + "/export",
+
             modalName: "要货查询",
             columns: [{
                 checkbox: true
@@ -81,23 +81,22 @@
                 },
                 {
                     field: 'expectedTime',
-                    title: '期望到货时间'
+                    title: '确认要货时间'
                 },
                 {
                     field: 'confirmBy',
-                    title: '确认人（操作用户）'
+                    title: '操作用户'
                 },
                 {
                     field: 'createTime',
-                    title: '创建时间（操作时间）'
+                    title: '操作时间'
                 },
                 {
                     title: '操作',
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         return actions.join('');
                     }
                 }]