zcloud_gbs
/
zcloud_gbs_domain
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(department): 更新领域部门类型检查逻辑

master
zhaokai 2026-03-16 14:29:42 +08:00
parent 4c8123b84a
commit 0d2ff8cd77
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web-app/src/main/java/com/zcloud/domain/command/ProjectTaskGroupUserAddExe.java
View File

@ -78,7 +78,12 @@ public class ProjectTaskGroupUserAddExe {
} }
Integer code = projectTaskDO.getExecuteStatus(); Integer code = projectTaskDO.getExecuteStatus();
if (new Date().compareTo(projectTaskDO.getExecutedStartDate()) >= 0) { 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{ }else{
code = ProjectTaskExecuteStatusEnum.WAIT_PERFECT.getCode(); code = ProjectTaskExecuteStatusEnum.WAIT_PERFECT.getCode();
} }

3
web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java
View File

@ -2,6 +2,7 @@ package com.zcloud.domain.persistence.repository.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.dto.PageResponse; 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.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.common.PageHelper;
@ -49,7 +50,7 @@ public class DomainDepartmentRepositoryImpl extends BaseRepositoryImpl<DomainDep
} }
List<DomainDepartmentDO> list = list(queryWrapper); List<DomainDepartmentDO> list = list(queryWrapper);
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
throw new RuntimeException("该领域类型已存在"); throw new BizException("该领域类型已存在");
} }
} }