2025-01-09

获取上一个节点的stepId

src/main/java/com/spring/modules/request/mapper/RequestManageMapper.java

@@ -167,7 +167,7 @@ public interface RequestManageMapper extends BaseMapper<PlmRequestHeaderEntity>
 
     void updateProcessInterventionFlag(ProcessFormVo inData);
 
-    List<ProcessFormVo> getThePreviousProcessInfo(@Param("site") String site, @Param("bu") String bu, @Param("documentNo") String documentNo, @Param("nodeId") String nodeId);
+    List<ProcessFormVo> getThePreviousProcessInfo(@Param("site") String site, @Param("bu") String bu, @Param("documentNo") String documentNo, @Param("stepId") Integer stepId);
 
     void updateIsRemarkToZero(@Param("id") Integer id);
 }

src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java

@@ -353,15 +353,15 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
 
         for (ProcessFormVo inData : data.getInformationList()) {
             String requestId = inData.getRequestId();
-            // 获取上一个节点的id
-            String previousNodeId;
-            try {
-                int numericNodeId = Integer.parseInt(inData.getNodeId());
-                previousNodeId = String.valueOf(numericNodeId - 1);
-            } catch (NumberFormatException e) {
-                throw new RuntimeException("节点ID不能转为整数: " + inData.getNodeId(), e);
-            }
-            List<ProcessFormVo> 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<ProcessFormVo> 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<RequestManageMapper, P
             vo.setDocumentNo(inData.getDocumentNo());
             vo.setNodeConclusion("同意");
             vo.setRejectOpinion("");
-            vo.setNodeId(previousNodeId);
+            vo.setNodeId(previousProcessList.get(0).getNodeId());
             vo.setProcessFlag(data.getProcessFlag());
             if (Constant.ECN.equals(inData.getDocumentType())) {
                 changeManagementService.submitChangeToFlow(vo);

src/main/resources/mapper/request/RequestManageMapper.xml

@@ -467,7 +467,7 @@
             id,
             is_remark
         from plm_process_form
-        where site = #{site} and bu = #{bu} and document_no = #{documentNo} and node_id = #{nodeId} and ISNULL(process_intervention_flag ,' ') <![CDATA[<>]]> 'Y'
+        where site = #{site} and bu = #{bu} and document_no = #{documentNo} and step_id = #{stepId} and ISNULL(process_intervention_flag ,' ') <![CDATA[<>]]> 'Y'
     </select>
 
     <update id="updateIsRemarkToZero">