web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordAddExe.java

@@ -5,7 +5,6 @@ import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.edu.domain.gateway.training.TrainingApplyProcessGateway;
 import com.zcloud.edu.domain.gateway.training.TrainingApplyRecordGateway;
 import com.zcloud.edu.domain.gateway.training.TrainingApplyUserGateway;
-import com.zcloud.edu.domain.gateway.training.TrainingUserGateway;
 import com.zcloud.edu.domain.model.training.TrainingApplyRecordE;
 import com.zcloud.edu.domain.model.training.TrainingApplyUserE;
 import com.zcloud.edu.dto.training.TrainingApplyRecordAddCmd;
@@ -33,7 +32,6 @@ public class TrainingApplyRecordAddExe {
 
     private final TrainingApplyUserGateway trainingApplyUserGateway;
     private final TrainingApplyProcessGateway trainingApplyProcessGateway;
-    private final TrainingUserGateway trainingUserGateway;
 
     @Transactional(rollbackFor = Exception.class)
     public String execute(TrainingApplyRecordAddCmd cmd) {
@@ -54,14 +52,6 @@ public class TrainingApplyRecordAddExe {
             }
         }
 
-        // 保存培训人员
-        if (!CollectionUtils.isEmpty(record.getTrainingUsers())) {
-            boolean trainingUserResult = trainingUserGateway.addBatch(record.getTrainingUsers());
-            if (!trainingUserResult) {
-                throw new BizException("培训人员保存失败");
-            }
-        }
-
         // 保存流程记录
         if (!CollectionUtils.isEmpty(record.getProcesses())) {
             boolean processResult = trainingApplyProcessGateway.addBatch(record.getProcesses());

web-app/src/main/java/com/zcloud/edu/command/training/TrainingApplyRecordUpdateExe.java

@@ -1,16 +1,24 @@
 package com.zcloud.edu.command.training;
 
 import com.alibaba.cola.exception.BizException;
+import com.jjb.saas.framework.auth.model.SSOUser;
+import com.jjb.saas.framework.auth.utils.AuthContext;
+import com.zcloud.edu.domain.gateway.training.TrainingApplyProcessGateway;
 import com.zcloud.edu.domain.gateway.training.TrainingApplyRecordGateway;
 import com.zcloud.edu.domain.gateway.training.TrainingApplyUserGateway;
 import com.zcloud.edu.domain.gateway.training.TrainingUserGateway;
 import com.zcloud.edu.domain.model.training.TrainingApplyRecordE;
 import com.zcloud.edu.dto.training.TrainingApplyRecordUpdateCmd;
+import com.zcloud.edu.persistence.dataobject.TrainingApplyRecordDO;
+import com.zcloud.edu.persistence.repository.training.TrainingUserRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
+
+
+
 /**
 * web-app
 * @Author makejava
@@ -33,6 +41,7 @@ public class TrainingApplyRecordUpdateExe {
         }
     }
 
+
     /**
      * 审批
      */
@@ -43,21 +52,18 @@ public class TrainingApplyRecordUpdateExe {
         BeanUtils.copyProperties(trainingApplyRecordUpdateCmd, trainingApplyRecordE);
         trainingApplyRecordE.approve(oldTrainingRecord.getApprovalStatus());
         trainingApplyRecordE.addTrainingUser();
-
-        // 修改申请人员状态
         boolean updateUserStatus = trainingApplyUserGateway.updateStatusByApprove(trainingApplyRecordE.getApplyUsers());
         if (!updateUserStatus) {
             throw new BizException("修改申请人员状态失败");
         }
-        // 修改培训人员状态
+        boolean addTrainingUser = trainingUserGateway.addBatch(trainingApplyRecordE.getTrainingUsers());
-        boolean updateTrainingUserStatus = trainingUserGateway.updateStatusByApprove(trainingApplyRecordE.getTrainingUsers());
+        if (!addTrainingUser) {
-        if (!updateTrainingUserStatus) {
+            throw new BizException("新增培训人员失败");
-            throw new BizException("修改培训人员状态失败");
         }
-
         boolean res = trainingApplyRecordGateway.update(trainingApplyRecordE);
         if (!res) {
             throw new BizException("修改失败");
         }
     }
 }
+

web-domain/src/main/java/com/zcloud/edu/domain/gateway/training/TrainingUserGateway.java

@@ -19,11 +19,6 @@ public interface TrainingUserGateway {
      */
     Boolean addBatch(java.util.List<TrainingUserE> trainingUserEList);
 
-    /**
-     * 审批通过后更新培训人员状态
-     */
-    Boolean updateStatusByApprove(java.util.List<TrainingUserE> trainingUserEList);
-
     /**
     * 修改
     */
@@ -35,3 +30,4 @@ public interface TrainingUserGateway {
     Boolean deletedTrainingUserById(Long id);
     Boolean deletedTrainingUserByIds(Long[] id);
 }
+

web-domain/src/main/java/com/zcloud/edu/domain/model/training/TrainingApplyRecordE.java

@@ -8,14 +8,14 @@ import com.jjb.saas.framework.domain.model.BaseE;
 import com.zcloud.edu.domain.enums.ApplyStatusEnum;
 import com.zcloud.edu.domain.enums.ApplyTypeEnum;
 import com.zcloud.edu.domain.enums.ApprovalStatusEnum;
-import com.zcloud.gbscommon.utils.Tools;
+import com.zcloud.edu.domain.enums.ExamineStatusEnum;
 import lombok.Data;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
 * web-domain
@@ -50,7 +50,7 @@ public class TrainingApplyRecordE extends BaseE {
     private String approvalUserName;
     // 关联项目
     private String projectName;
-    //审批状态:1待审批,2审批中,3审批完成
+    //审批状态1:待审批2:审批中,3:审批完成
     private Long approvalStatus;
 
     // 申请人员列表
@@ -79,28 +79,16 @@ public class TrainingApplyRecordE extends BaseE {
         }else {
             throw new BizException("参数异常");
         }
-        this.trainingApplyRecordId = StrUtil.isNotBlank(this.trainingApplyRecordId)
+        this.trainingApplyRecordId = StrUtil.isNotBlank(this.trainingApplyRecordId) ? this.trainingApplyRecordId : IdUtil.simpleUUID();
-                ? this.trainingApplyRecordId : IdUtil.simpleUUID();
 
         this.approvalStatus = ApprovalStatusEnum.PENDING.getCode();
 
         // 初始化申请人员
         if (!CollectionUtils.isEmpty(this.applyUsers)) {
-            Set<String> trainingUserPhones = new HashSet<>();
             this.applyUsers.forEach(user -> {
-                user.setTrainingApplyUserId(
+                user.setTrainingApplyUserId(StrUtil.isBlank(user.getTrainingApplyUserId()) ? IdUtil.simpleUUID() : user.getTrainingApplyUserId());
-                        StrUtil.isBlank(user.getTrainingApplyUserId()) ? IdUtil.simpleUUID() : user.getTrainingApplyUserId());
                 user.setTrainingApplyRecordId(this.trainingApplyRecordId);
                 user.setApplyStatus(ApplyStatusEnum.PENDING.getCode());
-
-                String phone = user.getPhone();
-                if (StrUtil.isNotBlank(phone) && trainingUserPhones.add(phone)) {
-                    TrainingUserE trainingUser = new TrainingUserE();
-                    trainingUser.setTrainingUserId(Tools.get32UUID());
-                    trainingUser.setPhone(phone);
-                    trainingUser.setApplyStatus(ApplyStatusEnum.PENDING.getCode());
-                    trainingUsers.add(trainingUser);
-                }
             });
         }
 
@@ -139,26 +127,23 @@ public class TrainingApplyRecordE extends BaseE {
         if (CollectionUtils.isEmpty(this.applyUsers)) {
             throw new BizException("申请人员列表不能为空");
         }
+
     }
 
     /**
      * 添加培训人员
      */
     public void addTrainingUser() {
-        if (this.applyUsers == null) {
+        if (this.applyUsers == null) return;
-            return;
-        }
         applyUsers.forEach(user -> {
             if (user != null && user.getApplyStatus().equals(ApplyStatusEnum.APPROVED.getCode())) {
                 TrainingUserE trainingUser = new TrainingUserE();
                 trainingUser.setTrainingUserId(IdUtil.simpleUUID());
                 trainingUser.setPhone(user.getPhone());
-                trainingUser.setApplyStatus(user.getApplyStatus());
                 this.trainingUsers.add(trainingUser);
             }
         });
     }
-
     /**
      * 批量添加申请人员
      */
@@ -176,4 +161,7 @@ public class TrainingApplyRecordE extends BaseE {
             this.approveDetails = approveDetails;
         }
     }
+
+
 }
+

web-infrastructure/src/main/java/com/zcloud/edu/gatewayimpl/training/TrainingUserGatewayImpl.java

@@ -1,8 +1,6 @@
 package com.zcloud.edu.gatewayimpl.training;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
-import com.zcloud.edu.domain.enums.ApplyStatusEnum;
 import com.zcloud.edu.domain.gateway.training.TrainingUserGateway;
 import com.zcloud.edu.domain.model.training.TrainingUserE;
 import com.zcloud.edu.persistence.dataobject.TrainingUserDO;
@@ -12,8 +10,9 @@ import com.zcloud.gbscommon.utils.Tools;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Arrays;
-import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -37,41 +36,22 @@ public class TrainingUserGatewayImpl implements TrainingUserGateway {
 
     @Override
     public Boolean addBatch(List<TrainingUserE> trainingUserEList) {
-        List<String> phones = getPhoneList(trainingUserEList);
+        if (trainingUserEList == null || trainingUserEList.isEmpty()) {
-        if (phones.isEmpty()) {
             return true;
         }
-
+        List<String> phones = trainingUserEList.stream()
-        List<TrainingUserDO> existingUsers = trainingUserRepository.lambdaQuery()
-                .select(TrainingUserDO::getPhone, TrainingUserDO::getStartTime, TrainingUserDO::getEndTime)
-                .in(TrainingUserDO::getPhone, phones)
-                .list();
-        Map<String, TrainingUserDO> existingUserMap = existingUsers.stream()
-                .collect(Collectors.toMap(TrainingUserDO::getPhone, u -> u, (a, b) -> a));
-        Set<String> existingPhones = existingUserMap.keySet();
-
-        LocalDateTime submitTime = LocalDateTime.now();
-        Set<String> resetPhones = trainingUserEList.stream()
                 .map(TrainingUserE::getPhone)
                 .filter(StrUtil::isNotBlank)
-                .filter(existingPhones::contains)
+                .distinct()
-                .filter(phone -> {
+                .collect(Collectors.toList());
-                    TrainingUserDO user = existingUserMap.get(phone);
+        List<TrainingUserDO> existingUsers = trainingUserRepository.lambdaQuery()
-                    return user != null
+                .select(TrainingUserDO::getPhone)
-                            && user.getEndTime() != null
+                .in(TrainingUserDO::getPhone, phones)
-                            && submitTime.isAfter(user.getEndTime());
+                .list();
-                })
+        Set<String> existingPhones = existingUsers.stream()
+                .map(TrainingUserDO::getPhone)
                 .collect(Collectors.toSet());
 
-        for (String phone : resetPhones) {
-            trainingUserRepository.lambdaUpdate()
-                    .set(TrainingUserDO::getStartTime, null)
-                    .set(TrainingUserDO::getEndTime, null)
-                    .set(TrainingUserDO::getApplyStatus, ApplyStatusEnum.PENDING.getCode())
-                    .eq(TrainingUserDO::getPhone, phone)
-                    .update();
-        }
-
         List<TrainingUserDO> doList = trainingUserEList.stream()
                 .filter(e -> StrUtil.isNotBlank(e.getPhone())
                         && !existingPhones.contains(e.getPhone()))
@@ -89,54 +69,6 @@ public class TrainingUserGatewayImpl implements TrainingUserGateway {
         return true;
     }
 
-    @Override
-    public Boolean updateStatusByApprove(List<TrainingUserE> trainingUserEList) {
-        List<String> phones = getPhoneList(trainingUserEList);
-        if (phones.isEmpty()) {
-            return true;
-        }
-
-        List<TrainingUserDO> existingUsers = trainingUserRepository.lambdaQuery()
-                .select(TrainingUserDO::getId, TrainingUserDO::getPhone, TrainingUserDO::getApplyStatus)
-                .in(TrainingUserDO::getPhone, phones)
-                .list();
-        if (existingUsers == null || existingUsers.isEmpty()) {
-            return true;
-        }
-
-        List<TrainingUserDO> needUpdateUsers = existingUsers.stream()
-                .filter(u -> !ApplyStatusEnum.APPROVED.getCode().equals(u.getApplyStatus()))
-                .map(u -> {
-                    TrainingUserDO d = new TrainingUserDO();
-                    d.setId(u.getId());
-                    d.setApplyStatus(ApplyStatusEnum.APPROVED.getCode());
-                    return d;
-                })
-                .collect(Collectors.toList());
-
-        if (needUpdateUsers.isEmpty()) {
-            return true;
-        }
-
-        return trainingUserRepository.updateBatchById(needUpdateUsers);
-    }
-
-    /**
-     * 获取培训人员手机号
-     * @param trainingUserEList
-     * @return
-     */
-    private List<String> getPhoneList(List<TrainingUserE> trainingUserEList) {
-        if (CollUtil.isEmpty(trainingUserEList)) {
-            return Collections.emptyList();
-        }
-        return trainingUserEList.stream()
-                .map(TrainingUserE::getPhone)
-                .filter(StrUtil::isNotBlank)
-                .distinct()
-                .collect(Collectors.toList());
-    }
-
     @Override
     public Boolean update(TrainingUserE trainingUserE) {
         TrainingUserDO d = new TrainingUserDO();

web-infrastructure/src/main/resources/mapper/TrainingApplyRecordMapper.xml

@@ -48,7 +48,7 @@
             r.project_name,
             r.approval_status,
             r.version,
-            u.name AS apply_user_name,
+            u.username AS apply_user_name,
             COALESCE(tau_cnt.apply_user_count, 0) AS apply_user_count
         FROM
             training_apply_record r