Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -132,6 +132,7 @@ public class InvWarehouseController extends BaseController {
             return ResultVOUtils.error(500, "当前仓库不能为空！");
         }
         FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+        filterInvSubWarehouseRequest.setAdvanceType(1);
         List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
         List<InvWarehouseEntity> results = new ArrayList<>();
         if (CollUtil.isNotEmpty(invWarehouseEntities)) {

src/main/java/com/glxp/api/req/inout/FilterReceiveRequest.java

@@ -17,6 +17,16 @@ public class FilterReceiveRequest extends ListPageRequest {
      */
     private String endTime;
 
+    /**
+     * 审核开始时间
+     */
+    private String startAuditTime;
+
+    /**
+     * 审核结束时间
+     */
+    private String endAuditTime;
+
     private String billType;
     private String deptCode;
     private String invCode;

src/main/resources/mybatis/mapper/inout/ReceiveDao.xml

@@ -31,6 +31,9 @@
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
             </if>
+            <if test="startAuditTime != null and startAuditTime != '' and endAuditTime != null and endAuditTime != ''">
+                AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAuditTime}, '%Y-%m-%d') and date_format(#{endAuditTime}, '%Y-%m-%d')
+            </if>
             <if test="startTime != null and startTime != '' and (endTime == null or endTime == '')">
                 AND date_format(createTime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d')
             </if>