Merge branch '0914tmp'

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/common/CcNodeType.java

+package com.tykj.dev.device.confirmcheck.common;
+
+import lombok.Getter;
+
+/**
+ * CcNodeType.
+ *
+ * @author Matrix <xhyrzldf@gmail.com>
+ * @since 2021/9/23 at 12:48 下午
+ */
+@Getter
+public enum CcNodeType {
+
+    /**
+     * 核查节点
+     */
+    CHECK,
+    /**
+     * 检查节点
+     */
+    EXAM,
+    /**
+     * 自查节点
+     */
+    MANUAL,
+    /**
+     * 统计数据确认节点
+     */
+    CONFIRM,
+    /**
+     * 不属于以上的其他节点
+     */
+    NONE;
+}

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/service/impl/ConfirmCheckServiceImpl.java

@@ -309,10 +309,8 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
      */
     @Override
     public Page<CheckStatTableVo> findAllStatTable(CheckBillSelectVo checkBillSelectVo) {
-        //过滤出顶级节点
+        //过滤出顶级节点 过滤逻辑是1.自己就是父节点2.自己的customInfo = exam or check
         List<TaskBto> topStatList = taskService.findBillType(7);
-//        List<TaskBto> topDetailList = taskService.findBillType(8);
-//        topStatList.addAll(topDetailList);
 
         List<Integer> topIdList = topStatList.stream()
                 .filter(taskBto -> taskBto.getParentTaskId().equals(0) || taskBto.getParentTaskId() == null)

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

@@ -223,6 +223,7 @@ public class TrainJobController {
         TaskBto taskBto = taskService.get(signUpReturn.getTaskId());
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(),StatusEnum.TRAIN1002);
         Integer taskId=taskBto.getId();
+        List<Integer> userIds=new ArrayList<>();
         TrainUnit trainUnit= trainUnitDao.findByTrainIdAndUnitId(trainTheme.getTrainId(),taskBto.getOwnUnit());
         if (trainTheme.getTrainTime().getTime()<new Date().getTime()){
             trainUnit.setSubmitStatus(3);
@@ -238,6 +239,8 @@ public class TrainJobController {
                 trainUser.setArriveTime(signUpUser.getArriveTime());
                 trainUser.setLeaveMeal(signUpUser.getLeaveMeal());
                 trainUser.setLeaveTime(signUpUser.getLeaveTime());
+                trainUser.setNote(signUpUser.getNote());
+                userIds.add(trainUser.getUserId());
                 userLogService.save(new UserLog(trainUser.getUserId(),new Date(),"报名参加培训"));
             } else {
                 trainUser.setIsSignUp(2);
@@ -249,12 +252,10 @@ public class TrainJobController {
         TaskLogBto taskLogBto = new TaskLogBto(taskId, "提交了培训名单", null);
         taskLogService.addLog(taskLogBto);
 //        userLogService.save(new UserLog(securityUser.getCurrentUserInfo().getUserId(),new Date(),"不参加培训"));
-        taskBto.setCreateUserId(securityUser.getCurrentUserInfo().getUserId());
-        taskBto = taskService.moveToEnd(taskBto);
+//        taskBto.setCreateUserId(securityUser.getCurrentUserInfo().getUserId());
+//        taskBto = taskService.moveToEnd(taskBto);
         trainUnitDao.save(trainUnit);
-        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(0, BusinessEnum.TRAIN_SIGN_UP.id, securityUser.getCurrentUserInfo().getName()+"帮你报名["+trainTheme.getName()+"]培训,培训地点："+trainTheme.getTrainLocation(), userIds, trainTheme.getTrainId().toString()));
         return ResponseEntity.ok(taskBto);
     }
 
@@ -274,9 +275,8 @@ public class TrainJobController {
         TaskDisposeUtil.isNotSubmit(taskBto.getBillStatus(), StatusEnum.END);
         taskBto = taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1002, 0);
         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() + "拒绝了"+units.getName()+"培训报名", userIds, trainTheme.getTrainId().toString()));
+        userIds.addAll(userService.findAllByUnite(trainTheme.getUnitsId()).stream().filter(user -> !user.getUserId().equals(securityUser.getCurrentUserInfo().getUserId())).map(User::getUserId).collect(Collectors.toList()));
+        messageService.add(new MessageBto(0, BusinessEnum.TRAIN.id, securityUser.getCurrentUserInfo().getName()+"让"+units.getName()+"重新培训报名", userIds, trainTheme.getTrainId().toString()));
         return ResponseEntity.ok(taskBto);
     }
 

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

