From f6e755678fab0ccd8001523d29dc2efaa8d5810c Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 28 一月 2026 13:47:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java  |    2 
 src/main/java/com/ruoyi/safe/service/impl/SafeHiddenFileServiceImpl.java     |   20 +
 src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java            |   57 +++
 src/main/java/com/ruoyi/safe/service/SafeHiddenFileService.java              |   16 
 src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java |    1 
 src/main/java/com/ruoyi/safe/mapper/SafeHiddenFileMapper.java                |   18 +
 src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java                        |   57 +++
 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java               |   11 
 src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java                      |   88 +++++
 src/main/java/com/ruoyi/safe/service/SafeHiddenService.java                  |   26 +
 src/main/java/com/ruoyi/safe/pojo/SafeHazard.java                            |    7 
 src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java                          |   28 +
 src/main/resources/mapper/safe/SafeHiddenFileMapper.xml                      |   19 +
 src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java |    2 
 src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java      |   57 +++
 src/main/java/com/ruoyi/safe/pojo/SafeHidden.java                            |  110 ++++++
 src/main/java/com/ruoyi/safe/controller/SafeHiddenFileController.java        |   71 ++++
 src/main/java/com/ruoyi/safe/mapper/SafeHazardRecordMapper.java              |   23 +
 src/main/java/com/ruoyi/safe/service/SafeHazardRecordService.java            |   28 +
 src/main/resources/mapper/stock/StockInventoryMapper.xml                     |    6 
 src/main/java/com/ruoyi/safe/mapper/SafeHiddenMapper.java                    |   23 +
 src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java   |   88 +++++
 src/main/java/com/ruoyi/quality/controller/QualityInspectController.java     |    8 
 src/main/resources/mapper/safe/SafeHazardRecordMapper.xml                    |   54 +++
 src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java                    |   43 ++
 src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java         |   79 ++++
 src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java               |    2 
 src/main/java/com/ruoyi/safe/controller/SafeHazardController.java            |    2 
 src/main/resources/mapper/safe/SafeHiddenMapper.xml                          |   46 ++
 29 files changed, 980 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 93928ca..b66def3 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -185,15 +185,8 @@
 
 
         // 鑾峰彇褰撳ぉ鍏ュ簱鏁伴噺
-        LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        procurementRecordStorageLambdaQueryWrapper.ge(ProcurementRecordStorage::getCreateTime, now)  // 澶т簬绛変簬褰撳ぉ
-                .lt(ProcurementRecordStorage::getCreateTime, now.plusDays(1)); // 灏忎簬鏄庡ぉ
-        List<ProcurementRecordStorage> procurementRecordStorages1 = procurementRecordStorageMapper.selectList(procurementRecordStorageLambdaQueryWrapper);
-        BigDecimal stockAmount1 = procurementRecordStorages1.stream()
-                .map(ProcurementRecordStorage::getInboundNum)
-                .filter(Objects::nonNull)
-                .reduce(BigDecimal.ZERO, BigDecimal::add);
-        homeBusinessDto.setTodayInventoryNum(stockAmount1.setScale(2, RoundingMode.HALF_UP).toString());
+        BigDecimal bigDecimal = stockInventoryMapper.selectTotalByDate(LocalDate.now());
+        homeBusinessDto.setTodayInventoryNum(bigDecimal.setScale(2, RoundingMode.HALF_UP).toString());
         return homeBusinessDto;
     }
 
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index e5dd8a3..e5942a2 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -433,6 +433,7 @@
         //鎵归噺鍒犻櫎妫�楠屾爣鍑�
         LambdaQueryWrapper<QualityInspect> materialInspectLambdaQueryWrapper = new LambdaQueryWrapper<>();
         materialInspectLambdaQueryWrapper.in(QualityInspect::getPurchaseLedgerId, ids);
