From 9e2f85356a71c888f8631a88131ba2afc8d675c6 Mon Sep 17 00:00:00 2001 From: o2null Date: Wed, 27 Jan 2021 02:08:14 +0000 Subject: [PATCH] =?UTF-8?q?Merge=20branch=20'fix/#468'=20into=20'project/c?= =?UTF-8?q?hinamobile-=E9=87=8D=E5=BA=86=E7=A7=BB=E5=8A=A8'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将所有已办标志为joinInquire=false See merge request o2oa/o2oa!2907 (cherry picked from commit f50cb91f7b50804530f60c96ce5057d36dff9822) 58252daa 将所有已办标志为joinInquire=false --- .../service/processing/jaxrs/task/ActionAppend.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java index 97f53d95ef..b3c65aa403 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java @@ -25,7 +25,6 @@ import com.x.base.core.project.script.ScriptFactory; import com.x.base.core.project.tools.ListTools; import com.x.base.core.project.webservices.WebservicesClient; import com.x.processplatform.core.entity.content.Data; -import com.x.processplatform.core.entity.content.ProcessingType; import com.x.processplatform.core.entity.content.Task; import com.x.processplatform.core.entity.content.TaskCompleted; import com.x.processplatform.core.entity.content.Work; @@ -41,7 +40,6 @@ import com.x.processplatform.service.processing.ThisApplication; import com.x.processplatform.service.processing.WorkContext; import com.x.processplatform.service.processing.WorkDataHelper; import com.x.processplatform.service.processing.processor.manual.TaskIdentities; -import com.x.processplatform.service.processing.processor.manual.TaskIdentity; class ActionAppend extends BaseAction { @@ -111,10 +109,15 @@ class ActionAppend extends BaseAction { TaskIdentities taskIdentities = empower(business, process, task, identities); identities = taskIdentities.identities(); if (ListTools.isNotEmpty(identities)) { +// List os = emc.listEqualAndInAndNotEqual(TaskCompleted.class, +// TaskCompleted.activityToken_FIELDNAME, work.getActivityToken(), +// TaskCompleted.identity_FIELDNAME, identities, TaskCompleted.joinInquire_FIELDNAME, +// true); + // 同一环节办理后再转交给已经有已办的人员,需要将已办置为joinInquire=false List os = emc.listEqualAndInAndNotEqual(TaskCompleted.class, TaskCompleted.activityToken_FIELDNAME, work.getActivityToken(), TaskCompleted.identity_FIELDNAME, identities, TaskCompleted.joinInquire_FIELDNAME, - true); + false); if (ListTools.isNotEmpty(os)) { emc.beginTransaction(TaskCompleted.class); for (TaskCompleted o : os) { -- GitLab