|
|
@@ -186,10 +186,38 @@ public class ActivitiService {
|
|
|
|
|
|
} else if(hvi.getVariableName().equals("remarks")) {
|
|
|
historicTask.setRemarks(hvi.getValue().toString());
|
|
|
+
|
|
|
+ } else if( hvi.getVariableName().equals("users")) {
|
|
|
+ historicTask.setUsers(hvi.getValue().toString());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ //当前未完成的步骤,取出当前操作人
|
|
|
+ if ( histTask.getClaimTime() == null || histTask.getEndTime() == null ) {
|
|
|
+ List<HistoricVariableInstance> varListTmp = historyService.createHistoricVariableInstanceQuery()
|
|
|
+ .processInstanceId(processInstanceId)
|
|
|
+ .executionId(histTask.getExecutionId())
|
|
|
+ .list();
|
|
|
+
|
|
|
+ for(HistoricVariableInstance hvi : varListTmp){
|
|
|
+ if(hvi.getVariableName().equals("businessKey")) {
|
|
|
+ historicTask.setBusinessKey(hvi.getValue().toString());
|
|
|
+
|
|
|
+ } else if(hvi.getVariableName().equals("result")) {
|
|
|
+ historicTask.setResult(hvi.getValue().toString());
|
|
|
+
|
|
|
+ } else if(hvi.getVariableName().equals("remarks")) {
|
|
|
+ historicTask.setRemarks(hvi.getValue().toString());
|
|
|
+
|
|
|
+ } else if( hvi.getVariableName().equals("users")) {
|
|
|
+ historicTask.setUsers(hvi.getValue().toString());
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
historicTask.setAssignee(histTask.getAssignee());
|
|
|
historicTask.setTaskName(histTask.getName());
|
|
|
if(histTask.getStartTime() != null) {
|