[培训列表查询] bug修改

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

@@ -145,12 +145,12 @@ public class TrainJobController {
         if (securityUser.getCurrentUserInfo().getUnits().getLevel()==1){
             List<Integer> userIds=userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList());
             userIds.remove(securityUser.getCurrentUserInfo().getUserId());
-            messageService.add(new MessageBto(task.getId(),BusinessEnum.TRAIN.id,securityUser.getUsername()+"发起培训",userIds));
+            messageService.add(new MessageBto(task.getId(),BusinessEnum.TRAIN.id,securityUser.getUsername()+"发起培训",userIds,trainTheme.getTrainId().toString()));
         }else {
             List<Integer> userIds=userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList());
             userIds.remove(securityUser.getCurrentUserInfo().getUserId());
             userIds.addAll(userService.findAllByUnite(1).stream().map(User::getUserId).collect(Collectors.toList()));
-            messageService.add(new MessageBto(task.getId(),BusinessEnum.TRAIN.id,securityUser.getUsername()+"发起培训",userIds));
+            messageService.add(new MessageBto(task.getId(),BusinessEnum.TRAIN.id,securityUser.getUsername()+"发起培训",userIds,trainTheme.getTrainId().toString()));
         }
         return ResponseEntity.ok(trainThemeService.save(trainTheme));
     }
@@ -208,7 +208,7 @@ public class TrainJobController {
         List<Integer> userIds=userService.findAllByUnite(securityUser.getCurrentUserInfo().getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList());
         userIds.addAll(userService.findAllByUnite(trainTheme.getUnitsId()).stream().map(User::getUserId).collect(Collectors.toList()));
         userIds.remove(securityUser.getCurrentUserInfo().getUserId());
-        messageService.add(new MessageBto(taskBto.getId(),BusinessEnum.TRAIN.id,securityUser.getUsername()+"提交了培训名单",userIds));
+        messageService.add(new MessageBto(taskBto.getId(),BusinessEnum.TRAIN.id,securityUser.getUsername()+"提交了培训名单",userIds,trainTheme.getTrainId().toString()));
 
         return ResponseEntity.ok(taskBto);
     }

dev-train/src/main/java/com/tykj/dev/device/train/entity/TrainTheme.java

@@ -15,6 +15,7 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
 import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
@@ -32,6 +33,7 @@ import java.util.List;
 @ApiModel("新增培训对象")
 @AllArgsConstructor
 @NoArgsConstructor
+@EntityListeners(AuditingEntityListener.class)
 @Data
 @Entity
 public class TrainTheme {

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/WorkHandoverServiceImpl.java

@@ -16,6 +16,8 @@ import com.tykj.dev.device.train.entity.vo.WorkHandoverUserVo;
 import com.tykj.dev.device.train.entity.vo.WorkHandoverVo;
 import com.tykj.dev.device.train.service.TrainTaskService;
 import com.tykj.dev.device.train.service.WorkHandoverService;
+import com.tykj.dev.device.user.read.service.MessageService;
+import com.tykj.dev.device.user.read.subject.bto.MessageBto;
 import com.tykj.dev.device.user.subject.entity.SecurityUser;
 import com.tykj.dev.device.user.subject.entity.User;
 import com.tykj.dev.device.user.subject.service.UnitsService;
@@ -25,6 +27,7 @@ import com.tykj.dev.misc.base.StatusEnum;
 import com.tykj.dev.misc.exception.ApiException;
 import com.tykj.dev.misc.utils.JacksonUtil;
 import com.tykj.dev.misc.utils.StringSplitUtil;
+import io.swagger.annotations.ApiModel;
 import lombok.extern.slf4j.Slf4j;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +60,9 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
     @Autowired
     UserService userService;
 
+    @Autowired
+    MessageService messageService;
+
     @Autowired
     UnitsService unitsService;
 
@@ -88,8 +94,8 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
         workHandoverDevDao.saveAll(workHandoverDevs);
         List<Integer> integers = new ArrayList<>();
         integers.add(securityUser.getCurrentUserInfo().getUserId());
-        taskService.start(new TaskBto(StatusEnum.WORKHANDOVER1011.id, "工作交接", null, null, workHandover.getWorkHandoverId(), BusinessEnum.WORK_HANDOVER.id, securityUser.getCurrentUserInfo().getUnitsId(), 0, null, integers));
-
+        TaskBto taskBto= taskService.start(new TaskBto(StatusEnum.WORKHANDOVER1011.id, "工作交接", null, null, workHandover.getWorkHandoverId(), BusinessEnum.WORK_HANDOVER.id, securityUser.getCurrentUserInfo().getUnitsId(), 0, null, integers));
+        addMessage(new MessageBto(taskBto.getId(),taskBto.getBusinessType(),"发起工作交接业务",gainThisUser(securityUser.getCurrentUserInfo().getUserId(),securityUser.getCurrentUserInfo().getUnitsId()),workHandover.getWorkHandoverId().toString()));
         return workHandover;
     }
 
@@ -165,4 +171,27 @@ public class WorkHandoverServiceImpl implements WorkHandoverService {
 
         return userService.findAllUserIdInUser(userIds);
     }
+
+    private void addMessage(MessageBto messageBto){
+        messageService.add(messageBto);
+    }
+
+    /**
+     * 根据单位id查询用户 去除用户id
+     * @param userId
+     * @param unitId
+     * @return
+     */
+    private List<Integer> gainThisUser(Integer userId,Integer unitId){
+        return userService.findAllByUnite(unitId).stream().filter(user -> user.getUnitsId()!=userId).map(User::getUserId).collect(Collectors.toList());
+    }
+
+    /**
+     * 根据单位id查询用户id集合
+     * @param unitId
+     * @return
+     */
+    private List<Integer> findUnitId(Integer unitId){
+        return userService.findAllByUnite(unitId).stream().map(User::getUserId).collect(Collectors.toList());
+    }
 }

dev-train/src/main/java/com/tykj/dev/device/train/task/TrainTask.java

@@ -53,10 +53,10 @@ public class TrainTask {
     private void signUpDeadline() {
         trainThemeService.findAllStatus(StatusEnum.TRAIN1000.id).forEach(
                 trainTheme -> {
-                    log.info("[培训] 检查报名时间是否结束");
+//                    log.info("[培训] 检查报名时间是否结束");
                     long time = new Date().getTime();
                     if (trainTheme.getTrainTime().getTime() <= time) {
-                        log.info("[培训] 检查报名时间{}",trainTheme.getTrainId());
+//                        log.info("[培训] 检查报名时间{}",trainTheme.getTrainId());
                         signUpEnd(trainTheme.getTrainId());
                     }
                 }

dev-user/src/main/java/com/tykj/dev/device/user/read/subject/bto/MessageBto.java

@@ -114,6 +114,14 @@ public class MessageBto {
         this.involveUserIdList = involveUserIdList;
     }
 
+    public MessageBto(Integer taskId, Integer businessType, String content, List<Integer> involveUserIdList,String record) {
+        this.taskId = taskId;
+        this.businessType = businessType;
+        this.content = content;
+        this.involveUserIdList = involveUserIdList;
+        this.record=record;
+    }
+
     public MessageBto(Integer taskId, Integer businessType, String content, List<Integer> involveUserIdList, Integer isHighLight) {
         this.taskId = taskId;
         this.businessType = businessType;
@@ -121,4 +129,6 @@ public class MessageBto {
         this.involveUserIdList = involveUserIdList;
         this.isHighLight = isHighLight;
     }
+
+
 }