From 3440ecd09d9dfc884fe111a2cdd4daff7aae50ef Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 18 九月 2026 15:21:09 +0800
Subject: [PATCH] feat: 检验模块新增纸质单据导出模板（原材料/出厂/过程检验），过程检验新增技术参数等字段并改造判定提交逻辑
---
src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
index bd6f2df..6770a0d 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
@@ -60,9 +60,12 @@
private String tempDir;
@Override
- public IPage<ProductionOperationTaskVo> pageProductionOperationTask(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
+ public IPage<ProductionOperationTaskVo> pageProductionOperationTask(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto, Long currentUserId) {
// 鍒嗛〉鏌ヨ鐢熶骇宸ュ簭浠诲姟
Page<ProductionOperationTaskVo> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+ if (dto != null && currentUserId != null) {
+ dto.setCurrentUserId(currentUserId);
+ }
IPage<ProductionOperationTaskVo> result = baseMapper.pageProductionOperationTask(voPage, dto);
fillOperationTypes(result.getRecords());
fillUserNames(result.getRecords());
@@ -70,8 +73,11 @@
}
@Override
- public List<ProductionOperationTaskVo> listProductionOperationTask(ProductionOperationTaskDto dto) {
+ public List<ProductionOperationTaskVo> listProductionOperationTask(ProductionOperationTaskDto dto, Long currentUserId) {
// 鏌ヨ宸ュ簭浠诲姟鍒楄〃
+ if (dto != null && currentUserId != null) {
+ dto.setCurrentUserId(currentUserId);
+ }
List<ProductionOperationTaskVo> result = BeanUtil.copyToList(this.list(buildQueryWrapper(dto)), ProductionOperationTaskVo.class);
fillOperationTypes(result);
fillUserNames(result);
--
Gitblit v1.9.3