From 9856fcca30e0061cac1c6c6d2433470b36667bf3 Mon Sep 17 00:00:00 2001 From: dk <1260500659@qq.com> Date: Mon, 15 Jun 2026 11:24:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E9=9C=80=E6=B1=82):=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=89=8B=E5=8A=A8=E5=BD=95=E5=85=A5"=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E4=B8=9A=E5=8A=A1=E7=BC=96=E5=8F=B7"=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E7=9A=84sourceBizId=E6=94=B9=E4=B8=BAsourceB?= =?UTF-8?q?izCode=EF=BC=8C=E4=B9=9F=E6=94=AF=E6=8C=81=E6=8C=89"=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E4=B8=9A=E5=8A=A1=E7=BC=96=E5=8F=B7"=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../requirement/ProductRequirementPageReqVO.java | 3 +++ .../vo/requirement/ProductRequirementRespVO.java | 4 ++-- .../requirement/ProductRequirementSaveReqVO.java | 4 ++++ .../ProductRequirementUpdateReqVO.java | 4 ++++ .../requirement/ProjectRequirementPageReqVO.java | 3 +++ .../vo/requirement/ProjectRequirementRespVO.java | 4 ++-- .../requirement/ProjectRequirementSaveReqVO.java | 4 ++++ .../ProjectRequirementUpdateReqVO.java | 4 ++++ .../dataobject/product/ProductRequirementDO.java | 4 ++-- .../dataobject/project/ProjectRequirementDO.java | 4 ++-- .../mysql/product/ProductRequirementMapper.java | 2 ++ .../mysql/project/ProjectRequirementMapper.java | 1 + .../product/ProductRequirementServiceImpl.java | 11 +++++++---- .../project/ProjectRequirementServiceImpl.java | 16 +++++++++------- 14 files changed, 49 insertions(+), 19 deletions(-) diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementPageReqVO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementPageReqVO.java index fe85595..9514b9a 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementPageReqVO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementPageReqVO.java @@ -46,4 +46,7 @@ public class ProductRequirementPageReqVO extends PageParam { @Schema(description = "来源类型（manual:手工新增, work_order:工单流转）", example = "manual") private String sourceType; + @Schema(description = "来源业务编号", example = "CRM-20260615-001") + private String sourceBizCode; + } diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementRespVO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementRespVO.java index f8e618c..0aa8961 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementRespVO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementRespVO.java @@ -43,8 +43,8 @@ public class ProductRequirementRespVO { @Schema(description = "需求来源类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "manual") private String sourceType; - @Schema(description = "来源业务ID", example = "1024") - private Long sourceBizId; + @Schema(description = "来源业务编号", example = "CRM-20260615-001") + private String sourceBizCode; @Schema(description = "优先级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Integer priority; diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementSaveReqVO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementSaveReqVO.java index 9ec2364..29e3f67 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementSaveReqVO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementSaveReqVO.java @@ -45,6 +45,10 @@ public class ProductRequirementSaveReqVO { @Size(max = 64, message = "需求分类长度不能超过64个字符") private String category; + @Schema(description = "来源业务编号", example = "CRM-20260615-001") + @Size(max = 255, message = "来源业务编号长度不能超过255个字符") + private String sourceBizCode; + @Schema(description = "优先级，0低、1中、2高、3紧急", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "优先级不能为空") private Integer priority; diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementUpdateReqVO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementUpdateReqVO.java index ef25405..c79a95c 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementUpdateReqVO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/product/vo/requirement/ProductRequirementUpdateReqVO.java @@ -46,6 +46,10 @@ public class ProductRequirementUpdateReqVO { @Size(max = 64, message = "需求分类长度不能超过64个字符") private String category; + @Schema(description = "来源业务编号", example = "CRM-20260615-001") + @Size(max = 255, message = "来源业务编号长度不能超过255个字符") + private String sourceBizCode; + @Schema(description = "优先级，0低、1中、2高、3紧急", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "优先级不能为空") private Integer priority; diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementPageReqVO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementPageReqVO.java index 8e3ec83..3de173e 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementPageReqVO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementPageReqVO.java @@ -45,4 +45,7 @@ public class ProjectRequirementPageReqVO extends PageParam { @Schema(description = "来源类型", example = "manual") private String sourceType; + @Schema(description = "来源业务编号", example = "CRM-20260615-001") + private String sourceBizCode; + } diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementRespVO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementRespVO.java index c3aa059..943bdc0 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementRespVO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementRespVO.java @@ -46,8 +46,8 @@ public class ProjectRequirementRespVO { @Schema(description = "需求来源类型", example = "manual") private String sourceType; - @Schema(description = "来源业务ID", example = "1024") - private Long sourceBizId; + @Schema(description = "来源业务编号", example = "CRM-20260615-001") + private String sourceBizCode; @Schema(description = "优先级", example = "1") private Integer priority; diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementSaveReqVO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementSaveReqVO.java index e789a76..92726b7 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementSaveReqVO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementSaveReqVO.java @@ -45,6 +45,10 @@ public class ProjectRequirementSaveReqVO { @Size(max = 64, message = "需求分类长度不能超过64个字符") private String category; + @Schema(description = "来源业务编号", example = "CRM-20260615-001") + @Size(max = 255, message = "来源业务编号长度不能超过255个字符") + private String sourceBizCode; + @Schema(description = "优先级，0低、1中、2高、3紧急", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "优先级不能为空") private Integer priority; diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementUpdateReqVO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementUpdateReqVO.java index efced0f..292f673 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementUpdateReqVO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/controller/admin/project/vo/requirement/ProjectRequirementUpdateReqVO.java @@ -46,6 +46,10 @@ public class ProjectRequirementUpdateReqVO { @Size(max = 64, message = "需求分类长度不能超过64个字符") private String category; + @Schema(description = "来源业务编号", example = "CRM-20260615-001") + @Size(max = 255, message = "来源业务编号长度不能超过255个字符") + private String sourceBizCode; + @Schema(description = "优先级，0低、1中、2高、3紧急", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @NotNull(message = "优先级不能为空") private Integer priority; diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/dataobject/product/ProductRequirementDO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/dataobject/product/ProductRequirementDO.java index ca584cd..ac0226b 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/dataobject/product/ProductRequirementDO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/dataobject/product/ProductRequirementDO.java @@ -58,9 +58,9 @@ public class ProductRequirementDO extends BaseDO { */ private String sourceType; /** - * 来源业务ID + * 来源业务编号 */ - private Long sourceBizId; + private String sourceBizCode; /** * 优先级，0低、1中、2高、3紧急 */ diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/dataobject/project/ProjectRequirementDO.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/dataobject/project/ProjectRequirementDO.java index d109ab7..323c954 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/dataobject/project/ProjectRequirementDO.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/dataobject/project/ProjectRequirementDO.java @@ -62,9 +62,9 @@ public class ProjectRequirementDO extends BaseDO { */ private String sourceType; /** - * 来源业务 ID + * 来源业务编号 */ - private Long sourceBizId; + private String sourceBizCode; /** * 优先级 */ diff --git a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/mysql/product/ProductRequirementMapper.java b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/mysql/product/ProductRequirementMapper.java index ed73660..28d5ab3 100644 --- a/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/mysql/product/ProductRequirementMapper.java +++ b/rdms-project/rdms-project-boot/src/main/java/com/njcn/rdms/module/project/dal/mysql/product/ProductRequirementMapper.java @@ -53,6 +53,8 @@ public interface ProductRequirementMapper extends BaseMapperX