Browse Source

2025-05-09

master
fengyuan_yang 10 months ago
parent
commit
f55dd65b73
  1. 2
      src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java
  2. 6
      src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java
  3. 2
      src/main/resources/mapper/change/ChangeManagementMapper.xml

2
src/main/java/com/spring/modules/change/mapper/ChangeManagementMapper.java

@ -173,7 +173,7 @@ public interface ChangeManagementMapper extends BaseMapper<ChangeRequestEntity>{
List<ProcessFormVo> getProcessFormByIsRemark(@Param("site") String site, @Param("bu") String bu, @Param("docNo") String docNo, @Param("isRemark") String isRemark);
String getRequestNameByFunction(@Param("classificationNo") String classificationNo, @Param("workflowId") String workflowId, @Param("workflowName") String workflowName,
String getRequestNameByFunction(@Param("site") String site, @Param("classificationNo") String classificationNo, @Param("workflowId") String workflowId, @Param("workflowName") String workflowName,
@Param("nodeId") String nodeId, @Param("nodeName") String nodeName, @Param("documentNo") String docNo, @Param("nodeConclusion") String nodeConclusion,
@Param("updateBy") String userName, @Param("updateDate") String stringNow, @Param("rejectOpinion") String rejectOpinion, @Param("menuName") String menuName, @Param("type") String type);

6
src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@ -1219,7 +1219,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
changeManagementMapper.updateStepId2(paramData);
// 通过函数获取流程标题 2024-12-25
String requestName = changeManagementMapper.getRequestNameByFunction(paramData.getClassificationNo(), paramData.getWorkflowId(), paramData.getWorkflowName(), paramData.getNodeId(), paramData.getNodeName(), paramData.getDocNo(), "", paramData.getUserName(), DateUtils.getStringNow(), "", paramData.getMenuName(), "下达");
String requestName = changeManagementMapper.getRequestNameByFunction(paramData.getSite(), paramData.getClassificationNo(), paramData.getWorkflowId(), paramData.getWorkflowName(), paramData.getNodeId(), paramData.getNodeName(), paramData.getDocNo(), "", paramData.getUserName(), DateUtils.getStringNow(), "", paramData.getMenuName(), "下达");
// 统一待办接口
for (String key : dcas.keySet()) {
@ -1537,7 +1537,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
String newNodeId = getWorkflowRequestData.getCurrentNodeId();
// 通过函数获取流程标题 2024-12-25
String requestName = changeManagementMapper.getRequestNameByFunction(paramData.getClassificationNo(), paramData.getWorkflowId(), paramData.getWorkflowName(), paramData.getNodeId(), paramData.getNodeName(), paramData.getDocNo(), "Y", paramData.getUserName(), DateUtils.getStringNow(), "", paramData.getMenuName(), "提交");
String requestName = changeManagementMapper.getRequestNameByFunction(paramData.getSite(), paramData.getClassificationNo(), paramData.getWorkflowId(), paramData.getWorkflowName(), paramData.getNodeId(), paramData.getNodeName(), paramData.getDocNo(), "Y", paramData.getUserName(), DateUtils.getStringNow(), "", paramData.getMenuName(), "提交");
// 如果 isRemarks 中的节点ID = 最新节点ID
if (isRemarks.get(0).get("nodeid").toString().equals(newNodeId) && !pfs.isEmpty()) {
@ -1787,7 +1787,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
changeManagementMapper.updateStepId2(paramData);
// 通过函数获取流程标题 2024-12-25
String requestName = changeManagementMapper.getRequestNameByFunction(paramData.getClassificationNo(), paramData.getWorkflowId(), paramData.getWorkflowName(), paramData.getNodeId(), paramData.getNodeName(), paramData.getDocNo(), "N", paramData.getUserName(), DateUtils.getStringNow(), paramData.getRejectOpinion(), paramData.getMenuName(), "提交");
String requestName = changeManagementMapper.getRequestNameByFunction(paramData.getSite(), paramData.getClassificationNo(), paramData.getWorkflowId(), paramData.getWorkflowName(), paramData.getNodeId(), paramData.getNodeName(), paramData.getDocNo(), "N", paramData.getUserName(), DateUtils.getStringNow(), paramData.getRejectOpinion(), paramData.getMenuName(), "提交");
// 2025-05-09 发送统一待办前先调用[删除异构系统指定人员待办流程]接口
DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam();

2
src/main/resources/mapper/change/ChangeManagementMapper.xml

@ -1276,7 +1276,7 @@
</select>
<select id="getRequestNameByFunction" parameterType="string" resultType="string">
SELECT dbo.get_Process_heading(#{classificationNo}, #{workflowId}, #{workflowName}, #{nodeId}, #{nodeName}, #{documentNo}, #{nodeConclusion}, #{updateBy}, #{updateDate}, #{rejectOpinion}, #{menuName}, #{type})
SELECT dbo.get_Process_heading(#{site}, #{classificationNo}, #{workflowId}, #{workflowName}, #{nodeId}, #{nodeName}, #{documentNo}, #{nodeConclusion}, #{updateBy}, #{updateDate}, #{rejectOpinion}, #{menuName}, #{type})
</select>
<!-- 根据视图查物料 -->

Loading…
Cancel
Save