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}