Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/java/org/rcisoft/bus/storegoodslog/entity/StoreGoodsLog.java

@@ -59,6 +59,20 @@ public class StoreGoodsLog extends CyIdIncreEntity<StoreGoodsLog> {
       */
      private BigDecimal totalPrice;
 
+     /**
+      * 销售开始时间
+      */
+     @JsonIgnore
+     @TableField(exist = false)
+     private String startTime;
+
+     /**
+      * 销售结束时间
+      */
+     @JsonIgnore
+     @TableField(exist = false)
+     private String finishTime;
+
      private String isReturn;
 }
 

src/main/resources/mapper/bus/storeGoodsLog/StoreGoodsLogMapper.xml

@@ -91,6 +91,12 @@
             <if test="entity.appCode !=null and entity.appCode != '' ">
                 and app_code like concat('%',#{entity.appCode},'%')
             </if>
+            <if test="entity.startTime !=null and entity.startTime != '' ">
+               and sgl.update_date &gt;=  #{entity.startTime}
+            </if>
+            <if test="entity.finishTime !=null and entity.finishTime != '' ">
+                 and sgl.update_date &lt;=  DATE_ADD(#{entity.finishTime}, INTERVAL 1 DAY)
+            </if>
         ORDER BY sgl.business_id DESC
     </select>
 </mapper>