diff --git a/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java b/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java index c90e36d9..a16ef239 100644 --- a/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java +++ b/src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java @@ -167,7 +167,7 @@ public interface RequestManageMapper extends BaseMapper void updateProcessInterventionFlag(ProcessFormVo inData); - List getThePreviousProcessInfo(@Param("site") String site, @Param("bu") String bu, @Param("documentNo") String documentNo, @Param("nodeId") String nodeId); + List getThePreviousProcessInfo(@Param("site") String site, @Param("bu") String bu, @Param("documentNo") String documentNo, @Param("stepId") Integer stepId); void updateIsRemarkToZero(@Param("id") Integer id); } diff --git a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java index 638312d5..279db310 100644 --- a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java +++ b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java @@ -353,15 +353,15 @@ public class RequestManageServiceImpl extends ServiceImpl previousProcessList = requestManageMapper.getThePreviousProcessInfo(inData.getSite(), inData.getBu(), inData.getDocumentNo(), previousNodeId); + // 获取上一个节点的stepId +// String previousStepId; +// try { +// int numericNodeId = Integer.parseInt(inData.getNodeId()); +// previousStepId = String.valueOf(numericNodeId - 1); +// } catch (NumberFormatException e) { +// throw new RuntimeException("节点ID不能转为整数: " + inData.getNodeId(), e); +// } + List previousProcessList = requestManageMapper.getThePreviousProcessInfo(inData.getSite(), inData.getBu(), inData.getDocumentNo(), inData.getStepId() - 10); if (previousProcessList.isEmpty()) { throw new RuntimeException("不存在上一个节点的流程流转信息!"); } @@ -405,7 +405,7 @@ public class RequestManageServiceImpl extends ServiceImpl]]> 'Y' + where site = #{site} and bu = #{bu} and document_no = #{documentNo} and step_id = #{stepId} and ISNULL(process_intervention_flag ,' ') ]]> 'Y'