Merge branch 'feature/prevTask' into 'develop'

未完成待办自动转待阅

See merge request o2oa/o2oa!975

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

@@ -570,6 +570,12 @@ public class Manual extends Activity {
 	@Column(name = ColumnNamePrefix + manualMergeSameJobActivity_FIELDNAME)
 	private Boolean manualMergeSameJobActivity;
 
+	public static final String manualUncompletedTaskToRead_FIELDNAME = "manualUncompletedTaskToRead";
+	@FieldDescribe("人工活动中将未处理的待办转为待阅.")
+	@CheckPersist(allowEmpty = true)
+	@Column(name = ColumnNamePrefix + manualUncompletedTaskToRead_FIELDNAME)
+	private Boolean manualUncompletedTaskToRead;
+
 	@IdReference(Script.class)
 	@FieldDescribe("生成displayLog脚本.")
 	@Column(length = length_255B, name = ColumnNamePrefix + displayLogScript_FIELDNAME)
@@ -1192,4 +1198,12 @@ public class Manual extends Activity {
 		this.edition = edition;
 	}
 
+	public Boolean getManualUncompletedTaskToRead() {
+		return manualUncompletedTaskToRead;
+	}
+
+	public void setManualUncompletedTaskToRead(Boolean manualUncompletedTaskToRead) {
+		this.manualUncompletedTaskToRead = manualUncompletedTaskToRead;
+	}
+
 }

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java

@@ -382,6 +382,11 @@ public class ManualProcessor extends AbstractManualProcessor {
 			aeiObjects.getTasks().stream().filter(o -> {
 				return StringUtils.equals(aeiObjects.getWork().getId(), o.getWork());
 			}).forEach(o -> {
+				// 如果启用了将未处理待办转待阅,那么进行转换
+				if (BooleanUtils.isTrue(manual.getManualUncompletedTaskToRead())) {
+					aeiObjects.getCreateReads()
+							.add(new Read(aeiObjects.getWork(), o.getIdentity(), o.getUnit(), o.getPerson()));
+				}
 				aeiObjects.deleteTask(o);
 			});
 			/* 所有预计的处理人中已经有已办,这个环节已经产生了已办，可以离开换个环节。 */