Commit 789b4991 authored by cq990612's avatar cq990612

优化代码结构

parent 1aa0bcc1
...@@ -59,7 +59,7 @@ public enum BASE_RESP_CODE_ENUM { ...@@ -59,7 +59,7 @@ public enum BASE_RESP_CODE_ENUM {
WORKDAY_NOT_NULL("637","工时日期不能为空"), WORKDAY_NOT_NULL("637","工时日期不能为空"),
PROJECT_NOT_NULL("638","项目类型不能为空"), PROJECT_NOT_NULL("638","项目类型不能为空"),
NEW_PASSWORD_IS_HTE_SAME_OLD_PASSWORD("639","新密码不能与旧密码相同"), NEW_PASSWORD_IS_HTE_SAME_OLD_PASSWORD("639","新密码不能与旧密码相同"),
PASSWORD_FORMAT_ERROR("640","密码由6到16位数字组成"), DUPLICATEPROJECTNAME("640","项目/商机名称重复"),
INCOMPLETE_WORK_ORDER_INFORMATION("621","请填写完整的工单信息"), INCOMPLETE_WORK_ORDER_INFORMATION("621","请填写完整的工单信息"),
HAVE_ORDER_DELETE("643", "有工单被用户删除,审批失败,请重新审批"), HAVE_ORDER_DELETE("643", "有工单被用户删除,审批失败,请重新审批"),
ORDER_EXAMINE("644","该工单已经被审批,请刷新查看"), ORDER_EXAMINE("644","该工单已经被审批,请刷新查看"),
......
...@@ -533,7 +533,7 @@ public class WorkProjectServiceImpl implements WorkProjectService { ...@@ -533,7 +533,7 @@ public class WorkProjectServiceImpl implements WorkProjectService {
if (BigDecimal.ZERO.compareTo(createProjectVo.getWorkTime()) > 0 || BigDecimal.ZERO.compareTo(createProjectVo.getCostBudget()) > 0) { if (BigDecimal.ZERO.compareTo(createProjectVo.getWorkTime()) > 0 || BigDecimal.ZERO.compareTo(createProjectVo.getCostBudget()) > 0) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.BUDGET_CANNOT_BELESSTHAN_ZERO); throw new BaseCustomException(BASE_RESP_CODE_ENUM.BUDGET_CANNOT_BELESSTHAN_ZERO);
} }
// 判断oa编号是否重复 // 判断oa编号、项目名称是否重复,
List<WorkProject> workProjects = workProjectMapper.selectList(new QueryWrapper<>()); List<WorkProject> workProjects = workProjectMapper.selectList(new QueryWrapper<>());
if (CollectionUtils.isEmpty(workProjects)) { if (CollectionUtils.isEmpty(workProjects)) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL); throw new BaseCustomException(BASE_RESP_CODE_ENUM.WORK_PROJECT_IS_NULL);
...@@ -542,6 +542,9 @@ public class WorkProjectServiceImpl implements WorkProjectService { ...@@ -542,6 +542,9 @@ public class WorkProjectServiceImpl implements WorkProjectService {
if (createProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) { if (createProjectVo.getOaProjectId().equals(workProject.getOaProjectId())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.ITEMOADUPLICATE); throw new BaseCustomException(BASE_RESP_CODE_ENUM.ITEMOADUPLICATE);
} }
if (createProjectVo.getProjectName().equals(workProject.getProjectName())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.DUPLICATEPROJECTNAME);
}
} }
// 插入项目信息 // 插入项目信息
Date date = new Date(); Date date = new Date();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment