Merge branch 'dev' of http://gitlab.91isoft.com:90/wangfei/vehicle-quality-review into wangdingyi

quality-review/src/main/java/com/ruoyi/service/impl/PdfTemplateManagementServiceImpl.java

@@ -157,7 +157,7 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
             Optional<String> optionalElement = i < pictureList.size()
                     ? Optional.of(pictureList.get(i))
                     : Optional.empty();
-            if (optionalElement.isPresent()) {
+            if (optionalElement.isPresent() && StrUtil.isNotEmpty(optionalElement.get())) {
                 Image image = Image.getInstance(new URL(minioEndpoint + optionalElement.get()));
                 image.scaleAbsolute(100, 100);
                 cell.addElement(image);

quality-review/src/main/java/com/ruoyi/service/impl/StrategyModelTestTaskNew.java

@@ -107,6 +107,7 @@ public class StrategyModelTestTaskNew implements StrategyModelTestTask, Initiali
     public void doStartTest(ModelTestTask modelTestTask) {
         modelTestTaskMapper.update(new ModelTestTask(),
                 new LambdaUpdateWrapper<ModelTestTask>()
+                        .set(ModelTestTask::getTaskBeginTime, new Date())
                         .set(ModelTestTask::getTaskStatus, ModelTestTask.TASK_STATUS_PENDING)
                         .eq(ModelTestTask::getId, modelTestTask.getId()));
     }

quality-review/src/main/java/com/ruoyi/service/impl/StrategyModelTestTaskPending.java

@@ -13,6 +13,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -47,6 +48,7 @@ public class StrategyModelTestTaskPending implements StrategyModelTestTask, Init
         // 进行中的任务, 点击确认后, 状态改为待签字
         modelTestTaskMapper.update(new ModelTestTask(),
                 new LambdaUpdateWrapper<ModelTestTask>()
+                        .set(ModelTestTask::getTaskEndTime, new Date())
                         .set(ModelTestTask::getTaskStatus, ModelTestTask.TASK_STATUS_SIGNED)
                         .eq(ModelTestTask::getId, modelTestTask.getId()));
     }