wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.4.6

Browse Source
This commit is contained in:
潘飞
2023-05-31 10:19:05 +08:00
parent 1b65a7a9e5
commit 9c621c75cd
238 changed files with 9905 additions and 4034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
workflow/Tnb.WorkFlow/Manager/FlowTemplateUtil.cs
View File

@@ -1,4 +1,5 @@
using System.Text;
using JNPF.Common.Const;
using JNPF.Common.Core.Manager;
using JNPF.Common.Extension;
using JNPF.Common.Models.WorkFlow;
@@ -97,8 +98,11 @@ public class FlowTemplateUtil
}
else
{
string formId = item.propertyJson.formId;
flowTaskNodeEntity.FormId = formId.IsNotEmptyOrNull() ? formId : defaultFormId;
if (!"timer".Equals(item.type))
{
string formId = item.propertyJson.formId;
flowTaskNodeEntity.FormId = formId.IsNotEmptyOrNull() ? formId : defaultFormId;
}
}
flowTaskNodeEntityList.Add(flowTaskNodeEntity);
}
@@ -416,10 +420,10 @@ public class FlowTemplateUtil
if (flowNodeWhereModel.fieldValueType.ParseToInt() == 2)
{
//数组类型控件
var jnpfKeyList = new List<string>() { "cascader", "comSelect", "address", "currOrganize" };
var jnpfKeyList = new List<string>() { JnpfKeyConst.CASCADER, JnpfKeyConst.COMSELECT, JnpfKeyConst.ADDRESS, JnpfKeyConst.CURRORGANIZE };
if (jnpfKeyList.Contains(flowNodeWhereModel.jnpfKey) && flowNodeWhereModel.fieldValue.Count > 0)
{
if (flowNodeWhereModel.jnpfKey.Equals("currOrganize"))
if (flowNodeWhereModel.jnpfKey.Equals(JnpfKeyConst.CURRORGANIZE))
{
value = flowNodeWhereModel.fieldValue[flowNodeWhereModel.fieldValue.Count - 1];
}
@@ -438,7 +442,7 @@ public class FlowTemplateUtil
value = _userManager.UserId;
}
if ("time".Equals(flowNodeWhereModel.jnpfKey))
if (JnpfKeyConst.TIME.Equals(flowNodeWhereModel.jnpfKey))
{
formValue = formValue.Replace(":", string.Empty);
value = value.Replace(":", string.Empty);
@@ -446,7 +450,7 @@ public class FlowTemplateUtil
}
else
{
value = GetConditionValue(flowNodeWhereModel.fieldValueType.ParseToInt(), formData, flowNodeWhereModel.fieldValue, taskId, flowNodeWhereModel.jnpfKey);
value = GetConditionValue(flowNodeWhereModel.fieldValueType.ParseToInt(), formData, flowNodeWhereModel.fieldValue, taskId, flowNodeWhereModel.fieldValueJnpfKey);
}
if (symbol.Equals("=") || symbol.Equals("<>"))
@@ -527,8 +531,8 @@ public class FlowTemplateUtil
if (formData[field].IsNotEmptyOrNull())
{
conditionValue = formData[field].ToString();
SysWidgetFormValue(taskId, jnpfKey, ref conditionValue);
}
SysWidgetFormValue(taskId, jnpfKey, ref conditionValue);
}
}
}
@@ -581,34 +585,34 @@ public class FlowTemplateUtil
var creatorUser = _usersService.GetInfoByUserId(taskEntity.CreatorUserId);
switch (jnpfKey)
{
case "createUser":
case JnpfKeyConst.CREATEUSER:
formValue = taskEntity.CreatorUserId;
break;
case "modifyUser":
case JnpfKeyConst.MODIFYUSER:
if (taskEntity.LastModifyUserId.IsNotEmptyOrNull())
{
formValue = _userManager.UserId;
}
break;
case "currOrganize":
case JnpfKeyConst.CURRORGANIZE:
if (creatorUser.OrganizeId.IsNotEmptyOrNull())
{
formValue = creatorUser.OrganizeId;
}
break;
case "createTime":
case JnpfKeyConst.CREATETIME:
formValue = ((DateTime)taskEntity.CreatorTime).ParseToUnixTime().ToString();
break;
case "modifyTime":
case JnpfKeyConst.MODIFYTIME:
if (taskEntity.LastModifyTime.IsNotEmptyOrNull())
{
formValue = DateTime.Now.ParseToUnixTime().ToString();
}
break;
case "currPosition":
case JnpfKeyConst.CURRPOSITION:
if (creatorUser.PositionId.IsNotEmptyOrNull())
{
formValue = creatorUser.PositionId;
@@ -621,26 +625,26 @@ public class FlowTemplateUtil
{
switch (jnpfKey)
{
case "createUser":
case JnpfKeyConst.CREATEUSER:
formValue = _userManager.UserId;
break;
case "modifyUser":
case JnpfKeyConst.MODIFYUSER:
formValue = " ";
break;
case "currOrganize":
case JnpfKeyConst.CURRORGANIZE:
if (_userManager.User.OrganizeId.IsNotEmptyOrNull())
{
formValue = _userManager.User.OrganizeId;
}
break;
case "createTime":
case JnpfKeyConst.CREATETIME:
formValue = DateTime.Now.ParseToUnixTime().ToString();
break;
case "modifyTime":
case JnpfKeyConst.MODIFYTIME:
formValue = "0";
break;
case "currPosition":
case JnpfKeyConst.CURRPOSITION:
if (_userManager.User.PositionId.IsNotEmptyOrNull())
{
formValue = _userManager.User.PositionId;