From 72fc14d9b157897f2581137d7d463eb72da8f135 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期二, 29 七月 2025 15:28:11 +0800
Subject: [PATCH] 修改
---
hazmat-system/src/main/java/com/gkhy/hazmat/system/mapper/HzHazmatMapper.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/hazmat-system/src/main/java/com/gkhy/hazmat/system/mapper/HzHazmatMapper.java b/hazmat-system/src/main/java/com/gkhy/hazmat/system/mapper/HzHazmatMapper.java
index edcd9f8..df27091 100644
--- a/hazmat-system/src/main/java/com/gkhy/hazmat/system/mapper/HzHazmatMapper.java
+++ b/hazmat-system/src/main/java/com/gkhy/hazmat/system/mapper/HzHazmatMapper.java
@@ -2,13 +2,13 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.hazmat.system.domain.HzHazmat;
-import com.gkhy.hazmat.system.domain.vo.HzEntryRecordVO;
-import com.gkhy.hazmat.system.domain.vo.HzHazmatUseVO;
-import com.gkhy.hazmat.system.domain.vo.HzHazmatWarehouseVO;
+import com.gkhy.hazmat.system.domain.dto.HazmatUseStatisticDTO;
+import com.gkhy.hazmat.system.domain.vo.*;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -42,7 +42,17 @@
* @param companyId
* @return
*/
- Integer selectHazmatCountOfWarehouse(@Param("warehouseId") Long warehouseId, @Param("basicId")Long basicId, @Param("companyId")Long companyId);
+ Integer selectHazmatCountOfWarehouse(@Param("warehouseId") Long warehouseId, @Param("basicId")Long basicId, @Param("companyId")Long companyId,
+ @Param("cupboardId") Long cupboardId);
+ /**
+ * 获取指定仓库库存
+ * @param warehouseId
+ * @param basicId
+ * @param companyId
+ * @return
+ */
+ List<TabooDisVo> selectHazmatWarehouseCheck(@Param("warehouseId") Long warehouseId, @Param("companyId")Long companyId,
+ @Param("cupboardId") Long cupboardId);
/**
* 根据条码code查询危化品信息
@@ -87,11 +97,14 @@
/**
* 危化品完全用完数量
- * @param startTime
- * @param endTime
- * @param companyId
+ * @param useStatisticDTO
* @return
*/
- List<HzHazmatUseVO> useCountStatic(@Param("startTime")String startTime,@Param("endTime") String endTime,@Param("companyId") Long companyId);
+ List<HzHazmatUseVO> useCountStatic(HazmatUseStatisticDTO useStatisticDTO);
+ List<HzEntryRecordVO> useCountHourlyStatic(@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("companyId") Long companyId);
+
+ List<HzCompanyMessage> companyMessage(Long type);
+
+ Integer countTotal(Long companyId);
}
--
Gitblit v1.9.2