zcloud_gbs
/
zcloud_gbs_key_project
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(0623): 移除重点作业ID与名称重复校验逻辑-需求说可以重复添加

dev
lishiwei 2026-06-23 14:53:16 +08:00
parent ff4870153b
commit f6b3ed5102
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectAddExe.java
View File

@ -53,16 +53,16 @@ public class KeyProjectAddExe {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public KeyProjectCO execute(KeyProjectAddCmd cmd) { public KeyProjectCO execute(KeyProjectAddCmd cmd) {
if (StringUtils.isNotBlank(cmd.getProjectId()) && StringUtils.isNotBlank(cmd.getProjectName())) { // if (StringUtils.isNotBlank(cmd.getProjectId()) && StringUtils.isNotBlank(cmd.getProjectName())) {
QueryWrapper<KeyProjectDO> queryWrapper = new QueryWrapper<>(); // QueryWrapper<KeyProjectDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("project_id", cmd.getProjectId()); // queryWrapper.eq("project_id", cmd.getProjectId());
queryWrapper.eq("project_name", cmd.getProjectName()); // queryWrapper.eq("project_name", cmd.getProjectName());
queryWrapper.eq("delete_enum", "FALSE"); // queryWrapper.eq("delete_enum", "FALSE");
long count = keyProjectRepository.count(queryWrapper); // long count = keyProjectRepository.count(queryWrapper);
if (count > 0) { // if (count > 0) {
throw new BizException("重点作业ID与重点作业名称已存在，请勿重复添加"); // throw new BizException("重点作业ID与重点作业名称已存在，请勿重复添加");
} // }
} // }
// 流程一（手动创建）：处罚人员必填 // 流程一（手动创建）：处罚人员必填
if (CreateSourceEnum.MANUAL.getCode().equals(cmd.getCreateSource()) && CollUtil.isEmpty(cmd.getKeyProjectPenaltyPersonnelAddCmdList())) { if (CreateSourceEnum.MANUAL.getCode().equals(cmd.getCreateSource()) && CollUtil.isEmpty(cmd.getKeyProjectPenaltyPersonnelAddCmdList())) {

22
web-app/src/main/java/com/zcloud/key/project/command/project/KeyProjectUpdateExe.java
View File

@ -64,17 +64,17 @@ public class KeyProjectUpdateExe {
).contains(byId.getApplyStatus())) { ).contains(byId.getApplyStatus())) {
throw new BizException("该状态项目不允许修改"); throw new BizException("该状态项目不允许修改");
} }
if (StringUtils.isNotBlank(keyProjectUpdateCmd.getProjectId()) && StringUtils.isNotBlank(keyProjectUpdateCmd.getProjectName())) { // if (StringUtils.isNotBlank(keyProjectUpdateCmd.getProjectId()) && StringUtils.isNotBlank(keyProjectUpdateCmd.getProjectName())) {
QueryWrapper<KeyProjectDO> queryWrapper = new QueryWrapper<>(); // QueryWrapper<KeyProjectDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("project_id", keyProjectUpdateCmd.getProjectId()); // queryWrapper.eq("project_id", keyProjectUpdateCmd.getProjectId());
queryWrapper.eq("project_name", keyProjectUpdateCmd.getProjectName()); // queryWrapper.eq("project_name", keyProjectUpdateCmd.getProjectName());
queryWrapper.eq("delete_enum", "FALSE"); // queryWrapper.eq("delete_enum", "FALSE");
queryWrapper.ne("id", keyProjectUpdateCmd.getId()); // queryWrapper.ne("id", keyProjectUpdateCmd.getId());
long count = keyProjectRepository.count(queryWrapper); // long count = keyProjectRepository.count(queryWrapper);
if (count > 0) { // if (count > 0) {
throw new BizException("重点作业ID与重点作业名称已存在，请勿重复添加"); // throw new BizException("重点作业ID与重点作业名称已存在，请勿重复添加");
} // }
} // }
KeyProjectE keyProjectE = new KeyProjectE(); KeyProjectE keyProjectE = new KeyProjectE();
BeanUtils.copyProperties(keyProjectUpdateCmd, keyProjectE); BeanUtils.copyProperties(keyProjectUpdateCmd, keyProjectE);
if (CollUtil.isNotEmpty(keyProjectUpdateCmd.getProjectType())) { if (CollUtil.isNotEmpty(keyProjectUpdateCmd.getProjectType())) {