před 1 rokem
rodič
revize
6c9f22c2dd

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

@@ -152,7 +152,7 @@
                store.name storeName,
                spareinfo.name spareName, spareinfo.no, spareinfo.ggxh, spareinfo.init_no,
                spareinfo.unit, spareinfo.image,spareinfo.type_id,spareinfo.brand,
-               spareinfo.initial_value,SUM(if(spareStore.num) is null,0,spareStore.num) currentStock,
+               spareinfo.initial_value,SUM(spareStore.num) currentStock,
                spareinfo.max_stock,spareinfo.min_stock,
                spareinfo.level,spareinfo.producer_id,spareinfo.yt,
                spareType.name spareTypeName

+ 2 - 2
platform-service/src/main/java/com/platform/service/store/impl/InStoreFormServiceImpl.java

@@ -247,8 +247,8 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
     public List<ExportInStoreSpareNumVO> getInStoreSpareNum(InStoreFormDTO dto,Integer searchYear,Integer month) {
         LocalDateTime searchStartTime = null;
         LocalDateTime searchEndTime = null;
-        searchStartTime = DateUtils.getFirstDayOfMonth(searchYear,month);
-        searchEndTime = DateUtils.getLastDayOfMonth(searchYear,month);
+        searchStartTime = DateUtils.getFirstDayOfMonth(searchYear, month);
+        searchEndTime = DateUtils.getLastDayOfMonth(searchYear, month);
         dto.setSearchTimeStart(searchStartTime);
         dto.setSearchTimeEnd(searchEndTime);
         List<ExportInStoreSpareNumVO> numVOS = mapper.getInStoreSpareNum(dto);