From 9dd76aba722a095d350eda2060fe40740e6ce661 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 01 十二月 2025 16:28:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 0f99f24..e6ebc62 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -1796,4 +1796,37 @@
return result;
}
+
+ @Transactional(rollbackFor = Exception.class)
+ public Result addWorkInProgress(Map<String, Object> object) {
+ List<Map<String,Object>> list = (List<Map<String,Object>>) object.get("reportingWorks");
+
+ list.forEach(item -> {
+ ReportingWork reportingWork = JSONObject.parseObject(
+ JSONObject.toJSONString(item.get("processTitle")), ReportingWork.class);
+ Map<String, String> mapTitle = new HashMap<>();
+ String[] processIdStr = reportingWork.getProcessId() != null
+ ? reportingWork.getProcessId().split("/")
+ : new String[]{""};
+ mapTitle.put("process", reportingWork.getPreviousProcess());
+ mapTitle.put("processId", reportingWork.getProcessId());
+ mapTitle.put("thisProcess", reportingWork.getThisProcess());
+ mapTitle.put("technologyStr", processIdStr[1]);
+ mapTitle.put("userName", object.get("userName").toString());
+ ReviewReportingWorkSv(mapTitle);
+
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("detail", item.get("processList"));
+ map.put("title", item.get("processTitle"));
+ map.put("type", object.get("type"));
+ map.put("userId", object.get("userId"));
+ map.put("userName", object.get("userName"));
+ map.put("qualityInsStatus", object.get("qualityInsStatus"));
+ map.put("class", object.get("class"));
+ SaveReportingWorkSv(map);
+ });
+
+ return Result.success(true);
+ }
}
--
Gitblit v1.8.0