Commit 75fb0e4f authored by shyWang's avatar shyWang

PDM前端改造

创建部件签审工作流
parent c2bf30d6
......@@ -1892,10 +1892,11 @@ public class WorkflowUtil implements RemoteAccess {
if ((object instanceof WfAssignedActivity)) {
WfAssignedActivity wfAssignedActivity = (WfAssignedActivity) object;
WfState state = wfAssignedActivity.getState();
if ((state.equals(WfState.OPEN_RUNNING))
/* if ((state.equals(WfState.OPEN_RUNNING))
|| (state.equals(WfState.OPEN_NOT_RUNNING_SUSPENDED_INTERMITTED))) {
results.addAll(WorkflowUtil.getWorkItems(wfAssignedActivity));
}
}*/
results.addAll(WorkflowUtil.getWorkItems(wfAssignedActivity));
}
}
} catch (WTException e) {
......
......@@ -15,16 +15,11 @@ import wt.org.WTOrganization;
import wt.session.SessionContext;
import wt.session.SessionHelper;
import wt.type.ClientTypedUtility;
import wt.util.WTException;
import wt.vc.wip.WorkInProgressHelper;
import wt.vc.wip.Workable;
import java.io.Serializable;
import java.lang.reflect.InvocationTargetException;
import java.rmi.RemoteException;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@JsonTypeInfo(
use = JsonTypeInfo.Id.CLASS,
......@@ -53,7 +48,6 @@ public class DxDocumentVO extends RevisionControlledVO implements Serializable {
private DxContextVO dxContext;
private Long dxContextId;
private Long objOrgId;//TODO
private DxOrganizationVO dxOrganization;
private Long dxOrganizationId;
private String dxOrganizationIdType;
......@@ -63,7 +57,8 @@ public class DxDocumentVO extends RevisionControlledVO implements Serializable {
private String dxDocumentFolderIdType;
private List<ObjFileLinkVO> objFileLinks;
private Long predecessorId; //TODO 对象上一版本
private Long originId;
//TODO link
......@@ -82,7 +77,9 @@ public class DxDocumentVO extends RevisionControlledVO implements Serializable {
SessionHelper.manager.setAdministrator();
WTOrganization organization = wtDoc.getOrganization();
this.setDxOrganization(new DxOrganizationVO(organization));
WTDocument previousVersion = CommonUtil.getPreviousVersionDoc(wtDoc);
this.predecessorId = PersistenceHelper.getObjectIdentifier(previousVersion).getId();
this.originId = predecessorId;
this.setMasterVO(new DxMasterVO(wtDoc));
this.setVersion(new DxVersionVO(wtDoc));
this.setDxContext(new DxContextVO(wtDoc.getContainer()));
......@@ -114,6 +111,22 @@ public class DxDocumentVO extends RevisionControlledVO implements Serializable {
}
public Long getPredecessorId() {
return predecessorId;
}
public void setPredecessorId(Long predecessorId) {
this.predecessorId = predecessorId;
}
public Long getOriginId() {
return originId;
}
public void setOriginId(Long originId) {
this.originId = originId;
}
public DxOrganizationVO getDxOrganization() {
return dxOrganization;
}
......@@ -266,57 +279,4 @@ public class DxDocumentVO extends RevisionControlledVO implements Serializable {
this.subTypeDisplayName = subTypeDisplayName;
}
/*public String getModifyTime() {
return modifyTime;
}
public void setModifyTime(String modifyTime) {
this.modifyTime = modifyTime;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public Map<String, Object> getDynamicAttrs() {
return dynamicAttrs;
}
public void setDynamicAttrs(Map<String, Object> dynamicAttrs) {
this.dynamicAttrs = dynamicAttrs;
}
public Long getId() {
return id;
}
public void setId(Long var1) {
this.id = var1;
}
public String getSubTypeName() {
return this.subTypeName;
}
public void setSubTypeName(String var1) {
this.subTypeName = var1;
}
@Override
public String getSubTypeDisplayName() {
return subTypeDisplayName;
}
@Override
public void setSubTypeDisplayName(String subTypeDisplayName) {
this.subTypeDisplayName = subTypeDisplayName;
}
*/
}
......@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
import com.yonde.basedata.controller.AbstractBaseController;
import com.yonde.basedata.entity.api.ApiResult;
import com.yonde.basedata.search.BaseSearchCondition;
import com.yonde.common.DxPartUtil;
import com.yonde.common.ObjectsUtil;
import com.yonde.part.service.DxPartService;
import com.yonde.part.service.PartService;
......@@ -194,4 +193,17 @@ public class DxPartController extends AbstractBaseController {
}
return ApiResult.ok("转视图成功");
}
@PostMapping("/createSignProcess/{id}")
//@ApiOperation("创建流程实例")
public ApiResult getProcessList(@PathVariable Long id) {
try {
DxPartService.createProcess(id);
} catch (Exception e) {
e.printStackTrace();
return ApiResult.error("501", "流程创建失败!", e);
}
return ApiResult.ok((Object)null, "流程创建成功!");
}
}
......@@ -21,9 +21,7 @@ import wt.part.*;
import wt.session.SessionContext;
import wt.session.SessionHelper;
import wt.util.WTException;
import wt.vc.VersionControlHelper;
import wt.vc.views.ViewHelper;
import wt.vc.config.LatestConfigSpec;
import wt.vc.wip.WorkInProgressHelper;
import java.io.Serializable;
......@@ -592,4 +590,26 @@ public class DxPartService implements RemoteAccess, Serializable {
}
}
public static void createProcess(Long id) throws Exception {
if (!RemoteMethodServer.ServerFlag) {
RemoteMethodServer.getDefault().invoke("createProcess", DxPartService.class.getName(), null,
new Class[]{Long.class},
new Object[]{id});
return;
}
String tempName = "PBOM签审工作流";
SessionContext previous = SessionContext.newContext();
try {
SessionHelper.manager.setAdministrator();
WTPart partById = DxPartUtil.getPartById(id);
if (ObjectsUtil.isNull(partById)) {
throw new WTException("部件不存在!");
}
WorkflowUtil.createProcess(partById, null, partById.getContainerReference(),
tempName + "_" + partById.getNumber(), tempName, null);
} finally {
SessionContext.setContext(previous);
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment