fix(培训模块): 修改终止培训阅知时间有问题

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -47,6 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -253,10 +254,11 @@ public class TrainJobController {
     }
 
     private String messageToString(TrainTheme trainTheme){
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         if (trainTheme.getTrainType()==0) {
-            return "培训名称:" + trainTheme.getName() + ",时间:" + trainTheme.getStartTime() ;
+            return "培训名称:" + trainTheme.getName() + ",时间:" + formatter.format(trainTheme.getStartTime());
         }else {
-            return "培训名称:" + trainTheme.getName() + ",时间:" + trainTheme.getStartTime() +
+            return "培训名称:" + trainTheme.getName() + ",时间:" +formatter.format( trainTheme.getStartTime()) +
                     ",培训地点:" + trainTheme.getTrainLocation();
         }
     }
@@ -654,7 +656,8 @@ public class TrainJobController {
     @GetMapping("/suspendTrain/{taskId}/{trainId}")
     public ResponseEntity suspendTrain(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @PathVariable Integer taskId, @PathVariable Integer trainId) {
         TrainTheme trainTheme = trainThemeService.findById(trainId);
-        trainTheme.setDeleteTag(1);
+//        trainTheme.setDeleteTag(1);
+        trainTheme.setTrainStatus(StatusEnum.ARCHIVE.id);
         trainThemeService.save(trainTheme);
         TaskBto taskBto= taskService.findBillIdAndBusinessTypeNotBillStatus(trainTheme.getTrainId(),BusinessEnum.TRAIN.id).get().parse2Bto();
         taskService.moveToArchive(taskBto);