Merge branch 'cherry-pick-5b41d4db' into 'wrdp'

Merge branch 'fix/回溯到拟稿环境没有待办' into 'project/chinamobile-重庆移动'

See merge request o2oa/o2oa!2908

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionRollback.java

@@ -162,6 +162,8 @@ class ActionRollback extends BaseAction {
 		work.setActivityType(workLog.getFromActivityType());
 //		work.setErrorRetry(0);
 		work.setWorkStatus(WorkStatus.processing);
+		//因为workCompleted没有workCreateType属性，回溯到任何环节都必须要有待办，默认置为assign
+		work.setWorkCreateType(Work.WORKCREATETYPE_ASSIGN);
 		return work;
 	}
 
@@ -273,4 +275,4 @@ class ActionRollback extends BaseAction {
 	public static class Wo extends WoId {
 	}
 
-}
+}