去掉flowdetail

This commit is contained in:
yubaolee
2018-03-15 10:32:36 +08:00
parent 19f778acfa
commit e353c75fd7
16 changed files with 1077 additions and 1648 deletions

View File

@@ -312,12 +312,11 @@ namespace OpenAuth.App
try
{
FlowScheme FlowScheme = UnitWork.FindSingle<FlowScheme>(u => u.Id == schemeInfoId);
FlowSchemeDetail FlowSchemeDetail = UnitWork.FindSingle<FlowSchemeDetail>(u =>
u.SchemeId == schemeInfoId && u.SchemeVersion == FlowScheme.SchemeVersion);
WF_RuntimeInitModel wfRuntimeInitModel = new WF_RuntimeInitModel()
{
schemeContent = FlowSchemeDetail.SchemeContent,
schemeContent = FlowScheme.SchemeContent,
currentNodeId = "",
frmData = frmData,
processId = processId
@@ -352,14 +351,13 @@ namespace OpenAuth.App
#region ʵ<EFBFBD><EFBFBD>ģ<EFBFBD><EFBFBD>
var data = new
{
SchemeContent = FlowSchemeDetail.SchemeContent,
SchemeContent = FlowScheme.SchemeContent,
frmData = frmData
};
FlowInstanceScheme FlowInstanceScheme = new FlowInstanceScheme
{
SchemeId = schemeInfoId,
SchemeVersion = FlowScheme.SchemeVersion,
ProcessType = 1,//1<><31>ʽ<EFBFBD><CABD>0<EFBFBD>ݸ<EFBFBD>
SchemeContent = data.ToJson().ToString()
};
#endregion

View File

@@ -12,75 +12,14 @@ namespace OpenAuth.App
/// </summary>
public class FlowSchemeApp :BaseApp<FlowScheme>
{
/// <summary>
/// 保存流程
/// </summary>
/// <param name="entity">表单模板实体类</param>
/// <param name="keyValue">主键</param>
/// <returns></returns>
public int SaveForm(string keyValue, FlowScheme entity, FlowSchemeDetail modelentity)
{
if (string.IsNullOrEmpty(keyValue))
{
entity.SchemeVersion = DateTime.Now.ToString("yyyyMMddHHmmssffff");
UnitWork.Add(entity);
modelentity.SchemeId = entity.Id;
modelentity.SchemeVersion = entity.SchemeVersion;
UnitWork.Add(modelentity);
}
else
{
string schemeid = (string)(keyValue);
FlowSchemeDetail modelentityold =
UnitWork.FindSingle<FlowSchemeDetail>(u => u.SchemeVersion == entity.SchemeVersion
&& u.SchemeId == schemeid);
if (modelentityold.SchemeContent != modelentity.SchemeContent)
{
if (modelentity.SchemeVersion == "cg")
{
modelentityold.SchemeContent = modelentity.SchemeContent;
modelentityold.SchemeVersion = DateTime.Now.ToString("yyyyMMddHHmmssffff");
modelentity.SchemeVersion = modelentityold.SchemeVersion;
UnitWork.Update(modelentityold);
}
else
{
modelentity.SchemeId = schemeid;
modelentity.SchemeVersion = DateTime.Now.ToString("yyyyMMddHHmmssffff");
UnitWork.Add(modelentity);
}
}
else
{
modelentity.SchemeVersion = modelentityold.SchemeVersion;
}
entity.Id = keyValue;
entity.SchemeVersion = modelentity.SchemeVersion;
UnitWork.Update(entity);
}
UnitWork.Save();
return 1;
}
public void RemoveForm(string[] keyValue)
{
UnitWork.Delete<FlowScheme>(u =>keyValue.Contains(u.Id));
UnitWork.Delete<FlowSchemeDetail>(u =>keyValue.Contains(u.SchemeId));
}
public FlowScheme GetEntity(string keyValue)
{
return UnitWork.FindSingle<FlowScheme>(u => u.Id == keyValue);
}
public FlowSchemeDetail GetSchemeEntity(string schemeinfoId, string schemeinfoSchemeVersion)
{
return UnitWork.FindSingle<FlowSchemeDetail>(u =>
u.SchemeId == schemeinfoId && u.SchemeVersion == schemeinfoSchemeVersion);
}
public void UpdateState(string keyValue, int state)
{