From 2e8b54a37f11a9739c8426830356e08dd902764d Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 21 Feb 2025 17:08:33 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat(REQ-3300)=20-=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=BE=A4=E8=81=8A=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=E7=9A=84?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?=
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 e36c11ce..4adaf417 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
@@ -1712,8 +1712,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     public void reDecision(ChangeRecordButtonOperationReq req) {
         ChangeRecord visa = changeRecordService.getById(req.getVisaId());
         AssertUtil.notNull(visa, "未找到变洽签单据");
-        AssertUtil.isTrue(Objects.equals(visa.getStatus(), VisaStatusEnum.DECIDING)
-                || Objects.equals(visa.getStatus(), VisaStatusEnum.EXECUTING), "单据未在决策中或执行中，不支持该操作");
+        AssertUtil.isTrue(!Objects.equals(visa.getStatus(), VisaStatusEnum.DECIDING)
+                && !Objects.equals(visa.getStatus(), VisaStatusEnum.EXECUTING), "单据未在决策中或执行中，不支持该操作");
         validOperationPermission(req.getVisaId(), req.getOperatorPersonId(), req.getOperatorOuId(), req.getOperatorWorkspaceId());
 
         ImGroupOperationClearReq build = new ImGroupOperationClearReq();

From 48352bb5b7117bb7627fe5b1bbf6e0ea4d000f74 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 21 Feb 2025 17:12:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat(REQ-3300)=20-=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=BE=A4=E8=81=8A=E9=87=8D=E6=96=B0=E5=8F=91=E8=B5=B7=E7=9A=84?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?=
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 4adaf417..559b87a7 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
@@ -1712,8 +1712,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     public void reDecision(ChangeRecordButtonOperationReq req) {
         ChangeRecord visa = changeRecordService.getById(req.getVisaId());
         AssertUtil.notNull(visa, "未找到变洽签单据");
-        AssertUtil.isTrue(!Objects.equals(visa.getStatus(), VisaStatusEnum.DECIDING)
-                && !Objects.equals(visa.getStatus(), VisaStatusEnum.EXECUTING), "单据未在决策中或执行中，不支持该操作");
+        AssertUtil.isTrue(!Objects.equals(visa.getStatus(), VisaStatusEnum.APPROVING)
+                && !Objects.equals(visa.getStatus(), VisaStatusEnum.COMPLETED), "单据未在决策中或执行中，不支持该操作");
         validOperationPermission(req.getVisaId(), req.getOperatorPersonId(), req.getOperatorOuId(), req.getOperatorWorkspaceId());
 
         ImGroupOperationClearReq build = new ImGroupOperationClearReq();

From 1cb9c1b5e720206a5dc241bc378778d5955543a1 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 21 Feb 2025 17:24:27 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat(REQ-3300)=20-=20=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=9A=84=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=20workspaceName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/nanopart/visa/api/constant/VisaConstant.java     | 2 ++
 .../visa/server/service/impl/ChangeRecordServiceImpl.java    | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/constant/VisaConstant.java b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/constant/VisaConstant.java
index 09554c0b..f957f29e 100644
--- a/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/constant/VisaConstant.java
+++ b/visa/visa-api/src/main/java/cn/axzo/nanopart/visa/api/constant/VisaConstant.java
@@ -38,6 +38,8 @@ public interface VisaConstant {
     String FORM_FIELD_HAPPEN_TIME = "happenTime";
     // 主题
     String FORM_FIELD_TOPIC = "topic";
+    // 工作台名称
+    String FORM_FIELD_WORKSPACE_NAME = "workspaceName";
     // 关联工程
     String FORM_FIELD_RELATION_PROJECT = "relationProject";
     // 关联专业
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 559b87a7..5977c04d 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
@@ -156,6 +156,7 @@ import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_RELATIO
 import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_TOPIC;
 import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_UNIT;
 import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_UNIT_PERSON;
+import static cn.axzo.nanopart.visa.api.constant.VisaConstant.FORM_FIELD_WORKSPACE_NAME;
 import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_INITIATOR_WORKSPACE_ID;
 import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_ID;
 import static cn.axzo.nanopart.visa.api.constant.VisaConstant.IM_GROUP_BIZ_INFO_VISA_TYPE;
@@ -204,6 +205,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     private WorkflowGateway workflowGateway;
     @Resource
     private MsgCenterGateway msgCenterGateway;
+    @Resource
+    private WorkspaceGateway workspaceGateway;
 
     /**
      * 最大变化金额
@@ -819,6 +822,8 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
         final SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
         formVariables.put(FORM_FIELD_HAPPEN_TIME, sdf.format(req.getHappenTime()));
         formVariables.put(FORM_FIELD_TOPIC, req.getTopic());
+        GetDetailRes workspaceRes = workspaceGateway.getById(req.getRelationWorkspaceId());
+        formVariables.put(FORM_FIELD_WORKSPACE_NAME, Objects.isNull(workspaceRes) ? "" : workspaceRes.getName());
         ProjectDetailRes projectDetailRes = visaProjectApiGateway.getProjectById(req.getRelationProject());
         formVariables.put(FORM_FIELD_RELATION_PROJECT, projectDetailRes.getProjectInfo().getName());
         formVariables.put(FORM_FIELD_RELATION_PROFESSIONAL, visaHelper.buildProfessionalName(req.getRelationProject(), req.getRelationProfessional()));

From 5bfd395d5b9b4d5d92836f8abeee0cd8f8c9ea16 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 21 Feb 2025 17:59:48 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat(REQ-3300)=20-=20=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=9A=84=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A2=9E=E5=8A=A0=20workspaceName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visa/server/service/impl/ChangeRecordServiceImpl.java       | 2 --
 1 file changed, 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 5977c04d..d00a7859 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
@@ -205,8 +205,6 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
     private WorkflowGateway workflowGateway;
     @Resource
     private MsgCenterGateway msgCenterGateway;
-    @Resource
-    private WorkspaceGateway workspaceGateway;
 
     /**
      * 最大变化金额