+
         List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(materialInspectLambdaQueryWrapper);
         qualityInspects.stream().forEach(qualityInspect -> {
             if (ObjectUtils.isNotEmpty(qualityInspect.getInspectState())&&qualityInspect.getInspectState().equals(1)) {
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index 1555082..7dfae1f 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -2,10 +2,12 @@
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
 import com.ruoyi.procurementrecord.service.ProcurementRecordService;
 import com.ruoyi.procurementrecord.service.impl.ProcurementRecordServiceImpl;
+import com.ruoyi.procurementrecord.utils.StockUtils;
 import com.ruoyi.quality.dto.QualityInspectDto;
 import com.ruoyi.quality.pojo.QualityInspect;
 import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -40,6 +42,8 @@
     private IQualityInspectFileService qualityInspectFileService;
     @Autowired
     private ProcurementRecordService procurementRecordService;
+    @Autowired
+    private StockUtils stockUtils;
 
 
     /**
@@ -69,7 +73,9 @@
         qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
         .in(QualityInspectFile::getInspectId,ids));
         //鍒犻櫎鍏ュ簱璁板綍
-        procurementRecordService.remove(Wrappers.<ProcurementRecordStorage>lambdaQuery().in(ProcurementRecordStorage::getQualityInspectId,ids));
+        for (Integer id : ids) {
+            stockUtils.deleteStockRecord(Long.valueOf(id), StockQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode());
+        }
         //鍒犻櫎妫�楠屽崟
         return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
     }
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index bdcff3a..07f070e 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -93,7 +93,7 @@
             qualityUnqualifiedMapper.insert(qualityUnqualified);
         } else {
             //鍚堟牸鐩存帴鍏ュ簱
-            stockUtils.addStock(inspect.getProductModelId(), inspect.getQuantity(), StockQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), inspect.getId());
+            stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId());
         }
         qualityInspect.setInspectState(1);//宸叉彁浜�
         return qualityInspectMapper.updateById(qualityInspect);
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java b/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java
index 9c4a1a3..589f5b7 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeCertificationFileController.java
@@ -51,7 +51,7 @@
      */
     @DeleteMapping("/del")
     @ApiOperation("鍒犻櫎")
-    public R delQualityUnqualified(@RequestBody List<Integer> ids) {
+    public R delSafeCertificationFile(@RequestBody List<Integer> ids) {
         if(CollectionUtils.isEmpty(ids)){
             return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
         }
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
index 6e999d1..172d491 100644
--- a/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardController.java
@@ -40,11 +40,13 @@
     public R add(@RequestBody SafeHazard safeHazard) {
         return R.ok(safeHazardService.save(safeHazard));
     }
+
     @ApiOperation("淇敼鍗遍櫓婧愬彴璐�")
     @PutMapping ()
     public R update(@RequestBody  SafeHazard safeHazard) {
         return R.ok(safeHazardService.updateById(safeHazard));
     }
+
     @ApiOperation("鍒犻櫎鍗遍櫓婧愬彴璐�")
     @DeleteMapping("/{ids}")
     public R delSafeHazard(@RequestBody List<Integer> ids) {
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
new file mode 100644
index 0000000..9e4e139
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHazardRecordController.java
@@ -0,0 +1,57 @@
+package com.ruoyi.safe.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.safe.dto.SafeHazardRecordDto;
+import com.ruoyi.safe.pojo.SafeHazard;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.ruoyi.safe.service.SafeHazardRecordService;
+import com.ruoyi.safe.service.SafeHazardService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@RestController
+@RequestMapping("/safeHazardRecord")
+@Api(tags = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+public class SafeHazardRecordController {
+
+    @Autowired
+    private SafeHazardRecordService safeHazardRecordService;
+
+    @GetMapping("/page")
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    public R page(Page page, SafeHazardRecordDto safeHazardRecordDto) {
+        return R.ok(safeHazardRecordService.pageSafeHazardRecord(page, safeHazardRecordDto));
+    }
+
+    @ApiOperation("棰嗙敤")
+    @PostMapping("/borrow")
+    public R borrow(@RequestBody SafeHazardRecord safeHazardRecord) {
+        return R.ok(safeHazardRecordService.borrow(safeHazardRecord));
+    }
+
+    @ApiOperation("褰掕繕")
+    @PutMapping("/return")
+    public R returnSafeHazardRecord(@RequestBody  SafeHazardRecord safeHazardRecord) {
+        return R.ok(safeHazardRecordService.returnSafeHazardRecord(safeHazardRecord));
+    }
+
+    @ApiOperation("鍒犻櫎")
+    @DeleteMapping("/{ids}")
+    public R delSafeHazardRecord(@RequestBody List<Integer> ids) {
+        return R.ok(safeHazardRecordService.delSafeHazardRecord(ids));
+    }
+
+}
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java b/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java
new file mode 100644
index 0000000..f8186ae
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHiddenController.java
@@ -0,0 +1,57 @@
+package com.ruoyi.safe.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.safe.dto.SafeHiddenDto;
+import com.ruoyi.safe.pojo.SafeHazard;
+import com.ruoyi.safe.pojo.SafeHidden;
+import com.ruoyi.safe.service.SafeHazardService;
+import com.ruoyi.safe.service.SafeHiddenService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:10:54
+ */
+@RestController
+@RequestMapping("/safeHidden")
+@Api(tags = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤")
+public class SafeHiddenController {
+
+    @Autowired
+    private SafeHiddenService safeHiddenService;
+
+    @GetMapping("/page")
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    public R page(Page page, SafeHiddenDto safeHiddenDto) {
+        return R.ok(safeHiddenService.pageSafeHidden(page, safeHiddenDto));
+    }
+
+    @ApiOperation("鏂板闅愭偅鎺掓煡")
+    @PostMapping()
+    public R add(@RequestBody SafeHidden safeHidden) {
+        return R.ok(safeHiddenService.add(safeHidden));
+    }
+
+    @ApiOperation("淇敼闅愭偅鎺掓煡(鏁存敼/楠屾敹)")
+    @PutMapping ()
+    public R update(@RequestBody SafeHidden safeHidden) {
+        return R.ok(safeHiddenService.updateById(safeHidden));
+    }
+
+    @ApiOperation("鍒犻櫎闅愭偅鎺掓煡")
+    @DeleteMapping("/{ids}")
+    public R delSafeHidden(@RequestBody List<Integer> ids) {
+        return R.ok(safeHiddenService.delSafeHidden(ids));
+    }
+
+}
diff --git a/src/main/java/com/ruoyi/safe/controller/SafeHiddenFileController.java b/src/main/java/com/ruoyi/safe/controller/SafeHiddenFileController.java
new file mode 100644
index 0000000..6d229c0
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/controller/SafeHiddenFileController.java
@@ -0,0 +1,71 @@
+package com.ruoyi.safe.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.safe.pojo.SafeHiddenFile;
+import com.ruoyi.safe.service.SafeHiddenFileService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢 鍓嶇鎺у埗鍣�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:50:05
+ */
+@RestController
+@RequestMapping("/safeHiddenFile")
+@Api(tags = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢")
+public class SafeHiddenFileController {
+
+    @Resource
+    private SafeHiddenFileService safeHiddenFileService;
+
+
+    /**
+     * 鏂板
+     * @param safeHiddenFile
+     * @return
+     */
+    @PostMapping("/add")
+    @ApiOperation("鏂板")
+    public R add(@RequestBody SafeHiddenFile safeHiddenFile) {
+        return R.ok(safeHiddenFileService.save(safeHiddenFile));
+    }
+
+    /**
+     * 鍒犻櫎
+     * @param ids
+     * @return
+     */
+    @DeleteMapping("/del")
+    @ApiOperation("鍒犻櫎")
+    public R delSafeHiddenFile(@RequestBody List<Integer> ids) {
+        if(CollectionUtils.isEmpty(ids)){
+            return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+        }
+        //鍒犻櫎妫�楠岄檮浠�
+        return R.ok(safeHiddenFileService.removeBatchByIds(ids));
+    }
+
+    /**
+     *鍒嗛〉鏌ヨ
+     * @param page
+     * @param safeHiddenFile
+     * @return
+     */
+    @GetMapping("/listPage")
+    @ApiOperation("鍒嗛〉鏌ヨ")
+    public R listPage(Page page, SafeHiddenFile safeHiddenFile) {
+        return R.ok(safeHiddenFileService.page(page, Wrappers.<SafeHiddenFile>lambdaQuery().eq(SafeHiddenFile::getSafeHiddenId,safeHiddenFile.getSafeHiddenId())));
+    }
+
+}
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
new file mode 100644
index 0000000..3d2c2e0
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
@@ -0,0 +1,43 @@
+package com.ruoyi.safe.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class SafeHazardRecordDto extends SafeHazardRecord {
+
+    @ApiModelProperty("棰嗙敤浜�")
+    private String applyUserName;
+
+    @ApiModelProperty("褰掕繕浜�")
+    private String returnUserName;
+
+    @ApiModelProperty("鍗遍櫓婧愬悕绉�")
+    private String name;
+
+    @ApiModelProperty("鍗遍櫓婧愮紪鐮�")
+    private String code;
+
+    @ApiModelProperty("鍗遍櫓婧愮被鍨�")
+    private String type;
+
+    @ApiModelProperty("椋庨櫓绛夌骇")
+    private String riskLevel;
+
+    @ApiModelProperty("鎵�鍦ㄤ綅缃�")
+    private String location;
+
+
+}
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java b/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java
new file mode 100644
index 0000000..fedb6a0
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java
@@ -0,0 +1,28 @@
+package com.ruoyi.safe.dto;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.safe.pojo.SafeHidden;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Data
+public class SafeHiddenDto extends SafeHidden {
+
+    @ApiModelProperty("涓婃姤浜�")
+    private String createUserName;
+
+    @ApiModelProperty("鏁存敼璐ｄ换浜�")
+    private String rectifyUserName;
+
+    @ApiModelProperty("楠屾敹浜�")
+    private String verifyUserName;
+}
diff --git a/src/main/java/com/ruoyi/safe/mapper/SafeHazardRecordMapper.java b/src/main/java/com/ruoyi/safe/mapper/SafeHazardRecordMapper.java
new file mode 100644
index 0000000..7328be1
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/mapper/SafeHazardRecordMapper.java
@@ -0,0 +1,23 @@
+package com.ruoyi.safe.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.safe.dto.SafeHazardRecordDto;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@Mapper
+public interface SafeHazardRecordMapper extends BaseMapper<SafeHazardRecord> {
+
+    IPage<SafeHazardRecordDto> pageSafeHazardRecord(Page page, @Param("c") SafeHazardRecordDto safeHazardRecordDto);
+}
diff --git a/src/main/java/com/ruoyi/safe/mapper/SafeHiddenFileMapper.java b/src/main/java/com/ruoyi/safe/mapper/SafeHiddenFileMapper.java
new file mode 100644
index 0000000..9b0051a
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/mapper/SafeHiddenFileMapper.java
@@ -0,0 +1,18 @@
+package com.ruoyi.safe.mapper;
+
+import com.ruoyi.safe.pojo.SafeHiddenFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:50:05
+ */
+@Mapper
+public interface SafeHiddenFileMapper extends BaseMapper<SafeHiddenFile> {
+
+}
diff --git a/src/main/java/com/ruoyi/safe/mapper/SafeHiddenMapper.java b/src/main/java/com/ruoyi/safe/mapper/SafeHiddenMapper.java
new file mode 100644
index 0000000..53b0384
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/mapper/SafeHiddenMapper.java
@@ -0,0 +1,23 @@
+package com.ruoyi.safe.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.safe.dto.SafeHiddenDto;
+import com.ruoyi.safe.pojo.SafeHidden;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:10:54
+ */
+@Mapper
+public interface SafeHiddenMapper extends BaseMapper<SafeHidden> {
+
+    IPage<SafeHiddenDto> pageSafeHidden(Page page, @Param("c") SafeHiddenDto safeHiddenDto);
+}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
index e900138..43e5c1e 100644
--- a/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazard.java
@@ -8,10 +8,13 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -70,12 +73,16 @@
     private String remark;
 
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
     @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     @TableField(fill = FieldFill.INSERT_UPDATE)
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
new file mode 100644
index 0000000..45ff844
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHazardRecord.java
@@ -0,0 +1,88 @@
+package com.ruoyi.safe.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@Getter
+@Setter
+@TableName("safe_hazard_record")
+@ApiModel(value = "SafeHazardRecord瀵硅薄", description = "瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶")
+public class SafeHazardRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("鍗曞彿")
+    private String materialRecordCode;
+
+    @ApiModelProperty("鍏宠仈鍗遍櫓婧愬彴璐� ID")
+    private Integer safeHazardId;
+
+    @ApiModelProperty("棰嗙敤浜� ID")
+    private Integer applyUserId;
+
+    @ApiModelProperty("棰嗙敤鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate applyTime;
+
+    @ApiModelProperty("棰嗙敤鏁伴噺")
+    private BigDecimal applyQty;
+
+    @ApiModelProperty("棰嗙敤鐢ㄩ��")
+    private String applyPurpose;
+
+    @ApiModelProperty("褰掕繕浜� ID")
+    private Integer returnUserId;
+
+    @ApiModelProperty("褰掕繕鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate returnTime;
+
+    @ApiModelProperty("褰掕繕鎯呭喌璇存槑")
+    private String returnRemark;
+
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Integer tenantId;
+}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java b/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
new file mode 100644
index 0000000..ba64039
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHidden.java
@@ -0,0 +1,110 @@
+package com.ruoyi.safe.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:10:54
+ */
+@Getter
+@Setter
+@TableName("safe_hidden")
+@ApiModel(value = "SafeHidden瀵硅薄", description = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤")
+public class SafeHidden implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("闅愭偅缂栧彿")
+    private String hiddenCode;
+
+    @ApiModelProperty("闅愭偅绫诲瀷")
+    private String type;
+
+    @ApiModelProperty("闅愭偅椋庨櫓绛夌骇")
+    private String riskLevel;
+
+    @ApiModelProperty("闅愭偅鍏蜂綋浣嶇疆")
+    private String location;
+
+    @ApiModelProperty("闅愭偅鎻忚堪")
+    private String hiddenDesc;
+
+    @ApiModelProperty("鏁存敼璐ｄ换浜� ID")
+    @NotBlank(message = "鏁存敼璐ｄ换浜轰笉鑳戒负绌�")
+    private Integer rectifyUserId;
+
+    @ApiModelProperty("鏁存敼浜鸿仈绯荤數璇�")
+    private String rectifyUserMobile;
+
+    @ApiModelProperty("鏁存敼瀹屾垚鏈熼檺(鏃ユ湡)")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @NotBlank(message = "鏁存敼瀹屾垚鏈熼檺涓嶈兘涓虹┖")
+    private LocalDate rectifyTime;
+
+    @ApiModelProperty("鏁存敼鍏蜂綋鎺柦")
+    private String rectifyMeasures;
+
+    @ApiModelProperty("瀹為檯鏁存敼瀹屾垚鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate rectifyActualTime;
+
+    @ApiModelProperty("楠屾敹浜� ID")
+    private Integer verifyUserId;
+
+    @ApiModelProperty("楠屾敹缁撴灉")
+    private String verifyResult;
+
+    @ApiModelProperty("楠屾敹鎰忚")
+    private String verifyRemark;
+
+    @ApiModelProperty("楠屾敹鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate verifyTime;
+
+    @ApiModelProperty("涓婃姤鏃堕棿")
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("涓婃姤浜篿d")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Integer tenantId;
+}
diff --git a/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java b/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java
new file mode 100644
index 0000000..59f67d1
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/pojo/SafeHiddenFile.java
@@ -0,0 +1,57 @@
+package com.ruoyi.safe.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:50:05
+ */
+@Getter
+@Setter
+@TableName("safe_hidden_file")
+@ApiModel(value = "SafeHiddenFile瀵硅薄", description = "瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢")
+public class SafeHiddenFile implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty("鍏宠仈闅愭偅鎺掓煡涓婃姤id")
+    private Integer safeHiddenId;
+
+    private String name;
+
+    private String url;
+
+    private Object fileSize;
+
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Integer tenantId;
+}
diff --git a/src/main/java/com/ruoyi/safe/service/SafeHazardRecordService.java b/src/main/java/com/ruoyi/safe/service/SafeHazardRecordService.java
new file mode 100644
index 0000000..ab79b88
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/service/SafeHazardRecordService.java
@@ -0,0 +1,28 @@
+package com.ruoyi.safe.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.safe.dto.SafeHazardRecordDto;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+public interface SafeHazardRecordService extends IService<SafeHazardRecord> {
+
+    IPage<SafeHazardRecordDto> pageSafeHazardRecord(Page page, SafeHazardRecordDto safeHazardRecordDto);
+
+    int borrow(SafeHazardRecord safeHazardRecord);
+
+    int returnSafeHazardRecord(SafeHazardRecord safeHazardRecord);
+
+    int delSafeHazardRecord(List<Integer> ids);
+}
diff --git a/src/main/java/com/ruoyi/safe/service/SafeHiddenFileService.java b/src/main/java/com/ruoyi/safe/service/SafeHiddenFileService.java
new file mode 100644
index 0000000..a7daf46
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/service/SafeHiddenFileService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.safe.service;
+
+import com.ruoyi.safe.pojo.SafeHiddenFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:50:05
+ */
+public interface SafeHiddenFileService extends IService<SafeHiddenFile> {
+
+}
diff --git a/src/main/java/com/ruoyi/safe/service/SafeHiddenService.java b/src/main/java/com/ruoyi/safe/service/SafeHiddenService.java
new file mode 100644
index 0000000..e240ec3
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/service/SafeHiddenService.java
@@ -0,0 +1,26 @@
+package com.ruoyi.safe.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.safe.dto.SafeHiddenDto;
+import com.ruoyi.safe.pojo.SafeHidden;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:10:54
+ */
+public interface SafeHiddenService extends IService<SafeHidden> {
+
+    IPage<SafeHiddenDto> pageSafeHidden(Page page, SafeHiddenDto safeHiddenDto);
+
+    int add(SafeHidden safeHidden);
+
+    int delSafeHidden(List<Integer> ids);
+}
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java
new file mode 100644
index 0000000..e6c6a08
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHazardRecordServiceImpl.java
@@ -0,0 +1,88 @@
+package com.ruoyi.safe.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.safe.dto.SafeHazardRecordDto;
+import com.ruoyi.safe.mapper.SafeHazardMapper;
+import com.ruoyi.safe.pojo.SafeHazard;
+import com.ruoyi.safe.pojo.SafeHazardRecord;
+import com.ruoyi.safe.mapper.SafeHazardRecordMapper;
+import com.ruoyi.safe.service.SafeHazardRecordService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--鍗遍櫓鐗╂枡绠℃帶 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 01:13:40
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SafeHazardRecordServiceImpl extends ServiceImpl<SafeHazardRecordMapper, SafeHazardRecord> implements SafeHazardRecordService {
+
+    @Autowired
+    private SafeHazardRecordMapper safeHazardRecordMapper;
+    @Autowired
+    private SafeHazardMapper safeHazardMapper;
+
+    @Override
+    public IPage<SafeHazardRecordDto> pageSafeHazardRecord(Page page, SafeHazardRecordDto safeHazardRecordDto) {
+        return safeHazardRecordMapper.pageSafeHazardRecord(page, safeHazardRecordDto);
+    }
+
+    @Override
+    public int borrow(SafeHazardRecord safeHazardRecord) {
+        //鍒ゆ柇鏁伴噺鏄惁婊¤冻
+        SafeHazard safeHazard = safeHazardMapper.selectById(safeHazardRecord.getSafeHazardId());
+        if (safeHazard.getStockQty().compareTo(safeHazardRecord.getApplyQty())<0) {
+            throw new RuntimeException("搴撳瓨鏁伴噺涓嶈冻");
+        }
+        //棰嗙敤
+        safeHazardRecord.setApplyUserId(SecurityUtils.getUserId().intValue());
+        safeHazardRecord.setApplyTime(LocalDate.now());
+        safeHazardRecordMapper.insert(safeHazardRecord);
+        //鍑忓簱瀛�
+        safeHazard.setStockQty(safeHazard.getStockQty().subtract(safeHazardRecord.getApplyQty()));
+        safeHazardMapper.updateById(safeHazard);
+        return 0;
+    }
+
+    @Override
+    public int returnSafeHazardRecord(SafeHazardRecord safeHazardRecord) {
+        SafeHazard safeHazard = safeHazardMapper.selectById(safeHazardRecord.getSafeHazardId());
+        //褰掕繕
+        safeHazardRecord.setReturnUserId(SecurityUtils.getUserId().intValue());
+        safeHazardRecord.setReturnTime(LocalDate.now());
+        safeHazardRecordMapper.updateById(safeHazardRecord);
+        //澧炲簱瀛�
+        safeHazard.setStockQty(safeHazard.getStockQty().add(safeHazardRecord.getApplyQty()));
+        safeHazardMapper.updateById(safeHazard);
+        return 0;
+    }
+
+    @Override
+    public int delSafeHazardRecord(List<Integer> ids) {
+        List<SafeHazardRecord> safeHazardRecords = safeHazardRecordMapper.selectBatchIds(ids);
+        for (SafeHazardRecord safeHazardRecord : safeHazardRecords) {
+            //鍒ゆ柇鏄惁鏈夊綊杩�
+            if (ObjectUtils.isNull(safeHazardRecord.getReturnUserId())){
+                //娌℃湁褰掕繕,鍒犻櫎棰嗙敤璁板綍闇�瑕佸鍔犲簱瀛�
+                SafeHazard safeHazard = safeHazardMapper.selectById(safeHazardRecord.getSafeHazardId());
+                safeHazard.setStockQty(safeHazard.getStockQty().add(safeHazardRecord.getApplyQty()));
+                safeHazardMapper.updateById(safeHazard);
+            }
+        }
+        safeHazardRecordMapper.deleteBatchIds(ids);
+        return 0;
+    }
+}
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenFileServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenFileServiceImpl.java
new file mode 100644
index 0000000..9e21377
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenFileServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.safe.service.impl;
+
+import com.ruoyi.safe.pojo.SafeHiddenFile;
+import com.ruoyi.safe.mapper.SafeHiddenFileMapper;
+import com.ruoyi.safe.service.SafeHiddenFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤--闄勪欢 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:50:05
+ */
+@Service
+public class SafeHiddenFileServiceImpl extends ServiceImpl<SafeHiddenFileMapper, SafeHiddenFile> implements SafeHiddenFileService {
+
+}
diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
new file mode 100644
index 0000000..993556e
--- /dev/null
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeHiddenServiceImpl.java
@@ -0,0 +1,79 @@
+package com.ruoyi.safe.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.project.system.domain.SysNotice;
+import com.ruoyi.project.system.mapper.SysNoticeMapper;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.project.system.service.impl.SysNoticeServiceImpl;
+import com.ruoyi.safe.dto.SafeHiddenDto;
+import com.ruoyi.safe.pojo.SafeHidden;
+import com.ruoyi.safe.mapper.SafeHiddenMapper;
+import com.ruoyi.safe.service.SafeHiddenService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * <p>
+ * 瀹夊叏鐢熶骇--闅愭偅鎺掓煡涓婃姤 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-01-28 11:10:54
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class SafeHiddenServiceImpl extends ServiceImpl<SafeHiddenMapper, SafeHidden> implements SafeHiddenService {
+
+    @Autowired
+    private SafeHiddenMapper safeHiddenMapper;
+    @Autowired
+    private ISysNoticeService sysNoticeService;
+
+
+    @Override
+    public IPage<SafeHiddenDto> pageSafeHidden(Page page, SafeHiddenDto safeHiddenDto) {
+        return safeHiddenMapper.pageSafeHidden(page, safeHiddenDto);
+    }
+
+    @Override
+    public int add(SafeHidden safeHidden) {
+        safeHiddenMapper.insert(safeHidden);
+        String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        String no = "YH" + String.format("%s%03d", datePrefix, safeHidden.getId());
+        safeHidden.setHiddenCode(no);
+        safeHiddenMapper.updateById(safeHidden);
+        //娑堟伅閫氱煡
+        sysNoticeService.simpleNoticeByUser("闅愭偅鎺掓煡涓婃姤鏁存敼",
+                "闅愭偅绫诲瀷锛�"+safeHidden.getType()+"\n"+
+                        "闅愭偅椋庨櫓绛夌骇锛�"+safeHidden.getRiskLevel()+"\n"+
+                        "闅愭偅鍏蜂綋浣嶇疆锛�"+safeHidden.getLocation()+"\n"+
+                        "闅愭偅鎻忚堪锛�"+safeHidden.getHiddenDesc()+"\n"+
+                        "鏁存敼瀹屾垚鏈熼檺(鏃ユ湡)锛�"+safeHidden.getRectifyTime(),
+                Arrays.asList(Long.valueOf(safeHidden.getRectifyUserId())),
+                "/collaborativeApproval/approvalProcess?id=" + safeHidden.getId());
+        return 0;
+    }
+
+    @Override
+    public int delSafeHidden(List<Integer> ids) {
+        List<SafeHidden> safeHiddens = safeHiddenMapper.selectBatchIds(ids);
+        for (SafeHidden safeHidden : safeHiddens) {
+            //  鍒犻櫎瀵瑰簲鐨勬秷鎭�氱煡
+            sysNoticeService.remove(new LambdaQueryWrapper<SysNotice>()
+                    .eq(SysNotice::getNoticeTitle, "闅愭偅鎺掓煡涓婃姤鏁存敼")
+                    .eq(SysNotice::getSenderId, safeHidden.getCreateUser())
+                    .apply("CAST(notice_content AS CHAR) LIKE CONCAT('%', {0}, '%')", safeHidden.getId()));
+        }
+        safeHiddenMapper.deleteBatchIds(ids);
+        return 0;
+    }
+}
diff --git a/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java b/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
index 7450a7c..15dcbbc 100644
--- a/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
+++ b/src/main/java/com/ruoyi/stock/mapper/StockInventoryMapper.java
@@ -11,6 +11,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -39,4 +40,5 @@
 
     BigDecimal selectTotal();
 
+    BigDecimal selectTotalByDate( @Param("now") LocalDate now);
 }
diff --git a/src/main/resources/mapper/safe/SafeHazardRecordMapper.xml b/src/main/resources/mapper/safe/SafeHazardRecordMapper.xml
new file mode 100644
index 0000000..cd6a85f
--- /dev/null
+++ b/src/main/resources/mapper/safe/SafeHazardRecordMapper.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.safe.mapper.SafeHazardRecordMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.safe.pojo.SafeHazardRecord">
+        <id column="id" property="id" />
+        <result column="material_record_code" property="materialRecordCode" />
+        <result column="safe_hazard_id" property="safeHazardId" />
+        <result column="apply_user_id" property="applyUserId" />
+        <result column="apply_time" property="applyTime" />
+        <result column="apply_qty" property="applyQty" />
+        <result column="apply_purpose" property="applyPurpose" />
+        <result column="return_user_id" property="returnUserId" />
+        <result column="return_time" property="returnTime" />
+        <result column="return_remark" property="returnRemark" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user" property="createUser" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_user" property="updateUser" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+    <select id="pageSafeHazardRecord" resultType="com.ruoyi.safe.dto.SafeHazardRecordDto">
+        select shr.*,
+               su1.nick_name applyUserName,
+               su2.nick_name returnUserName,
+               sh.name,
+               sh.code,
+               sh.type,
+               sh.risk_level,
+               sh.location
+               from safe_hazard_record shr
+        left join sys_user su1 on shr.apply_user_id = su1.user_id
+        left join sys_user su2 on shr.return_user_id = su2.user_id
+        left join safe_hazard sh on shr.safe_hazard_id = sh.id
+        where 1=1
+        <if test="c.materialRecordCode != null and c.materialRecordCode != ''">
+            and shr.material_record_code like concat('%', #{c.materialRecordCode}, '%')
+        </if>
+         <if test="c.name != null and c.name != ''">
+            and sh.name like concat('%', #{c.name}, '%')
+        </if>
+        <if test="c.code != null and c.code != ''">
+            and sh.code like concat('%', #{c.code}, '%')
+        </if>
+        <if test="c.type != null and c.type != ''">
+            and sh.type like concat('%', #{c.type}, '%')
+        </if>
+        <if test="c.riskLevel != null and c.riskLevel != ''">
+            and sh.risk_level like concat('%', #{c.riskLevel}, '%')
+        </if>
+    </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/safe/SafeHiddenFileMapper.xml b/src/main/resources/mapper/safe/SafeHiddenFileMapper.xml
new file mode 100644
index 0000000..47145c9
--- /dev/null
+++ b/src/main/resources/mapper/safe/SafeHiddenFileMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.safe.mapper.SafeHiddenFileMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.safe.pojo.SafeHiddenFile">
+        <id column="id" property="id" />
+        <result column="safe_hidden_id" property="safeHiddenId" />
+        <result column="name" property="name" />
+        <result column="url" property="url" />
+        <result column="file_size" property="fileSize" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user" property="createUser" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_user" property="updateUser" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/safe/SafeHiddenMapper.xml b/src/main/resources/mapper/safe/SafeHiddenMapper.xml
new file mode 100644
index 0000000..c1af4bd
--- /dev/null
+++ b/src/main/resources/mapper/safe/SafeHiddenMapper.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.safe.mapper.SafeHiddenMapper">
+
+    <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.safe.pojo.SafeHidden">
+        <id column="id" property="id" />
+        <result column="hidden_code" property="hiddenCode" />
+        <result column="type" property="type" />
+        <result column="risk_level" property="riskLevel" />
+        <result column="location" property="location" />
+        <result column="hidden_desc" property="hiddenDesc" />
+        <result column="rectify_user_id" property="rectifyUserId" />
+        <result column="rectify_user_mobile" property="rectifyUserMobile" />
+        <result column="rectify_time" property="rectifyTime" />
+        <result column="rectify_measures" property="rectifyMeasures" />
+        <result column="rectify_actual_time" property="rectifyActualTime" />
+        <result column="verify_user_id" property="verifyUserId" />
+        <result column="verify_result" property="verifyResult" />
+        <result column="verify_remark" property="verifyRemark" />
+        <result column="verify_time" property="verifyTime" />
+        <result column="create_time" property="createTime" />
+        <result column="create_user" property="createUser" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_user" property="updateUser" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+    <select id="pageSafeHidden" resultType="com.ruoyi.safe.dto.SafeHiddenDto">
+        select sh.*,
+               su1.nick_name createUserName,
+               su2.nick_name rectifyUserName,
+               su3.nick_name verifyUserName
+        from safe_hidden sh
+        left join sys_user su1 on sh.create_user = su1.user_id
+        left join sys_user su2 on sh.rectify_user_id = su2.user_id
+        left join sys_user su3 on sh.verify_user_id = su3.user_id
+        where 1=1
+        <if test="c.type != null and c.type != ''">
+            and sh.type like concat('%', #{c.type}, '%')
+        </if>
+        <if test="c.riskLevel != null and c.riskLevel != ''">
+            and sh.risk_level like concat('%', #{c.riskLevel}, '%')
+        </if>
+    </select>
+
+</mapper>
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 20b60e7..0c47ede 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -188,5 +188,11 @@
         select ifnull(sum(qualitity),0)
         from stock_inventory
     </select>
+    <select id="selectTotalByDate" resultType="java.math.BigDecimal">
+        select sum(qualitity)
+        from stock_inventory
+        where
+           create_time &gt;= #{now} and create_time &lt; DATE_ADD(#{now}, INTERVAL 1 DAY)
+    </select>
 
 </mapper>

--
Gitblit v1.9.3