diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/personal/PersonalItemServiceImpl.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/personal/PersonalItemServiceImpl.java index de923b7..4f23d80 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/personal/PersonalItemServiceImpl.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/service/personal/PersonalItemServiceImpl.java @@ -250,7 +250,7 @@ public class PersonalItemServiceImpl implements PersonalItemService { if (!Objects.equals(worklog.getUserId(), loginUserId)) { throw exception(ErrorCodeConstants.PROJECT_TASK_WORKLOG_EDIT_NOT_OWN); } - validateDateRange(reqVO.getStartDate(), reqVO.getEndDate(), "娈佃捣濮嬫棩鏈熶笉鑳芥櫄浜庢缁撴潫鏃ユ湡"); + validateDateRange(reqVO.getStartDate(), reqVO.getEndDate(), "段起始日期不能晚于段结束日期"); validateDurationGranularity(reqVO.getDurationHours()); validateNoOverlap(item.getId(), worklog.getUserId(), reqVO.getStartDate(), reqVO.getEndDate(), worklog.getId()); validateProgressMonotonicity(item.getId(), worklog.getUserId(), reqVO.getEndDate(), reqVO.getProgressRate(), diff --git a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/enums/DictTypeConstants.java b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/enums/DictTypeConstants.java index 513eab3..93599a6 100644 --- a/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/enums/DictTypeConstants.java +++ b/rdms-system/rdms-system-api/src/main/java/com/njcn/rdms/module/system/enums/DictTypeConstants.java @@ -21,4 +21,15 @@ public interface DictTypeConstants { String BOOLEAN_STRING = "infra_boolean_string"; String OPERATE_TYPE = "infra_operate_type"; + // ========== rdms ========== + /** + * 任务&事项共用的工作日志难度下拉框字典 + */ + String RDMS_TASK_ITEM_WORKLOG_DIFFICULTY = "rdms_task_item_worklog_difficulty"; + + /** + * 任务&事项共用的类别下拉框字典 + */ + String RDMS_TASK_ITEM_TYPE="rdms_task_item_type"; + }