合并dev

dev-block/src/main/java/com/tykj/dev/device/block/service/impl/BlockDataServiceImpl.java

@@ -33,13 +33,12 @@ public class BlockDataServiceImpl implements BlockDataService {
 
     @Override
     public BlockData findBillTypeAndBillId(Integer billType, Integer billId) {
-        List<BlockData> allByBillTypeAndBillId = blockDataDao.findAllByBillTypeAndBillId(billType, billId).stream().sorted(Comparator.comparing(BlockData::getId).reversed()).collect(Collectors.toList());
+        List<BlockData> allByBillTypeAndBillId = blockDataDao.findAllByBillTypeAndBillId(billType, billId).stream().sorted(Comparator.comparing(BlockData::getCreateTime).reversed()).collect(Collectors.toList());
         if (allByBillTypeAndBillId.size()>0){
             return allByBillTypeAndBillId.get(0);
         }else {
             return new BlockData();
         }
-
     }
 
     @Override

dev-selfcheck/src/main/java/com/tykj/dev/device/selfcheck/service/impl/SelfCheckBillServiceImpl.java

@@ -135,6 +135,7 @@ public class SelfCheckBillServiceImpl implements SelfCheckBillService {
         SelfCheckBill selfCheckBill = selfExaminationBillDao.save(selfExaminationBillEntity);
         CompletableFuture.runAsync(() -> blockChainUtil.appendHash(JacksonUtil.toJSon(selfCheckBill),
                 selfCheckBill.getRecordId()), TaskBeanConfig.getThreadPoolTaskScheduler());
+        sendText(selfExaminationBillEntity.getId());
         return selfCheckBill;
     }
 

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/DeviceRepelDetail.java

@@ -90,7 +90,7 @@ public class DeviceRepelDetail extends BaseEntity {
      */
     @ApiModelProperty(value = "配发时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date sendTime;
+    private Date sendTime= new Date();
     /**
      * 接收时间
      */

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/DeviceRepelDetailServiceImpl.java

@@ -225,7 +225,7 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
                 .initiateUnitName(deviceRepelDetail.getSendUnit())
                 .receiveUnitName(deviceRepelDetail.getReceiveUnit())
                 .documentNo(deviceRepelDetail.getNum())
-                .operationTime(DateUtil.getLocalDateTime(deviceRepelDetail.getSendTime()))
+                .operationTime(deviceRepelDetail.getSendTime()!=null?DateUtil.getLocalDateTime(deviceRepelDetail.getSendTime()):null)
                 .operatorUserName(operatorName(deviceRepelDetail))
                 .build());
 
@@ -238,7 +238,7 @@ public class DeviceRepelDetailServiceImpl implements DeviceRepelDetailService {
                 .initiateUnitName(deviceRepelDetail1.getSendUnit())
                 .receiveUnitName(deviceRepelDetail1.getReceiveUnit())
                 .documentNo(deviceRepelDetail1.getNum())
-                .operationTime(DateUtil.getLocalDateTime(deviceRepelDetail1.getSendTime()))
+                .operationTime(deviceRepelDetail1.getSendTime()!=null?DateUtil.getLocalDateTime(deviceRepelDetail1.getSendTime()):null)
                 .operatorUserName(operatorName(deviceRepelDetail1))
                 .build());
         blockTraceabilityParsing.setBlockData(deviceRepelDetail1);

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

@@ -370,6 +370,12 @@ public class TrainJobController {
                    userId-> onlineLearningTask(trainId,taskBto.getId(),trainTheme.getName(),userId,taskBto.getOwnUnit())
            );
         }
+
+        trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN_SIGN_UP.id, StatusEnum.TRAIN1016.id).forEach(
+                taskBto1 -> {
+                    taskService.moveToEnd(taskBto1);
+                }
+        );
         return ResponseEntity.ok(trainThemeService.save(trainTheme));
     }