完善

platform-dao/src/main/resources/mapper/store/SpareStoreMapper.xml

@@ -132,9 +132,7 @@ sparestore.min_stock
         info.init_no AS initNo,
         info.ggxh,
         info.initial_value as price,
-        FIRST.totalStock,
-        FIRST.minStock,
-        FIRST.maxStock
+        FIRST.totalStock
         FROM
         t_spare_part_info info
         LEFT JOIN
@@ -203,10 +201,7 @@ sparestore.min_stock
                 </foreach>
             </if>
             <if test="searchMinStockWarn">
-                AND sparestore.min_stock is not null
-            </if>
-            <if test="searchMinStockWarn">
-                AND sparestore.warn_status = 0
+                AND sparestore.min_stock is not null AND (sparestore.warn_status = 0 or sparestore.warn_status is null)
             </if>
             <if test="typeId != null and typeId != ''">
                 and spareinfo.type_id = #{typeId}

platform-service/src/main/java/com/platform/service/store/SpareStoreService.java

@@ -18,16 +18,17 @@ import java.util.List;
  */
 public interface SpareStoreService extends IBaseService<SpareStore, SpareStoreDTO> {
 
-   /**
-    * 批量删除
-    *
-    * @param ids ：
-    * @return ：
-    */
+    /**
+     * 批量删除
+     *
+     * @param ids ：
+     * @return ：
+     */
     int batchDelete(List<String> ids);
 
     /**
      * 分页查询
+     *
      * @param record
      * @param pageNum
      * @param pageSize
@@ -49,6 +50,7 @@ public interface SpareStoreService extends IBaseService<SpareStore, SpareStoreDT
 
     /**
      * 查看详情
+     *
      * @param id
      * @return
      */
@@ -65,13 +67,9 @@ public interface SpareStoreService extends IBaseService<SpareStore, SpareStoreDT
 
     List<SpareStoreVO> selectFinanceReportList(String projectId, SpareStoreDTO spareStoreDTO, int type);
 
+    SpareStoreInfoVO getSpareStoreInfoVO(String storeId, SpareStoreInfoVO spareStoreInfoVO);
 
+    SpareStoreInfoVO getAllSpareStoreInfoVO(String storeId);
 
-
- SpareStoreInfoVO getSpareStoreInfoVO(String storeId,SpareStoreInfoVO spareStoreInfoVO);
-
- public SpareStoreInfoVO getAllSpareStoreInfoVO(String storeId);
-
-
- void genMinStockWarn();
+    void genMinStockWarn();
 }