Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2938

o2server/x_base_core_project/src/main/java/com/x/base/core/entity/JsonProperties.java

@@ -6,6 +6,11 @@ import com.x.base.core.project.gson.GsonPropertyObject;
 
 public abstract class JsonProperties extends GsonPropertyObject {
 
+	private static final long serialVersionUID = -5074100033957236455L;
+
+	// properties的泛型在前后都必须申明类型!!!!LinkedHashMap<String, String>()这样的写法是对的.
+	// properties的泛型在前后都必须申明类型!!!!LinkedHashMap<String, String>()这样的写法是对的.
+	// properties的泛型在前后都必须申明类型!!!!LinkedHashMap<String, String>()这样的写法是对的.
 	public boolean equals(Object o) {
 		if (null == o) {
 			return false;

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/form/BaseAction.java

@@ -15,7 +15,8 @@ import java.util.Map;
 
 public class BaseAction extends StandardJaxrsAction {
 
-	protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(Form.class, View.class, ViewFieldConfig.class, ViewCategory.class);
+	protected Cache.CacheCategory cacheCategory = new Cache.CacheCategory(Form.class, View.class, ViewFieldConfig.class, ViewCategory.class,
+			Script.class, com.x.processplatform.core.entity.element.Script.class, com.x.portal.core.entity.Script.class);
 
 	protected LogService logService = new LogService();
 

o2server/x_cms_core_entity/src/main/java/com/x/cms/core/entity/element/FormProperties.java

@@ -11,31 +11,31 @@ import java.util.Map;
 public class FormProperties extends JsonProperties {
 
 	@FieldDescribe("关联表单.")
-	private List<String> relatedFormList = new ArrayList<>();
+	private List<String> relatedFormList = new ArrayList<String>();
 
 	@FieldDescribe("移动端关联表单.")
-	private List<String> mobileRelatedFormList = new ArrayList<>();
+	private List<String> mobileRelatedFormList = new ArrayList<String>();
 
 	@FieldDescribe("关联脚本.")
-	private Map<String, String> relatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> relatedScriptMap = new LinkedHashMap<String, String>();
 
 	@FieldDescribe("移动端关联脚本.")
-	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<String, String>();
 
 	public List<String> getRelatedFormList() {
-		return this.relatedFormList == null ? new ArrayList<>() : this.relatedFormList;
+		return this.relatedFormList == null ? new ArrayList<String>() : this.relatedFormList;
 	}
 
 	public List<String> getMobileRelatedFormList() {
-		return this.mobileRelatedFormList == null ? new ArrayList<>() : this.mobileRelatedFormList;
+		return this.mobileRelatedFormList == null ? new ArrayList<String>() : this.mobileRelatedFormList;
 	}
 
 	public Map<String, String> getRelatedScriptMap() {
-		return this.relatedScriptMap == null ? new LinkedHashMap<>() : this.relatedScriptMap;
+		return this.relatedScriptMap == null ? new LinkedHashMap<String, String>() : this.relatedScriptMap;
 	}
 
 	public Map<String, String> getMobileRelatedScriptMap() {
-		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<>() : this.mobileRelatedScriptMap;
+		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<String, String>() : this.mobileRelatedScriptMap;
 	}
 
 	public void setRelatedFormList(List<String> relatedFormList) {

o2server/x_portal_core_entity/src/main/java/com/x/portal/core/entity/PageProperties.java

@@ -11,31 +11,31 @@ import java.util.Map;
 public class PageProperties extends JsonProperties {
 
 	@FieldDescribe("关联Widget.")
-	private List<String> relatedWidgetList = new ArrayList<>();
+	private List<String> relatedWidgetList = new ArrayList<String>();
 
 	@FieldDescribe("移动端关联Widget.")
-	private List<String> mobileRelatedWidgetList = new ArrayList<>();
+	private List<String> mobileRelatedWidgetList = new ArrayList<String>();
 
 	@FieldDescribe("关联脚本.")
-	private Map<String, String> relatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> relatedScriptMap = new LinkedHashMap<String, String>();
 
 	@FieldDescribe("移动端关联脚本.")
-	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<String, String>();
 
 	public List<String> getRelatedWidgetList() {
-		return this.relatedWidgetList == null ? new ArrayList<>() : this.relatedWidgetList;
+		return this.relatedWidgetList == null ? new ArrayList<String>() : this.relatedWidgetList;
 	}
 
 	public List<String> getMobileRelatedWidgetList() {
-		return this.mobileRelatedWidgetList == null ? new ArrayList<>() : this.mobileRelatedWidgetList;
+		return this.mobileRelatedWidgetList == null ? new ArrayList<String>() : this.mobileRelatedWidgetList;
 	}
 
 	public Map<String, String> getRelatedScriptMap() {
-		return this.relatedScriptMap == null ? new LinkedHashMap<>() : this.relatedScriptMap;
+		return this.relatedScriptMap == null ? new LinkedHashMap<String, String>() : this.relatedScriptMap;
 	}
 
 	public Map<String, String> getMobileRelatedScriptMap() {
-		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<>() : this.mobileRelatedScriptMap;
+		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<String, String>() : this.mobileRelatedScriptMap;
 	}
 
 	public void setRelatedWidgetList(List<String> relatedWidgetList) {

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/RecordProperties.java

@@ -11,10 +11,10 @@ import com.x.processplatform.core.entity.element.ActivityType;
 public class RecordProperties extends JsonProperties {
 
 	@FieldDescribe("后续人工环节")
-	private List<NextManual> nextManualList = new ArrayList<>();
+	private List<NextManual> nextManualList = new ArrayList<NextManual>();
 
 	@FieldDescribe("后续人工环节处理人")
-	private List<String> nextManualTaskIdentityList = new ArrayList<>();
+	private List<String> nextManualTaskIdentityList = new ArrayList<String>();
 
 	@FieldDescribe("授权给处理人")
 	private String empowerToPerson;
@@ -80,7 +80,7 @@ public class RecordProperties extends JsonProperties {
 		@FieldDescribe("活动活动令牌")
 		private String activityToken;
 		@FieldDescribe("待办处理人")
-		private List<String> taskIdentityList = new ArrayList<>();
+		private List<String> taskIdentityList = new ArrayList<String>();
 
 		public List<String> getTaskIdentityList() {
 			if (null == this.taskIdentityList) {

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/SnapProperties.java

@@ -20,37 +20,37 @@ public class SnapProperties extends JsonProperties {
 	private String job;
 
 	@FieldDescribe("工作")
-	private List<Work> workList = new ArrayList<>();
+	private List<Work> workList = new ArrayList<Work>();
 
 	@FieldDescribe("已完成工作")
 	private WorkCompleted workCompleted;
 
 	@FieldDescribe("待办")
-	private List<Task> taskList = new ArrayList<>();
+	private List<Task> taskList = new ArrayList<Task>();
 
 	@FieldDescribe("已办")
-	private List<TaskCompleted> taskCompletedList = new ArrayList<>();
+	private List<TaskCompleted> taskCompletedList = new ArrayList<TaskCompleted>();
 
 	@FieldDescribe("待阅")
-	private List<Read> readList = new ArrayList<>();
+	private List<Read> readList = new ArrayList<Read>();
 
 	@FieldDescribe("已阅")
-	private List<ReadCompleted> readCompletedList = new ArrayList<>();
+	private List<ReadCompleted> readCompletedList = new ArrayList<ReadCompleted>();
 
 	@FieldDescribe("参阅")
-	private List<Review> reviewList = new ArrayList<>();
+	private List<Review> reviewList = new ArrayList<Review>();
 
 	@FieldDescribe("附件")
-	private List<Attachment> attachmentList = new ArrayList<>();
+	private List<Attachment> attachmentList = new ArrayList<Attachment>();
 
 	@FieldDescribe("记录")
-	private List<Record> recordList = new ArrayList<>();
+	private List<Record> recordList = new ArrayList<Record>();
 
 	@FieldDescribe("工作日志")
-	private List<WorkLog> workLogList = new ArrayList<>();
+	private List<WorkLog> workLogList = new ArrayList<WorkLog>();
 
 	@FieldDescribe("版式文件版本")
-	private List<DocumentVersion> documentVersionList = new ArrayList<>();
+	private List<DocumentVersion> documentVersionList = new ArrayList<DocumentVersion>();
 
 	public Data getData() {
 		return data;
@@ -74,70 +74,70 @@ public class SnapProperties extends JsonProperties {
 
 	public List<Work> getWorkList() {
 		if (null == this.workList) {
-			this.workList = new ArrayList<>();
+			this.workList = new ArrayList<Work>();
 		}
 		return workList;
 	}
 
 	public List<Task> getTaskList() {
 		if (null == this.taskList) {
-			this.taskList = new ArrayList<>();
+			this.taskList = new ArrayList<Task>();
 		}
 		return taskList;
 	}
 
 	public List<TaskCompleted> getTaskCompletedList() {
 		if (null == this.taskCompletedList) {
-			this.taskCompletedList = new ArrayList<>();
+			this.taskCompletedList = new ArrayList<TaskCompleted>();
 		}
 		return taskCompletedList;
 	}
 
 	public List<Read> getReadList() {
 		if (null == this.readList) {
-			this.readList = new ArrayList<>();
+			this.readList = new ArrayList<Read>();
 		}
 		return readList;
 	}
 
 	public List<ReadCompleted> getReadCompletedList() {
 		if (null == this.readCompletedList) {
-			this.readCompletedList = new ArrayList<>();
+			this.readCompletedList = new ArrayList<ReadCompleted>();
 		}
 		return readCompletedList;
 	}
 
 	public List<Review> getReviewList() {
 		if (null == this.reviewList) {
-			this.reviewList = new ArrayList<>();
+			this.reviewList = new ArrayList<Review>();
 		}
 		return reviewList;
 	}
 
 	public List<Attachment> getAttachmentList() {
 		if (null == this.attachmentList) {
-			this.attachmentList = new ArrayList<>();
+			this.attachmentList = new ArrayList<Attachment>();
 		}
 		return attachmentList;
 	}
 
 	public List<Record> getRecordList() {
 		if (null == this.recordList) {
-			this.recordList = new ArrayList<>();
+			this.recordList = new ArrayList<Record>();
 		}
 		return recordList;
 	}
 
 	public List<WorkLog> getWorkLogList() {
 		if (null == this.workLogList) {
-			this.workLogList = new ArrayList<>();
+			this.workLogList = new ArrayList<WorkLog>();
 		}
 		return workLogList;
 	}
 
 	public List<DocumentVersion> getDocumentVersionList() {
 		if (null == this.documentVersionList) {
-			this.documentVersionList = new ArrayList<>();
+			this.documentVersionList = new ArrayList<DocumentVersion>();
 		}
 		return documentVersionList;
 	}
@@ -183,7 +183,7 @@ public class SnapProperties extends JsonProperties {
 	}
 
 	public void setDocumentVersionList(List<DocumentVersion> documentVersionList) {
-		documentVersionList = documentVersionList;
+		this.documentVersionList = documentVersionList;
 	}
 
 	public WorkCompleted getWorkCompleted() {

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskCompletedProperties.java

@@ -14,7 +14,7 @@ public class TaskCompletedProperties extends JsonProperties {
 	private List<String> prevTaskIdentityList;
 
 	@FieldDescribe("后续处理人")
-	private List<String> nextTaskIdentityList = new ArrayList<>();
+	private List<String> nextTaskIdentityList = new ArrayList<String>();
 
 	@FieldDescribe("上一人工环节待办对象列表")
 	private List<PrevTask> prevTaskList;
@@ -30,7 +30,7 @@ public class TaskCompletedProperties extends JsonProperties {
 
 	public List<PrevTask> getPrevTaskList() {
 		if (null == this.prevTaskList) {
-			this.prevTaskList = new ArrayList<>();
+			this.prevTaskList = new ArrayList<PrevTask>();
 		}
 		return prevTaskList;
 	}
@@ -45,14 +45,14 @@ public class TaskCompletedProperties extends JsonProperties {
 
 	public List<String> getPrevTaskIdentityList() {
 		if (null == this.prevTaskIdentityList) {
-			this.prevTaskIdentityList = new ArrayList<>();
+			this.prevTaskIdentityList = new ArrayList<String>();
 		}
 		return prevTaskIdentityList;
 	}
 
 	public List<String> getNextTaskIdentityList() {
 		if (null == this.nextTaskIdentityList) {
-			this.nextTaskIdentityList = new ArrayList<>();
+			this.nextTaskIdentityList = new ArrayList<String>();
 		}
 		return nextTaskIdentityList;
 	}

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/TaskProperties.java

@@ -41,14 +41,14 @@ public class TaskProperties extends JsonProperties {
 
 	public List<String> getPrevTaskIdentityList() {
 		if (null == prevTaskIdentityList) {
-			this.prevTaskIdentityList = new ArrayList<>();
+			this.prevTaskIdentityList = new ArrayList<String>();
 		}
 		return prevTaskIdentityList;
 	}
 
 	public List<PrevTask> getPrevTaskList() {
 		if (null == prevTaskList) {
-			this.prevTaskList = new ArrayList<>();
+			this.prevTaskList = new ArrayList<PrevTask>();
 		}
 		return prevTaskList;
 	}

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkCompletedProperties.java

@@ -14,22 +14,22 @@ import com.x.processplatform.core.entity.element.Script;
 public class WorkCompletedProperties extends JsonProperties {
 
 	@FieldDescribe("合并已办对象")
-	private List<TaskCompleted> taskCompletedList = new ArrayList<>();
+	private List<TaskCompleted> taskCompletedList = new ArrayList<TaskCompleted>();
 
 	@FieldDescribe("合并已阅对象")
-	private List<ReadCompleted> readCompletedList = new ArrayList<>();
+	private List<ReadCompleted> readCompletedList = new ArrayList<ReadCompleted>();
 
 	@FieldDescribe("合并参阅对象")
-	private List<Review> reviewList = new ArrayList<>();
+	private List<Review> reviewList = new ArrayList<Review>();
 
 	@FieldDescribe("合并记录对象")
-	private List<Record> recordList = new ArrayList<>();
+	private List<Record> recordList = new ArrayList<Record>();
 
 	@FieldDescribe("合并数据对象")
 	private Data data;
 
 	@FieldDescribe("合并工作日志对象")
-	private List<WorkLog> workLogList = new ArrayList<>();
+	private List<WorkLog> workLogList = new ArrayList<WorkLog>();
 
 	@FieldDescribe("合并工作Form")
 	private StoreForm storeForm;

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkLogProperties.java

@@ -11,7 +11,7 @@ public class WorkLogProperties extends JsonProperties {
 
 	private List<String> splitTokenList;
 
-	private List<String> splitValueList = new ArrayList<>();
+	private List<String> splitValueList = new ArrayList<String>();
 
 	private String splitToken;
 
@@ -26,7 +26,7 @@ public class WorkLogProperties extends JsonProperties {
 
 	public List<String> getSplitValueList() {
 		if (null == splitValueList) {
-			this.splitValueList = new ArrayList<>();
+			this.splitValueList = new ArrayList<String>();
 		}
 		return splitValueList;
 	}

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/WorkProperties.java

@@ -13,23 +13,29 @@ public class WorkProperties extends JsonProperties {
 	private static final long serialVersionUID = -62236689373222398L;
 
 	@FieldDescribe("强制待办处理人")
-	private List<String> manualForceTaskIdentityList = new ArrayList<>();
+	// properties的泛型在前后都必须申明类型!!!!LinkedHashMap<String, String>()这样的写法是对的.
+	// properties的泛型在前后都必须申明类型!!!!LinkedHashMap<String, String>()这样的写法是对的.
+	// properties的泛型在前后都必须申明类型!!!!LinkedHashMap<String, String>()这样的写法是对的.
+	private List<String> manualForceTaskIdentityList = new ArrayList<String>();
 
 	@FieldDescribe("授权对象")
-	private Map<String, String> manualEmpowerMap = new LinkedHashMap<>();
+	// properties的泛型在前后都必须申明类型!!!!LinkedHashMap<String, String>()这样的写法是对的.
+	// properties的泛型在前后都必须申明类型!!!!LinkedHashMap<String, String>()这样的写法是对的.
+	// properties的泛型在前后都必须申明类型!!!!LinkedHashMap<String, String>()这样的写法是对的.
+	private Map<String, String> manualEmpowerMap = new LinkedHashMap<String, String>();
 
 	@FieldDescribe("服务回调值")
-	private Map<String, Object> serviceValue = new LinkedHashMap<>();
+	private Map<String, Object> serviceValue = new LinkedHashMap<String, Object>();
 
 	@FieldDescribe("标题")
 	private String title;
 
 	@FieldDescribe("拆分值列表")
-	private List<String> splitValueList = new ArrayList<>();
+	private List<String> splitValueList = new ArrayList<String>();
 
 	public List<String> getManualForceTaskIdentityList() {
 		if (this.manualForceTaskIdentityList == null) {
-			this.manualForceTaskIdentityList = new ArrayList<>();
+			this.manualForceTaskIdentityList = new ArrayList<String>();
 		}
 		return this.manualForceTaskIdentityList;
 	}
@@ -40,7 +46,7 @@ public class WorkProperties extends JsonProperties {
 
 	public Map<String, String> getManualEmpowerMap() {
 		if (this.manualEmpowerMap == null) {
-			this.manualEmpowerMap = new LinkedHashMap<>();
+			this.manualEmpowerMap = new LinkedHashMap<String, String>();
 		}
 		return this.manualEmpowerMap;
 	}
@@ -51,7 +57,7 @@ public class WorkProperties extends JsonProperties {
 
 	public Map<String, Object> getServiceValue() {
 		if (this.serviceValue == null) {
-			this.serviceValue = new LinkedHashMap<>();
+			this.serviceValue = new LinkedHashMap<String, Object>();
 		}
 		return this.serviceValue;
 	}

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/FormProperties.java

@@ -11,31 +11,31 @@ import com.x.base.core.project.annotation.FieldDescribe;
 public class FormProperties extends JsonProperties {
 
 	@FieldDescribe("关联表单.")
-	private List<String> relatedFormList = new ArrayList<>();
+	private List<String> relatedFormList = new ArrayList<String>();
 
 	@FieldDescribe("移动端关联表单.")
-	private List<String> mobileRelatedFormList = new ArrayList<>();
+	private List<String> mobileRelatedFormList = new ArrayList<String>();
 
 	@FieldDescribe("关联脚本.")
-	private Map<String, String> relatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> relatedScriptMap = new LinkedHashMap<String, String>();
 
 	@FieldDescribe("移动端关联脚本.")
-	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<>();
+	private Map<String, String> mobileRelatedScriptMap = new LinkedHashMap<String, String>();
 
 	public List<String> getRelatedFormList() {
-		return this.relatedFormList == null ? new ArrayList<>() : this.relatedFormList;
+		return this.relatedFormList == null ? new ArrayList<String>() : this.relatedFormList;
 	}
 
 	public List<String> getMobileRelatedFormList() {
-		return this.mobileRelatedFormList == null ? new ArrayList<>() : this.mobileRelatedFormList;
+		return this.mobileRelatedFormList == null ? new ArrayList<String>() : this.mobileRelatedFormList;
 	}
 
 	public Map<String, String> getRelatedScriptMap() {
-		return this.relatedScriptMap == null ? new LinkedHashMap<>() : this.relatedScriptMap;
+		return this.relatedScriptMap == null ? new LinkedHashMap<String, String>() : this.relatedScriptMap;
 	}
 
 	public Map<String, String> getMobileRelatedScriptMap() {
-		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<>() : this.mobileRelatedScriptMap;
+		return this.mobileRelatedScriptMap == null ? new LinkedHashMap<String, String>() : this.mobileRelatedScriptMap;
 	}
 
 	public void setRelatedFormList(List<String> relatedFormList) {

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java

@@ -1,7 +1,9 @@
 package com.x.processplatform.service.processing.jaxrs.task;
 
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
@@ -10,6 +12,8 @@ import javax.script.CompiledScript;
 import javax.script.ScriptContext;
 import javax.script.SimpleScriptContext;
 
+import com.x.base.core.project.logger.Logger;
+import com.x.base.core.project.logger.LoggerFactory;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -45,6 +49,8 @@ import com.x.processplatform.service.processing.processor.manual.TaskIdentity;
 
 class ActionAppend extends BaseAction {
 
+	private static Logger logger = LoggerFactory.getLogger(ActionAppend.class);
+
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception {
 
 		final Wi wi = this.convertToWrapIn(jsonElement, Wi.class);
@@ -65,6 +71,7 @@ class ActionAppend extends BaseAction {
 			public ActionResult<Wo> call() throws Exception {
 				ActionResult<Wo> result = new ActionResult<>();
 				Wo wo = new Wo();
+				String workId = "";
 				try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
 					Business business = new Business(emc);
 					Task task = emc.find(id, Task.class);
@@ -75,6 +82,7 @@ class ActionAppend extends BaseAction {
 					if (null == work) {
 						throw new ExceptionEntityNotExist(task.getWork(), Work.class);
 					}
+					workId = work.getId();
 					Manual manual = (Manual) business.element().get(task.getActivity(), ActivityType.manual);
 					Route route = getRoute(business, task, manual);
 					List<String> identities = new ArrayList<>();
@@ -141,6 +149,10 @@ class ActionAppend extends BaseAction {
 										taskIdentity.getFromIdentity());
 							}
 						}
+						//properties中的集合对象需要重新new对象set进去，这样jpa才会更新数据
+						Map<String, String> manualEmpowerMap = new LinkedHashMap<String, String>();
+						manualEmpowerMap.putAll(work.getProperties().getManualEmpowerMap());
+						work.getProperties().setManualEmpowerMap(manualEmpowerMap);
 						// 转派后设置过期为空
 //						emc.beginTransaction(Task.class);
 //						task.setExpired(false);
@@ -198,4 +210,4 @@ class ActionAppend extends BaseAction {
 
 	}
 
-}
+}