From 3c2c4ab54d0c8d48137a3a3d73f822ca3cb502d1 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Thu, 27 Feb 2025 10:42:44 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat(REQ-3300):=20=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=80=81=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=E6=88=96=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A0=A1=E9=AA=8C=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChangeRecordServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 64fbb6a7..56047afb 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -601,6 +601,12 @@ public class ChangeRecordServiceImpl extends ServiceImpl visaUploadFiles = this.buildAttachUploadFile(req.getId()); From 19185780fe9498d0dcd7723f87c1601198550033 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Thu, 27 Feb 2025 10:45:49 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat(REQ-3300):=20=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=80=81=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=E6=88=96=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A0=A1=E9=AA=8C=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/impl/ChangeRecordServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 56047afb..4c9302f4 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -601,12 +601,11 @@ public class ChangeRecordServiceImpl extends ServiceImpl Date: Thu, 27 Feb 2025 10:46:49 +0800 Subject: [PATCH 3/7] =?UTF-8?q?REQ-3300:=20=E5=90=8C=E6=84=8F/=E6=8B=92?= =?UTF-8?q?=E7=BB=9D=E5=B0=9D=E8=AF=95=E4=BD=BF=E7=94=A8=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/impl/ChangeRecordRelationServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java index 01aa602d..a62f2c64 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java @@ -187,6 +187,7 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl Date: Thu, 27 Feb 2025 11:17:01 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat(REQ-3300):=20=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=80=81=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=E6=88=96=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=EF=BC=8C=E6=A0=A1=E9=AA=8C=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/server/service/impl/ChangeRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index 4c9302f4..a6c2d587 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -603,7 +603,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl Date: Thu, 27 Feb 2025 11:33:10 +0800 Subject: [PATCH 5/7] =?UTF-8?q?feat(REQ-3581)=20-=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=8A=95=E7=A5=A8=E4=BF=A1=E6=81=AF=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ChangeRecordRelationServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java index a62f2c64..5348179d 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordRelationServiceImpl.java @@ -165,6 +165,12 @@ public class ChangeRecordRelationServiceImpl extends ServiceImpl relations = findByCondition(VisaRelationDto.builder() + .visaId(req.getVisaId()) + .varName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.name()) + .content(String.valueOf(req.getOperatorPersonId())) + .build()); + AssertUtil.isEmpty(relations, "不允许重复操作"); ChangeRecordRelation relation = new ChangeRecordRelation(); relation.setVisaId(req.getVisaId()); relation.setVarName(VisaRelationFieldEnum.IM_GROUP_PARTICIPATE.name()); From ed0586ce8c293535d9a0f7baffc41ba7e4c993fe Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Thu, 27 Feb 2025 15:54:30 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat(REQ-3300):=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=A8=A1=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/api/request/CheckVisaWithVisaIdReq.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java index 6e70aee7..4d9bf2af 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java @@ -8,8 +8,6 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.apache.commons.collections4.CollectionUtils; -import javax.validation.constraints.NotNull; - /** * @author xudawei@axzo.cn * @version 1.0 @@ -22,11 +20,16 @@ import javax.validation.constraints.NotNull; public class CheckVisaWithVisaIdReq { /** - * 变更单号Id + * 变更单号Id，编辑和详情时传入，与{@code creatFormData}互斥使用 */ - @NotNull(message = "变更签证单据Id不能为空") +// @NotNull(message = "变更签证单据Id不能为空") private Long visaId; + /** + * 创建单据状态下的表单数据，创建时传入，与{@code visaId}互斥使用 + */ + private VisaChangeTempCreateReq creatFormData; + /** * 校验 */ From b0a8fe24559628e02e4b0705d1b7355622364e38 Mon Sep 17 00:00:00 2001 From: chenwenjian Date: Thu, 27 Feb 2025 16:35:39 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat(REQ-3300):=20=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=A8=A1=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visa/api/request/CheckVisaWithVisaIdReq.java | 12 ++++++++++-- .../visa/api/request/VisaChangeTempCreateReq.java | 2 +- .../server/service/impl/ChangeRecordServiceImpl.java | 12 +++++++++--- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java index 4d9bf2af..536d2d59 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/CheckVisaWithVisaIdReq.java @@ -47,7 +47,15 @@ public class CheckVisaWithVisaIdReq { AssertUtil.notEmpty(item.getRelationPersonList(), "确认人不能为空"); }); } - - + } + + public void check() { + AssertUtil.notNull(this.getCreatFormData().getRelationWorkspaceId(), "关联项目不能为空"); + AssertUtil.notNull(this.getCreatFormData().getType(), "单据类型不能为空"); + AssertUtil.notEmpty(this.getCreatFormData().getNo(), "单号不能为空"); + AssertUtil.notEmpty(this.getCreatFormData().getTopic(), "主题不能为空"); + AssertUtil.notNull(this.getCreatFormData().getRelationProject(), "关联工程不能为空"); + AssertUtil.notNull(this.getCreatFormData().getHappenTime(), "提出时间不能为空"); + AssertUtil.notEmpty(this.getCreatFormData().getReason(), "发生原因不能为空"); } } diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java index c63e693a..090c2871 100644 --- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java +++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/request/VisaChangeTempCreateReq.java @@ -85,7 +85,7 @@ public class VisaChangeTempCreateReq { /** * 提出时间 */ - @NotNull(message = "请选择提交日期") + @NotNull(message = "请选择提出时间") private Date happenTime; /** diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java index a6c2d587..6d000b58 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java @@ -2009,9 +2009,15 @@ public class ChangeRecordServiceImpl extends ServiceImpl