新增订单和商品按时时间区间查询

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/OmsOrderController.java

@@ -22,7 +22,7 @@ import java.util.List;
  * Created by macro on 2018/10/11.
  */
 @Controller
-@Api(tags = "OmsOrderController", description = "订单管理")
+@Api(tags = "订单管理")
 @RequestMapping("/order")
 public class OmsOrderController {
     @Autowired
@@ -38,7 +38,7 @@ public class OmsOrderController {
         return CommonResult.success(CommonPage.restPage(orderList));
     }
 
-    @ApiOperation("查询订单")
+    @ApiOperation("订单导出")
     @RequestMapping(value = "/list/excel", method = RequestMethod.GET)
     public void listExcel(HttpServletResponse response,OmsOrderQueryParam queryParam) throws Exception{
         List<OmsOrderExcel> orderList = orderService.listExcel(queryParam);

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/OmsOrderQueryParam.java

@@ -23,4 +23,10 @@ public class OmsOrderQueryParam {
     private Integer sourceType;
     @ApiModelProperty(value = "订单提交时间")
     private String createTime;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/PmsProductQueryParam.java

@@ -1,9 +1,13 @@
 package com.hwrj.cloud.admin.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 产品查询参数
@@ -28,5 +32,13 @@ public class PmsProductQueryParam {
     @ApiModelProperty("供应商")
     private Long compId;
 
+    @ApiModelProperty(value = "开始时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date endTime;
+
 
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductServiceImpl.java

@@ -291,6 +291,12 @@ public class PmsProductServiceImpl implements PmsProductService {
         if (productQueryParam.getProductCategoryId() != null) {
             criteria.andProductCategoryIdEqualTo(productQueryParam.getProductCategoryId());
         }
+        if (productQueryParam.getStartTime() != null) {
+            criteria.andCreateTimeGreaterThanOrEqualTo(productQueryParam.getStartTime());
+        }
+        if (productQueryParam.getEndTime() != null) {
+            criteria.andCreateTimeLessThanOrEqualTo(productQueryParam.getEndTime());
+        }
         return productMapper.selectByExample(productExample);
     }
 

forest-admin/admin-server/src/main/resources/dao/OmsOrderDao.xml

@@ -26,6 +26,12 @@
         <if test="queryParam.createTime!=null and queryParam.createTime!=''">
             AND create_time LIKE concat(#{queryParam.createTime},"%")
         </if>
+        <if test="queryParam.startTime!=null and queryParam.startTime!=''">
+            AND create_time <![CDATA[>=]]> #{queryParam.startTime}
+        </if>
+        <if test="queryParam.endTime!=null and queryParam.endTime!=''">
+            AND create_time <![CDATA[<=]]> #{queryParam.endTime}
+        </if>
         <if test="queryParam.receiverKeyword!=null and queryParam.receiverKeyword!=''">
             AND (
             receiver_name LIKE concat("%",#{queryParam.receiverKeyword},"%")

sql/表结构变化语句/更新sql.sql

@@ -202,6 +202,12 @@ ALTER TABLE pms_brand ADD COLUMN `comp_name` VARCHAR (100) DEFAULT NULL COMMENT
 # 产品品牌id索引
 ALTER TABLE `pms_brand` ADD INDEX idx_comp_id ( `comp_id` );
 
+# 订单表新增索引
+ALTER TABLE `oms_order` ADD INDEX idx_create_time ( `create_time` );
+# 商品新增索引
+ALTER TABLE `pms_product` ADD INDEX idx_create_time ( `create_time` );
+
+
 
 # 更新语句
 UPDATE pms_brand a