cdl/HTCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级.net8

Browse Source
This commit is contained in:
dell
2024-11-14 09:01:55 +08:00
parent 48e9e27fa0
commit abf72c3d58
86 changed files with 14229 additions and 10612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
HT.Cloud.Service/FlowManage/FlowinstanceService.cs
View File

@ -15,6 +15,7 @@ using HT.Cloud.Domain.InfoManage;
using HT.Cloud.Domain.SystemManage;
using HT.Cloud.Domain.SystemOrganize;
using HT.Cloud.Service.InfoManage;
using static iTextSharp.text.pdf.AcroFields;
namespace HT.Cloud.Service.FlowManage
{
@ -343,15 +344,23 @@ namespace HT.Cloud.Service.FlowManage
wfruntime.MakeTagNode(wfruntime.currentNodeId, tag);
if (tag.Taged == (int)TagState.Ok)
{
flowInstance.F_PreviousId = flowInstance.F_ActivityId;
flowInstance.F_ActivityId = wfruntime.nextNodeId;
flowInstance.F_ActivityType = wfruntime.nextNodeType;
flowInstance.F_ActivityName = wfruntime.nextNode.name;
flowInstance.F_MakerList = (wfruntime.GetNextNodeType() != 4 ? GetNextMakers(wfruntime, request) : "");
flowInstance.F_IsFinish = (wfruntime.nextNodeType == 4 ? 1 : 0);
await AddTransHistory(wfruntime);
}
else
var roleIds = user.RoleId.Split(',');
if (wfruntime.currentNode.setInfo.NodeDesignate == Setinfo.MORE_USER_MANAGER && roleIds.Intersect(wfruntime.currentNode.setInfo.NodeDesignateData.roles).Count() == 0)
{
flowInstance.F_MakerList = GetNodeMarkers(wfruntime.currentNode);
}
else
{
flowInstance.F_PreviousId = flowInstance.F_ActivityId;
flowInstance.F_ActivityId = wfruntime.nextNodeId;
flowInstance.F_ActivityType = wfruntime.nextNodeType;
flowInstance.F_ActivityName = wfruntime.nextNode.name;
flowInstance.F_IsFinish = (wfruntime.nextNodeType == 4 ? 1 : 0);
flowInstance.F_MakerList = (wfruntime.GetNextNodeType() != 4 ? GetNextMakers(wfruntime, request) : "");
}
await AddTransHistory(wfruntime);
}
else
{
flowInstance.F_IsFinish = 3; //表示该节点不同意
}
@ -384,9 +393,9 @@ namespace HT.Cloud.Service.FlowManage
{
if (!string.IsNullOrEmpty(flowInstance.F_DbName))
{
formDic.Add("F_LastModifyUserId", this.currentuser.UserId);
formDic.Add("F_LastModifyTime", DateTime.Now);
formDic.Add("F_LastModifyUserName", this.currentuser.UserName);
formDic.TryAdd("F_LastModifyUserId", this.currentuser.UserId);
formDic.TryAdd("F_LastModifyTime", DateTime.Now);
formDic.TryAdd("F_LastModifyUserName", this.currentuser.UserName);
flowInstance.F_FrmData = formDic.ToJson();
var data = repository.Db.DbMaintenance.GetColumnInfosByTableName(flowInstance.F_DbName, false);
List<string> oldID = formDic.Keys.ToList();//原来数据（原来ID）
@ -629,8 +638,27 @@ namespace HT.Cloud.Service.FlowManage
users = users.Distinct().ToList();
makerList = JsonHelper.ArrayToString(users, makerList);
}
else if (node.setInfo.NodeDesignate == Setinfo.RUNTIME_SPECIAL_ROLE || node.setInfo.NodeDesignate == Setinfo.RUNTIME_SPECIAL_USER)
{
else if (node.setInfo.NodeDesignate == Setinfo.DEPARTMENT_MANAGER)//部门负责人
{
var orgs = node.setInfo.NodeDesignateData.orgs;
if (node.setInfo.NodeDesignateData.currentDepart)
{
var temp = repository.Db.Queryable<UserEntity>().InSingle(flowCreator);
orgs = temp.F_OrganizeId.Split(',');
}
var managers = repository.Db.Queryable<OrganizeEntity>().Where(a => orgs.Contains(a.F_Id) && !string.IsNullOrEmpty(a.F_ManagerId)).Select(a => a.F_ManagerId).ToList();
makerList = JsonHelper.ArrayToString(managers, makerList);
}
else if (node.setInfo.NodeDesignate == Setinfo.USER_MANAGER || node.setInfo.NodeDesignate == Setinfo.MORE_USER_MANAGER)//直属上级、直属上级多级负责人
{
var temp = repository.Db.Queryable<UserEntity>().InSingle(currentuser.UserId);
if (temp != null)
{
makerList = temp.F_ManagerId;
}
}
else if (node.setInfo.NodeDesignate == Setinfo.RUNTIME_SPECIAL_ROLE || node.setInfo.NodeDesignate == Setinfo.RUNTIME_SPECIAL_USER)
{
//如果是运行时选定的用户，则暂不处理。由上个节点审批时选定
}
}
@ -703,11 +731,43 @@ namespace HT.Cloud.Service.FlowManage
users = users.Distinct().ToList();
flowinstance.NextMakerName = string.Join(',', repository.Db.Queryable<UserEntity>().Where(a => users.Contains(a.F_Id)).Select(a => a.F_RealName).ToList());
}
}
if (runtime.currentNode != null && runtime.currentNode.setInfo != null && runtime.currentNodeType != 4)
else if (flowinstance.NextNodeDesignateType == Setinfo.DEPARTMENT_MANAGER)//部门负责人
{
var orgs = runtime.nextNode.setInfo.NodeDesignateData.orgs;
if (runtime.nextNode.setInfo.NodeDesignateData.currentDepart)
{
var userEntity = repository.Db.Queryable<UserEntity>().InSingle(flowinstance.F_CreatorUserId);
orgs = userEntity.F_OrganizeId.Split(',');
}
var departments = repository.Db.Queryable<OrganizeEntity>().Where(a => orgs.Contains(a.F_Id) && !string.IsNullOrEmpty(a.F_ManagerId)).Select(a => a.F_ManagerId).ToList();
var departmentNames = repository.Db.Queryable<UserEntity>().Where(a => departments.Contains(a.F_Id)).Select(a => a.F_RealName).ToList();
flowinstance.NextMakerName = string.Join(',', departmentNames);
}
else if (flowinstance.NextNodeDesignateType == Setinfo.USER_MANAGER || flowinstance.NextNodeDesignateType == Setinfo.MORE_USER_MANAGER)//直属上级、直属上级多级负责人
{
var userEntity = repository.Db.Queryable<UserEntity>().InSingle(currentuser.UserId);
if (userEntity != null)
{
var manager = repository.Db.Queryable<UserEntity>().InSingle(userEntity.F_ManagerId);
flowinstance.NextMakerName = manager?.F_RealName;
}
}
}
if (runtime.currentNode != null && runtime.currentNode.setInfo != null && runtime.currentNodeType != 4)
{
flowinstance.CurrentNodeDesignateType = runtime.currentNode.setInfo.NodeDesignate;
if (flowinstance.F_MakerList != "1" && !string.IsNullOrEmpty(flowinstance.F_MakerList))
var roles = runtime.currentNode.setInfo.NodeDesignateData.roles;
var currentRoles = currentuser.RoleId.Split(",");
if (flowinstance.CurrentNodeDesignateType == Setinfo.MORE_USER_MANAGER && currentRoles.Intersect(roles).Count() == 0)
{
var userEntity = repository.Db.Queryable<UserEntity>().InSingle(currentuser.UserId);
if (userEntity != null)
{
var manager = repository.Db.Queryable<UserEntity>().InSingle(userEntity.F_ManagerId);
flowinstance.NextMakerName = manager?.F_RealName;
}
}
if (flowinstance.F_MakerList != "1" && !string.IsNullOrEmpty(flowinstance.F_MakerList))
{
var temps = flowinstance.F_MakerList.Split(',');
flowinstance.CurrentMakerName = string.Join(',', repository.Db.Queryable<UserEntity>().Where(a => temps.Contains(a.F_Id)).Select(a => a.F_RealName).ToList());
@ -867,10 +927,10 @@ namespace HT.Cloud.Service.FlowManage
if (!string.IsNullOrEmpty(entity.F_DbName))
{
var formDic = entity.F_FrmData.ToObject<Dictionary<string, object>>();
formDic.Add("F_CreatorUserId", this.currentuser.UserId);
formDic.Add("F_CreatorTime", DateTime.Now);
formDic.Add("F_CreatorUserName", this.currentuser.UserName);
formDic.Add("F_Id", Utils.GuId());
formDic.TryAdd("F_CreatorUserId", this.currentuser.UserId);
formDic.TryAdd("F_CreatorTime", DateTime.Now);
formDic.TryAdd("F_CreatorUserName", this.currentuser.UserName);
formDic.TryAdd("F_Id", Utils.GuId());
entity.F_FrmData = formDic.ToJson();
var data = repository.Db.DbMaintenance.GetColumnInfosByTableName(entity.F_DbName, false);
List<string> oldID = formDic.Keys.ToList();//原来数据（原来ID）
@ -1028,9 +1088,9 @@ namespace HT.Cloud.Service.FlowManage
{
if (!string.IsNullOrEmpty(entity.F_DbName))
{
formDic.Add("F_LastModifyUserId", this.currentuser.UserId);
formDic.Add("F_LastModifyTime", DateTime.Now);
formDic.Add("F_LastModifyUserName", this.currentuser.UserName);
formDic.TryAdd("F_LastModifyUserId", this.currentuser.UserId);
formDic.TryAdd("F_LastModifyTime", DateTime.Now);
formDic.TryAdd("F_LastModifyUserName", this.currentuser.UserName);
entity.F_FrmData = formDic.ToJson();
var data = repository.Db.DbMaintenance.GetColumnInfosByTableName(entity.F_DbName, false);
List<string> oldID = formDic.Keys.ToList();//原来数据（原来ID）