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

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/Tnb.WorkFlow/Manager/FlowTaskMsgUtil.cs
View File

@@ -61,7 +61,7 @@ public class FlowTaskMsgUtil
//默认消息
if (msgConfig.on == 3)
{
var crUser =await _usersService.GetUserName(flowTaskParamter.flowTaskEntity.CreatorUserId, false);
var crUser = await _usersService.GetUserName(flowTaskParamter.flowTaskEntity.CreatorUserId, false);
var flowName = _flowTaskRepository.GetFlowTemplateJsonInfo(x => x.Id == flowTaskParamter.flowTaskEntity.FlowId).FullName;
await _sendMessageService.SendMessageDefult(enCode, users, crUser, flowName, bodyDic);
}
@@ -164,7 +164,8 @@ public class FlowTaskMsgUtil
{
foreach (var item in flowTaskOperatorEntities)
{
var value = new {
var value = new
{
enCode = flowTaskParamter.flowTaskEntity.FlowCode,
flowId = flowTaskParamter.flowTaskEntity.FlowId,
status = type == 1 ? 0 : 1,
@@ -184,7 +185,8 @@ public class FlowTaskMsgUtil
}
else
{
var value = new {
var value = new
{
enCode = flowTaskParamter.flowTaskEntity.FlowCode,
flowId = flowTaskParamter.flowTaskEntity.FlowId,
status = type == 1 ? 0 : 1,

8
workflow/Tnb.WorkFlow/Manager/FlowTaskOtherUtil.cs
View File

@@ -364,7 +364,7 @@ public class FlowTaskOtherUtil
{
try
{
var value=jobj[timeOutConfig.formField].ToString();
var value = jobj[timeOutConfig.formField].ToString();
if (!DateTime.TryParse(value, out dt))
{
dt = jobj[timeOutConfig.formField].ParseToLong().TimeStampToDateTime();
@@ -417,12 +417,12 @@ public class FlowTaskOtherUtil
{
mapRule = GetMapRule(approversPro.assignList, flowTaskParamter.flowTaskNodeEntity.NodeCode);
}
var data =await _runService.GetFlowFormDataDetails(thisFormId, flowTaskParamter.flowTaskEntity.Id);
var data = await _runService.GetFlowFormDataDetails(thisFormId, flowTaskParamter.flowTaskEntity.Id);
if (!data.ContainsKey("flowId"))//modifyby zhoukeda 20230704
{
if (((Dictionary<string, object>)flowTaskParamter.formData).TryGetValue("flowId",out var value))
if (((Dictionary<string, object>)flowTaskParamter.formData).TryGetValue("flowId", out var value))
{
data.Add("flowId",value);
data.Add("flowId", value);
}
}
var nextFormData = await _runService.SaveDataToDataByFId(thisFormId, nextFormId, mapRule, data);