diff --git a/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskGroupUserAddExe.java b/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskGroupUserAddExe.java index 900c85e..bc39bb8 100644 --- a/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskGroupUserAddExe.java +++ b/web-app/src/main/java/com/zcloud/domain/command/ProjectTaskGroupUserAddExe.java @@ -78,7 +78,12 @@ public class ProjectTaskGroupUserAddExe { } Integer code = projectTaskDO.getExecuteStatus(); if (new Date().compareTo(projectTaskDO.getExecutedStartDate()) >= 0) { - code = ProjectTaskExecuteStatusEnum.EXECUTING.getCode(); + if(new Date().compareTo(projectTaskDO.getExecutedEndDate())>=0){ + code = ProjectTaskExecuteStatusEnum.FINISHED.getCode(); + }else{ + code = ProjectTaskExecuteStatusEnum.EXECUTING.getCode(); + } + }else{ code = ProjectTaskExecuteStatusEnum.WAIT_PERFECT.getCode(); } diff --git a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java index a581d57..f06463a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java @@ -2,6 +2,7 @@ package com.zcloud.domain.persistence.repository.impl; import cn.hutool.core.collection.CollUtil; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.cola.exception.BizException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jjb.saas.framework.repository.common.PageHelper; @@ -49,7 +50,7 @@ public class DomainDepartmentRepositoryImpl extends BaseRepositoryImpl list = list(queryWrapper); if (CollUtil.isNotEmpty(list)) { - throw new RuntimeException("该领域类型已存在"); + throw new BizException("该领域类型已存在"); } }