From c0eabff28c4bd9212d2550162f28193daf9976fe Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 23 三月 2026 14:25:40 +0800
Subject: [PATCH] feat: 新增巡检记录通知功能及查询条件优化
---
src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java b/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java
index 0ac5c53..4548b54 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductInspectionRecordController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -14,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -34,6 +36,11 @@
@Log(title = "宸℃璁板綍 鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
public AjaxResult page(ProductInspectionRecordDto productInspectionRecord, Page<ProductInspectionRecord> page) {
LambdaQueryWrapper<ProductInspectionRecord> ew = Wrappers.<ProductInspectionRecord>lambdaQuery();
+ ew.eq(StringUtils.isNotEmpty(productInspectionRecord.getProcess()), ProductInspectionRecord::getProcess, productInspectionRecord.getProcess())
+ .eq(StringUtils.isNotEmpty(productInspectionRecord.getProcessId()), ProductInspectionRecord::getProcessId, productInspectionRecord.getProcessId())
+ .between(Objects.nonNull(productInspectionRecord.getStartTime()) && Objects.nonNull(productInspectionRecord.getEndTime()),
+ ProductInspectionRecord::getInspectionTime, productInspectionRecord.getStartTime(),
+ productInspectionRecord.getEndTime());
return AjaxResult.success(productInspectionRecordService.page(page, ew));
}
@@ -61,4 +68,12 @@
productInspectionRecordService.removeBatchByIds(ids);
return AjaxResult.success();
}
+
+ @ApiOperation("宸℃璁板綍 閫氱煡")
+ @PostMapping("/notify")
+ @Log(title = "宸℃璁板綍 閫氱煡", businessType = BusinessType.OTHER)
+ public AjaxResult notify(@RequestBody List<Long> ids) {
+ productInspectionRecordService.notify(ids);
+ return AjaxResult.success("鍙戦�侀�氱煡鎴愬姛");
+ }
}
--
Gitblit v1.9.3