From 091e7f6c7c22e327796f1bee9d882881ebc81a3a Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 23 八月 2024 16:06:04 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index a4f9f41..3afd8a2 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -663,6 +663,23 @@
}
+
+ public String mergeFlowCard(Map<String, Object> object) {
+ String returns= "false";
+ List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
+ if (!flowCardList.isEmpty()) {
+ List<Map<String, Object>> flowCardList1=flowCardMapper.selectFlowCardMerge(flowCardList.get(0).getProcessId());
+ if(flowCardList1.size()==1){
+ flowCardMapper.updateFlowCardMerge(flowCardList.get(0).getProcessId());
+ returns="true";
+ }
+
+ }
+
+ return returns;
+
+
+ }
}
--
Gitblit v1.8.0