feat: 企标制修订计划新增是否为自动发起流程的标识
This commit is contained in:
+6
@@ -310,6 +310,12 @@ public class ProcessEsRevision implements Serializable {
|
|||||||
@ApiModelProperty(value = "在线编辑文件id")
|
@ApiModelProperty(value = "在线编辑文件id")
|
||||||
private String onEditFile;
|
private String onEditFile;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 自动发起标识
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
@ApiModelProperty(value = "自动发起标识")
|
||||||
|
private boolean autoStartFlag;
|
||||||
|
|
||||||
public void setOtherDrafterUploadFileJson(String otherDrafterUploadFileJson) {
|
public void setOtherDrafterUploadFileJson(String otherDrafterUploadFileJson) {
|
||||||
this.otherDrafterUploadFileJson = otherDrafterUploadFileJson;
|
this.otherDrafterUploadFileJson = otherDrafterUploadFileJson;
|
||||||
|
|||||||
+4
-1
@@ -153,8 +153,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
|
|||||||
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables));
|
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(actVariables));
|
||||||
// 获取第一个任务的taskId
|
// 获取第一个任务的taskId
|
||||||
String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
|
String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
|
||||||
|
ESRevisionDataVO handleData = this.getHandleData(taskId);
|
||||||
|
handleData.getData().setAutoStartFlag(false);
|
||||||
// 手动翻译
|
// 手动翻译
|
||||||
String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), revisionData.getFlowUser());
|
String jsonData = translationAspect.manualParseDictText(handleData, revisionData.getFlowUser());
|
||||||
// 强制撤回
|
// 强制撤回
|
||||||
commonVO.setProcessInstanceId(processInstanceId);
|
commonVO.setProcessInstanceId(processInstanceId);
|
||||||
actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
|
actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
|
||||||
@@ -274,6 +276,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
|
|||||||
revisionData.setCommon(commonVO);
|
revisionData.setCommon(commonVO);
|
||||||
// 获取第一个任务的taskId
|
// 获取第一个任务的taskId
|
||||||
actFlowCommonService.getFirstTaskId(processInstanceId, mainDraftUser, processDefinitionId);
|
actFlowCommonService.getFirstTaskId(processInstanceId, mainDraftUser, processDefinitionId);
|
||||||
|
revisionData.getData().setAutoStartFlag(true);
|
||||||
// 手动翻译
|
// 手动翻译
|
||||||
String jsonData = translationAspect.autoParseDictText(revisionData, variables);
|
String jsonData = translationAspect.autoParseDictText(revisionData, variables);
|
||||||
// 强制撤回
|
// 强制撤回
|
||||||
|
|||||||
Reference in New Issue
Block a user