预警迁移到供应商维护

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -186,7 +186,7 @@ public class BasicBussinessTypeController extends BaseController {
             bussinessTypeFilterRequest.setUserId(getUserId());
         } else {
             //当前用户为供应商，查询单据类型添加允许供应商使用参数
-            bussinessTypeFilterRequest.setSpUse(true);
+//            bussinessTypeFilterRequest.setSpUse(true);
         }
 
         List<BasicBussinessTypeResponse> bussinessTypeEntities;

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

@@ -48,6 +48,17 @@ public class FilterOrderRequest extends ListPageRequest {
      */
     private String endTime;
 
+
+    /**
+     * 审核开始时间
+     */
+    private String startAduditTime;
+
+    /**
+     * 审核结束时间
+     */
+    private String endAduditTime;
+
     /**
      * 往来单位
      */

src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java

@@ -83,7 +83,10 @@ public class UdiRlSupResponse {
     private String basicPrductRemak6;
     private String basicPrductRemak7;
     private String basicPrductRemak8;
-
+    private Integer lowStockNum;
+    private Integer overStockNum;
+    private Integer recentDateTime;
+    private Integer isDateBy;
     //产品id
     private String PRId;
 }

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -44,6 +44,13 @@
                basic_udirel.lockStatus,
                basic_udirel.mainId,
                basic_udirel.isAdavence,
+
+               basic_udirel.lowStockNum,
+               basic_udirel.overStockNum,
+               basic_udirel.recentDateTime,
+               basic_udirel.isDateBy,
+
+
                bht.name             classifyName,
                basic_products.id as PRId,
                basic_products.originUuid,

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

@@ -49,11 +49,8 @@
             <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="startTime != null and startTime != '' and (endTime == null or endTime == '')">
+            <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
-                AND date_format(createTime, '%Y-%m-%d') >= date_format(#{startTime}, '%Y-%m-%d')
+                AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
-            </if>
-            <if test="endTime != null and endTime != '' and (startTime == null or startTime == '')">
-                AND date_format(createTime, '%Y-%m-%d') &lt;= date_format(#{endTime}, '%Y-%m-%d')
             </if>
             <if test="statuses != null and statuses.size() != 0">
                 AND status in