From 9b0240b5daaf0a262bf01e6058b79a54c1897921 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 2 Apr 2026 13:12:32 +0800 Subject: [PATCH] =?UTF-8?q?2026-04-02=20=E5=88=80=E5=85=B7=E7=9A=84?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4=E4=B8=BA=E5=88=A4=E6=96=AD?= =?UTF-8?q?status=EF=BC=8C=E5=9C=A8=E6=B5=81=E7=A8=8B=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E6=97=B6=E4=BF=AE=E6=94=B9status=5Fcode=E4=B8=BA=E2=80=9C05?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectToolingApplyServiceImpl.java | 4 ++-- .../modules/change/mapper/ChangeManagementMapper.java | 3 ++- .../change/service/impl/ChangeManagementServiceImpl.java | 6 +++++- src/main/resources/mapper/change/ChangeManagementMapper.xml | 3 +++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java index 4d94bd18..00afad99 100644 --- a/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java +++ b/src/main/java/com/spring/modules/Tooling/service/impl/ProjectToolingApplyServiceImpl.java @@ -200,7 +200,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic if (toolApplyHeaderData == null) { throw new RuntimeException("申请单不存在!"); } - if (!"05".equals(toolApplyHeaderData.getStatusCode())) { + if (!"草稿".equals(toolApplyHeaderData.getStatus())) { throw new RuntimeException("申请单不是草稿状态!"); } // 关闭调用OA接口时 @@ -301,7 +301,7 @@ public class ProjectToolingApplyServiceImpl implements ProjectToolingApplyServic if(toolApplyHeaderData==null){ throw new RuntimeException("申请单不存在!"); } - if(!"05".equals(toolApplyHeaderData.getStatusCode())){ + if(!"草稿".equals(toolApplyHeaderData.getStatus())){ throw new RuntimeException("申请单不是草稿状态!"); } // //修改原来的标记 diff --git a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java index 0f73d85c..954c82bc 100644 --- a/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java +++ b/src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java @@ -229,7 +229,8 @@ public interface ChangeManagementMapper extends BaseMapper{ void updateDocumentStatusToDraft(@Param("tableName") String tableName, @Param("keyField") String keyField, @Param("statusField") String statusField, @Param("draftStatus") String draftStatus, - @Param("site") String site, @Param("docNo") String docNo, @Param("userName") String userName); + @Param("site") String site, @Param("docNo") String docNo, @Param("userName") String userName, + @Param("statusCodeField") String statusCodeField, @Param("statusCodeValue") String statusCodeValue); Integer countDocumentByStatus(@Param("tableName") String tableName, @Param("keyField") String keyField, @Param("statusField") String statusField, @Param("approvedStatus") String approvedStatus, diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index 0b3f6137..e3bd7c85 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -2447,6 +2447,8 @@ public class ChangeManagementServiceImpl extends ServiceImpl UPDATE ${tableName} SET ${statusField} = #{draftStatus}, + + ${statusCodeField} = #{statusCodeValue}, + step_id = 10, update_date = getDate(), update_by = #{userName}