From 6b8a5dbe23f83fd3891aba5ade9496dab619cdfa Mon Sep 17 00:00:00 2001 From: "a15234804788@163.com" Date: Sat, 8 Oct 2022 17:51:50 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B3=A8=E9=87=8A=E5=88=B0=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/lims/commands/Command.java | 2 +- .../controller/QualityFileController.java | 25 +++++++++++-------- .../service/impl/QualityFileServiceImpl.java | 5 ++-- .../controller/TrainPersonController.java | 1 + 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/Command.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/Command.java index d06a7ee..24c1c2f 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/Command.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/commands/Command.java @@ -3,7 +3,7 @@ package org.springblade.lims.commands; import java.util.Map; /** - * @Description 命令的抽象类 + * @Description 二维码命令的抽象类 * @Author ytl * @Date 2022/9/23 0023 14:16 */ diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java index 950922c..cc3b98e 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/controller/QualityFileController.java @@ -31,6 +31,7 @@ import org.apache.commons.lang.math.RandomUtils; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateTimeUtil; import org.springblade.core.tool.utils.Func; import org.springblade.file.dto.QualityFileDTO; import org.springblade.file.entity.QualityFileAssistent; @@ -43,6 +44,7 @@ import org.springblade.file.vo.QualityFileVO; import org.springblade.file.service.IQualityFileService; import org.springblade.core.boot.ctrl.BladeController; +import java.time.LocalDateTime; import java.util.List; /** @@ -138,17 +140,18 @@ public class QualityFileController extends BladeController { public R update(@Valid @RequestBody QualityFile qualityFile) { boolean b = qualityFileService.updateFile(qualityFile); // 子文件激活状态修改 - if(b) { - LambdaQueryWrapper assisWrapper = new LambdaQueryWrapper<>(); - assisWrapper.eq(QualityFileAssistent::getQualityFileId , qualityFile.getId()); - QualityFileAssistent ass = new QualityFileAssistent(); - ass.setStatus(0); - b = qualityFileAssistentService.update(ass, assisWrapper); - - assisWrapper.eq(QualityFileAssistent::getVersion, qualityFile.getVersion()); - ass.setStatus(1); - b = qualityFileAssistentService.update(ass, assisWrapper); - } +// if(b) { +// LambdaQueryWrapper assisWrapper = new LambdaQueryWrapper<>(); +// assisWrapper.eq(QualityFileAssistent::getQualityFileId , qualityFile.getId()); +// QualityFileAssistent ass = new QualityFileAssistent(); +// ass.setStatus(0); +// b = qualityFileAssistentService.update(ass, assisWrapper); +// +// assisWrapper.eq(QualityFileAssistent::getVersion, qualityFile.getVersion()); +// ass.setStatus(1); +// b = qualityFileAssistentService.update(ass, assisWrapper); +// } + return R.status(b); } diff --git a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java index 93d69a6..ceb59d5 100644 --- a/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java +++ b/lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java @@ -160,8 +160,9 @@ public class QualityFileServiceImpl extends BaseServiceImpl assUp = new LambdaUpdateWrapper<>(); + assUp.eq(QualityFileAssistent::getQualityFileId, qualityFile.getId()).eq(QualityFileAssistent::getVersion, qualityFile.getVersion()).set(QualityFileAssistent::getStatus ,1); + qualityFileAssistentService.update(assUp); return true; } diff --git a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/TrainPersonController.java b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/TrainPersonController.java index 76395f1..03758ac 100644 --- a/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/TrainPersonController.java +++ b/lab-service/lab-user/src/main/java/org/springblade/system/user/controller/TrainPersonController.java @@ -47,4 +47,5 @@ public class TrainPersonController extends BladeController { trainPerson.setSignInTime(new Date()); return R.status(trainPersonService.updateById(trainPerson)); } + }