From 2ad9a4e206e814756bc2f126a98bfd9f02766dd2 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Fri, 22 May 2026 10:02:58 +0800 Subject: [PATCH] =?UTF-8?q?fix(dict):=20=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E7=B1=BB=E5=9E=8B=E5=8F=82=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/personal/PersonalItemServiceImpl.java | 2 +- .../rdms/module/system/enums/DictTypeConstants.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) 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"; + }