@@ -88,6 +88,7 @@ public class TrainTheme {
      * 培训开始时间
      */
     @ApiModelProperty(value = "培训开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date startTime;
     /**
      * 培训结束时间

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

@@ -145,11 +145,11 @@ public class TrainUser {
 
 
     @ApiModelProperty(value = "到达就餐 0.无 1.午饭 2.晚饭", name = "arriveMeal")
-    private Integer arriveMeal;
+    private String arriveMeal;
 
 
     @ApiModelProperty(value = "离开就餐 0.无 1.午饭 2.晚饭", name = "leaveMeal")
-    private Integer leaveMeal;
+    private String leaveMeal;
 
     @ApiModelProperty(value = "是否必须报名 1.必须 2.不必须", name = "certificate")
     private Integer  isNotJoinUserId;
@@ -176,29 +176,7 @@ public class TrainUser {
         }else {
             trainUserExcelVo.setPositionString("干事");
         }
-        switch (this.getArriveMeal()){
-            case 0:
-                trainUserExcelVo.setArriveMealString("不包括饭");
-                break;
-            case 1:
-                trainUserExcelVo.setArriveMealString("午饭");
-                break;
-            case 2:
-                trainUserExcelVo.setArriveMealString("晚饭");
-                break;
-        }
 
-        switch (this.getLeaveMeal()){
-            case 0:
-                trainUserExcelVo.setLeaveMealString("不包括饭");
-                break;
-            case 1:
-                trainUserExcelVo.setLeaveMealString("午饭");
-                break;
-            case 2:
-                trainUserExcelVo.setLeaveMealString("晚饭");
-                break;
-        }
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         Instant instant = this.getLeaveTime().toInstant();
         ZoneId zoneId = ZoneId.systemDefault();
@@ -207,7 +185,8 @@ public class TrainUser {
         LocalDateTime ArriveTime=instant1.atZone(zoneId).toLocalDateTime();
         trainUserExcelVo.setArriveTime(ArriveTime.format(df));
         trainUserExcelVo.setLeaveTime(LeaveTime.format(df));
-
+        trainUserExcelVo.setLeaveMealString(this.leaveMeal);
+        trainUserExcelVo.setArriveMealString(this.arriveMeal);
         int daysNum=(int)(LeaveTime.toLocalDate().toEpochDay() - ArriveTime.toLocalDate().toEpochDay());
         if (daysNum > 0){
             trainUserExcelVo.setDayNum(daysNum);

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

@@ -45,11 +45,11 @@ public class SignUpUsers {
 
 
     @ApiModelProperty(value = "到达就餐 1.午饭 2.晚饭", name = "arriveMeal")
-    private Integer arriveMeal;
+    private String arriveMeal;
 
 
     @ApiModelProperty(value = "离开就餐 1.午饭 2.晚饭", name = "leaveMeal")
-    private Integer leaveMeal;
+    private String leaveMeal;
 
 
 }

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

@@ -58,22 +58,22 @@ public class TrainUserExcelVo {
 
 
     @ApiModelProperty(value = "到达时间", name = "arriveTime")
-    @Excel(name = "到达时间", orderNum = "1", width = 30, needMerge = true)
+    @Excel(name = "到达日期", orderNum = "1", width = 30, needMerge = true)
     private String arriveTime;
 
 
     @ApiModelProperty(value = "离开时间", name = "leaveTime")
-    @Excel(name = "离开时间", orderNum = "1", width = 30, needMerge = true)
+    @Excel(name = "离开日期", orderNum = "1", width = 30, needMerge = true)
     private String leaveTime;
 
 
     @ApiModelProperty(value = "到达就餐 0.无 1.午饭 2.晚饭", name = "arriveMeal")
-    @Excel(name = "到达就餐", orderNum = "1", width = 30, needMerge = true)
+    @Excel(name = "到达时间", orderNum = "1", width = 30, needMerge = true)
     private String arriveMealString;
 
 
     @ApiModelProperty(value = "离开就餐 0.无 1.午饭 2.晚饭", name = "leaveMeal")
-    @Excel(name = "离开就餐", orderNum = "1", width = 30, needMerge = true)
+    @Excel(name = "离开时间", orderNum = "1", width = 30, needMerge = true)
     private String leaveMealString;
 
     @ApiModelProperty(value = "住宿天数", name = "leaveMeal")

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

@@ -193,7 +193,7 @@ public class TrainThemeServiceImpl implements TrainThemeService {
                     taskBto1 -> {
                         TrainUnit trainUnit=trainUnitMap.get(taskBto1.getOwnUnit());
                         List<TrainUser> trainUsersNotSignUp = trainUsers.stream().filter(trainUser -> trainUser.getUnitsId().equals(taskBto1.getOwnUnit()) && trainUser.getIsSignUp() == 2).collect(Collectors.toList());
-                        if (taskBto1.getBillStatus().equals(StatusEnum.TRAIN1002.id)){
+                        if (taskBto1.getBillStatus().equals(StatusEnum.TRAIN1002.id) && trainUnit.getSubmitStatus()==1){
                            flag.set(false);
                            List<TrainUser> trainUserList = trainUsers.stream().filter(trainUser -> trainUser.getUnitsId().equals(taskBto1.getOwnUnit())).collect(Collectors.toList());
                            notSignUpTrainUserToUnitVo.add(new TrainUserToUnitVo(taskBto1.getOwnUnit(), unitsCache.findById(taskBto1.getOwnUnit()).getName(), trainUserList, taskBto1.getId(),trainUnit.getSubmitStatus()));
@@ -202,9 +202,7 @@ public class TrainThemeServiceImpl implements TrainThemeService {
                            if (trainUsersSignUp.size() != 0) {
                                signUpTrainUserToUnitVo.add(new TrainUserToUnitVo(taskBto1.getOwnUnit(),unitsCache.findById(taskBto1.getOwnUnit()).getName(), trainUsersSignUp, taskBto1.getId(),trainUnit.getSubmitStatus()));
                            }
-                           if (trainUsersNotSignUp.size() != 0) {
-                               notSignUpTrainUserToUnitVo.add(new TrainUserToUnitVo(taskBto1.getOwnUnit(), unitsCache.findById(taskBto1.getOwnUnit()).getName(), trainUsersNotSignUp, taskBto1.getId(),trainUnit.getSubmitStatus()));
-                           }
+                           notSignUpTrainUserToUnitVo.add(new TrainUserToUnitVo(taskBto1.getOwnUnit(), unitsCache.findById(taskBto1.getOwnUnit()).getName(), trainUsersNotSignUp, taskBto1.getId(),trainUnit.getSubmitStatus()));
                        }
                     }
             );