|
@@ -12,12 +12,10 @@ import com.ningdatech.pmapi.common.enumeration.ProjectProcessStageEnum; |
|
|
import com.ningdatech.pmapi.common.helper.RegionCacheHelper; |
|
|
import com.ningdatech.pmapi.common.helper.RegionCacheHelper; |
|
|
import com.ningdatech.pmapi.scheduler.contants.TaskContant; |
|
|
import com.ningdatech.pmapi.scheduler.contants.TaskContant; |
|
|
import com.ningdatech.pmapi.sys.model.dto.RegionDTO; |
|
|
import com.ningdatech.pmapi.sys.model.dto.RegionDTO; |
|
|
import com.ningdatech.pmapi.sys.model.entity.Region; |
|
|
|
|
|
import com.ningdatech.pmapi.sys.service.IRegionService; |
|
|
import com.ningdatech.pmapi.sys.service.IRegionService; |
|
|
import com.wflow.bean.dto.WflowModelHistorysDto; |
|
|
|
|
|
|
|
|
import com.wflow.bean.dto.WflowModelHistorysInsertDto; |
|
|
import com.wflow.bean.entity.WflowForms; |
|
|
import com.wflow.bean.entity.WflowForms; |
|
|
import com.wflow.bean.entity.WflowModels; |
|
|
import com.wflow.bean.entity.WflowModels; |
|
|
import com.wflow.workflow.bean.dto.OrgInfoDTO; |
|
|
|
|
|
import com.wflow.workflow.bean.process.ProcessNode; |
|
|
import com.wflow.workflow.bean.process.ProcessNode; |
|
|
import com.wflow.workflow.service.ProcessModelService; |
|
|
import com.wflow.workflow.service.ProcessModelService; |
|
|
import com.wflow.workflow.service.WflowFormsService; |
|
|
import com.wflow.workflow.service.WflowFormsService; |
|
@@ -111,9 +109,9 @@ public class InitProcessTask { |
|
|
Integer[] processTypeList = TaskContant.Wflow.DEFAULT_PROCESS_TYPE_LIST; |
|
|
Integer[] processTypeList = TaskContant.Wflow.DEFAULT_PROCESS_TYPE_LIST; |
|
|
for(Integer processType : processTypeList){ |
|
|
for(Integer processType : processTypeList){ |
|
|
String formName = ProjectProcessStageEnum.getDesc(processType); |
|
|
String formName = ProjectProcessStageEnum.getDesc(processType); |
|
|
WflowModelHistorysDto models = new WflowModelHistorysDto(); |
|
|
|
|
|
|
|
|
WflowModelHistorysInsertDto models = new WflowModelHistorysInsertDto(); |
|
|
// models.setFormId("wf" + IdUtil.objectId()); |
|
|
// models.setFormId("wf" + IdUtil.objectId()); |
|
|
models.setVersion(1); |
|
|
|
|
|
|
|
|
// models.setVersion(1); |
|
|
models.setGroupId(1); |
|
|
models.setGroupId(1); |
|
|
models.setProcessDefId("pd" + IdUtil.objectId()); |
|
|
models.setProcessDefId("pd" + IdUtil.objectId()); |
|
|
models.setFormName(formName); |
|
|
models.setFormName(formName); |
|
@@ -125,7 +123,7 @@ public class InitProcessTask { |
|
|
models.setSettings("{\"sign\":false,\"admin\":[],\"notify\":{},\"commiter\":[]}"); |
|
|
models.setSettings("{\"sign\":false,\"admin\":[],\"notify\":{},\"commiter\":[]}"); |
|
|
models.setFormItems("[]"); |
|
|
models.setFormItems("[]"); |
|
|
|
|
|
|
|
|
String formId = processModelService.saveProcess(models); |
|
|
|
|
|
|
|
|
String formId = processModelService.insertProcess(models); |
|
|
if(StringUtils.isNotBlank(formId)){ |
|
|
if(StringUtils.isNotBlank(formId)){ |
|
|
//初始的流程在部署表也存一份,用来查询 |
|
|
//初始的流程在部署表也存一份,用来查询 |
|
|
if(StringUtils.isNotBlank(processModelService.deployProcess(formId,null))){ |
|
|
if(StringUtils.isNotBlank(processModelService.deployProcess(formId,null))){ |
|
|