From b17507f4960c8544bae4d5e3d235b239bca1dc9f Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 17 七月 2024 16:48:50 +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/ReportingWorkService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 bb3fdd9..2b03502 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
@@ -287,8 +287,12 @@
public boolean ReviewReportingWorkSv(Map<String, String> reportingWork) {
String processId = reportingWork.get("processId");
+ String thisProcess = reportingWork.get("thisProcess");
+ int index = processId.lastIndexOf("/") + 1;
+ String result = processId.substring(index);
- LambdaUpdateWrapper
+if (thisProcess.equals("澶硅兌") || thisProcess.equals("涓┖") || thisProcess.equals("浠撳偍")){
+ LambdaUpdateWrapper
<ReportingWork> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper
.eq(ReportingWork::getProcessId, processId.substring(0, 14))
@@ -296,8 +300,10 @@
.eq(ReportingWork::getReviewedState, 0)
.setSql("reviewed_state =1");
reportingWorkMapper.update(null, updateWrapper);
+}else {
+ reportingWorkMapper.ReviewReportingWorkMp(processId.substring(0, 14),reportingWork.get("process"),result);
-
+}
return true;
}
--
Gitblit v1.8.0