From 8ddf657d3c1a08769c0566ba5e65c1b9fcf50205 Mon Sep 17 00:00:00 2001
From: o2sword <171715986@qq.com>
Date: Mon, 17 May 2021 14:30:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=B9=B3=E5=8F=B0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E9=A2=84=E7=95=99=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../surface/jaxrs/attachment/ActionEdit.java  | 26 +++++------
 .../core/entity/content/Attachment.java       | 45 +++++++++++++++++++
 2 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionEdit.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionEdit.java
index f819468c24..3999c66478 100644
--- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionEdit.java
+++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionEdit.java
@@ -3,6 +3,7 @@ package com.x.processplatform.assemble.surface.jaxrs.attachment;
 import java.util.Arrays;
 import java.util.List;
 
+import com.x.base.core.entity.annotation.CheckPersistType;
 import org.apache.commons.lang3.BooleanUtils;
 
 import com.google.gson.JsonElement;
@@ -60,20 +61,16 @@ class ActionEdit extends BaseAction {
 			if(!canControl){
 				throw new ExceptionAccessDenied(effectivePerson, attachment);
 			}
+
+			emc.beginTransaction(Attachment.class);
+			Wi.copier.copy(wi, attachment);
+			emc.check(attachment, CheckPersistType.all);
+			emc.commit();
+			Wo wo = new Wo();
+			wo.setId(attachment.getId());
+			result.setData(wo);
 		}
-//			emc.beginTransaction(Attachment.class);
-//			Wi.copier.copy(wi, attachment);
-//			emc.check(attachment, CheckPersistType.all);
-//			emc.commit();
-//			Wo wo = new Wo();
-//			wo.setId(attachment.getId());
-//			result.setData(wo);
-//			return result;
-		Wo wo = ThisApplication.context().applications()
-				.putQuery(effectivePerson.getDebugger(), x_processplatform_service_processing.class,
-						Applications.joinQueryUri("attachment", attachment.getId()), wi, attachment.getJob())
-				.getData(Wo.class);
-		result.setData(wo);
+
 		return result;
 	}
 
@@ -85,7 +82,8 @@ class ActionEdit extends BaseAction {
 				Arrays.asList(Attachment.readIdentityList_FIELDNAME, Attachment.readUnitList_FIELDNAME,
 						Attachment.editIdentityList_FIELDNAME, Attachment.editUnitList_FIELDNAME,
 						Attachment.controllerIdentityList_FIELDNAME, Attachment.controllerUnitList_FIELDNAME,
-						Attachment.divisionList_FIELDNAME),
+						Attachment.divisionList_FIELDNAME, Attachment.stringValue01_FIELDNAME,
+						Attachment.stringValue02_FIELDNAME, Attachment.stringValue03_FIELDNAME),
 				null);
 
 	}
diff --git a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Attachment.java b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Attachment.java
index d1c8750d07..dcf7500f5f 100644
--- a/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Attachment.java
+++ b/o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/Attachment.java
@@ -491,6 +491,27 @@ public class Attachment extends StorageObject {
 	@CheckPersist(allowEmpty = true)
 	private String fromPath;
 
+	public static final String stringValue01_FIELDNAME = "stringValue01";
+	@FieldDescribe("业务数据String值01.")
+	@Column(length = length_255B, name = ColumnNamePrefix + stringValue01_FIELDNAME)
+	@Index(name = TABLE + IndexNameMiddle + stringValue01_FIELDNAME)
+	@CheckPersist(allowEmpty = true)
+	private String stringValue01;
+
+	public static final String stringValue02_FIELDNAME = "stringValue02";
+	@FieldDescribe("业务数据String值02.")
+	@Column(length = length_255B, name = ColumnNamePrefix + stringValue02_FIELDNAME)
+	@Index(name = TABLE + IndexNameMiddle + stringValue02_FIELDNAME)
+	@CheckPersist(allowEmpty = true)
+	private String stringValue02;
+
+	public static final String stringValue03_FIELDNAME = "stringValue03";
+	@FieldDescribe("业务数据String值03.")
+	@Column(length = length_255B, name = ColumnNamePrefix + stringValue03_FIELDNAME)
+	@Index(name = TABLE + IndexNameMiddle + stringValue03_FIELDNAME)
+	@CheckPersist(allowEmpty = true)
+	private String stringValue03;
+
 	public String getJob() {
 		return job;
 	}
@@ -706,4 +727,28 @@ public class Attachment extends StorageObject {
 	public void setFromPath(String fromPath) {
 		this.fromPath = fromPath;
 	}
+
+	public String getStringValue01() {
+		return stringValue01;
+	}
+
+	public void setStringValue01(String stringValue01) {
+		this.stringValue01 = stringValue01;
+	}
+
+	public String getStringValue02() {
+		return stringValue02;
+	}
+
+	public void setStringValue02(String stringValue02) {
+		this.stringValue02 = stringValue02;
+	}
+
+	public String getStringValue03() {
+		return stringValue03;
+	}
+
+	public void setStringValue03(String stringValue03) {
+		this.stringValue03 = stringValue03;
+	}
 }
-- 
GitLab