1、注释到多余代码

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
  */

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<QualityFileAssistent> 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<QualityFileAssistent> 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);
     }
 

lab-service/lab-file/src/main/java/org/springblade/file/service/impl/QualityFileServiceImpl.java

@@ -160,8 +160,9 @@ public class QualityFileServiceImpl extends BaseServiceImpl<QualityFileMapper, Q
         qualityFileAssistentService.update(ass);
 
         //然后将当前激活版本的状态赋值1
-        ass.eq(QualityFileAssistent::getVersion, qualityFile.getVersion()).set(QualityFileAssistent::getStatus ,1);
-        qualityFileAssistentService.update(ass);
+        LambdaUpdateWrapper<QualityFileAssistent> assUp = new LambdaUpdateWrapper<>();
+        assUp.eq(QualityFileAssistent::getQualityFileId, qualityFile.getId()).eq(QualityFileAssistent::getVersion, qualityFile.getVersion()).set(QualityFileAssistent::getStatus ,1);
+        qualityFileAssistentService.update(assUp);
 
         return true;
     }

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));
     }
+
 }