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

2
workflow/Tnb.WorkFlow.Entitys/Dto/FlowBefore/FlowBeforeInfoOutput.cs
View File

@@ -31,7 +31,7 @@ public class FlowBeforeInfoOutput
/// <summary>
/// 流程任务节点.
/// </summary>
public List<FlowTaskNodeModel>? flowTaskNodeList { get; set; }=new List<FlowTaskNodeModel>(){ };
public List<FlowTaskNodeModel>? flowTaskNodeList { get; set; } = new List<FlowTaskNodeModel>() { };
/// <summary>
/// 流程任务经办.

2
workflow/Tnb.WorkFlow.Entitys/Dto/FlowMonitor/FlowMonitorListOutput.cs
View File

@@ -78,7 +78,7 @@ public class FlowMonitorListOutput
/// <summary>
/// 用户名称.
/// </summary>
public string? userName{ get; set; }
public string? userName { get; set; }
/// <summary>
/// 描述.

3
workflow/Tnb.WorkFlow.Entitys/Dto/WorkFlowForm/LeaveApply/LeaveApplyInput.cs
View File

@@ -1,5 +1,4 @@
using JNPF.Common.Models.WorkFlow;
using JNPF.DependencyInjection;
using JNPF.DependencyInjection;
namespace JNPF.WorkFlow.Entitys.Dto.WorkFlowForm.LeaveApply;

4
workflow/Tnb.WorkFlow.Entitys/Entity/WorkFlowForm/SalesOrderEntryEntity.cs
View File

@@ -4,11 +4,11 @@ using SqlSugar;
namespace JNPF.WorkFlow.Entitys
{
    /// <summary>
/// <summary>
/// 订单明细
/// 版 本：V3.2
/// 版 权：拓通智联科技有限公司（http://www.tuotong-tech.com）
/// 日 期：2018-07-23 .
/// 日 期：2018-07-23 .
/// </summary>
[SugarTable("WFORM_SALESORDERENTRY")]
[Tenant(ClaimConst.TENANTID)]

1
workflow/Tnb.WorkFlow.Entitys/Mapper/Mapper.cs
View File

@@ -1,7 +1,6 @@
using JNPF.Common.Extension;
using JNPF.WorkFlow.Entitys.Dto.FlowBefore;
using JNPF.WorkFlow.Entitys.Dto.FlowEngine;
using JNPF.WorkFlow.Entitys.Dto.FlowLaunch;
using JNPF.WorkFlow.Entitys.Entity;
using JNPF.WorkFlow.Entitys.Model;
using JNPF.WorkFlow.Entitys.Model.Properties;

1
workflow/Tnb.WorkFlow.Entitys/Model/Conifg/FuncConfig.cs
View File

@@ -1,6 +1,5 @@
using JNPF.Common.Dtos.Message;
using JNPF.DependencyInjection;
using JNPF.WorkFlow.Entitys.Model.Item;
namespace JNPF.WorkFlow.Entitys.Model.Conifg;

1
workflow/Tnb.WorkFlow.Entitys/Model/Conifg/MsgConfig.cs
View File

@@ -1,6 +1,5 @@
using JNPF.Common.Dtos.Message;
using JNPF.DependencyInjection;
using JNPF.WorkFlow.Entitys.Model.Item;
namespace JNPF.WorkFlow.Entitys.Model.Conifg;

1
workflow/Tnb.WorkFlow.Entitys/Tnb.WorkFlow.Entitys.csproj
View File

@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)\common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

7
workflow/Tnb.WorkFlow.Interfaces/Service/IFlowTaskService.cs
View File

@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JNPF.Common.Models.WorkFlow;
using JNPF.Common.Models.WorkFlow;
namespace JNPF.WorkFlow.Interfaces.Service
{

3
workflow/Tnb.WorkFlow.Interfaces/Service/IFlowTemplateService.cs
View File

@@ -1,5 +1,4 @@
using JNPF.WorkFlow.Entitys.Dto.FlowEngine;
using JNPF.WorkFlow.Entitys.Dto.FlowTemplate;
using JNPF.WorkFlow.Entitys.Dto.FlowTemplate;
namespace JNPF.WorkFlow.Interfaces.Service;

4
workflow/Tnb.WorkFlow.Interfaces/Service/ILeaveApplyService.cs
View File

@@ -1,6 +1,4 @@
using System.Threading.Tasks;
namespace JNPF.WorkFlow.Interfaces.Service;
namespace JNPF.WorkFlow.Interfaces.Service;
/// <summary>
/// 请假申请

1
workflow/Tnb.WorkFlow.Interfaces/Tnb.WorkFlow.Interfaces.csproj
View File

@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)\common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

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);

9
workflow/Tnb.WorkFlow/Repository/FlowTaskRepository.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager;
using System.Linq.Expressions;
using JNPF.Common.Core.Manager;
using JNPF.Common.Extension;
using JNPF.Common.Filter;
using JNPF.Common.Models.WorkFlow;
@@ -21,7 +22,6 @@ using JNPF.WorkFlow.Entitys.Model.Properties;
using JNPF.WorkFlow.Interfaces.Repository;
using Mapster;
using SqlSugar;
using System.Linq.Expressions;
namespace JNPF.WorkFlow.Repository;
@@ -512,7 +512,8 @@ public class FlowTaskRepository : IFlowTaskRepository, ITransient
var output = new List<object>();
foreach (var item in list.GroupBy(x => x.TemplateId))
{
output.Add(new {
output.Add(new
{
id = item.Key,
fullName = string.Format("{0}({1})", item.FirstOrDefault().FlowName, item.Count()),
count = item.Count()
@@ -1390,7 +1391,7 @@ public class FlowTaskRepository : IFlowTaskRepository, ITransient
userName = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == a.HandleId).Select(u => SqlFunc.MergeString(u.RealName, "/", u.Account)),
operatorId = SqlFunc.Subqueryable<UserEntity>().Where(u => u.Id == a.OperatorId).Select(u => SqlFunc.MergeString(u.RealName, "/", u.Account)),
// creatorTime = SqlFunc.IsNullOrEmpty(b.CreatorTime) ? a.HandleTime : b.CreatorTime,
creatorTime = b.CreatorTime==null ? a.HandleTime : b.CreatorTime, //modifyby zhoukeda 20230704
creatorTime = b.CreatorTime == null ? a.HandleTime : b.CreatorTime, //modifyby zhoukeda 20230704
fileList = a.FileList
}).ToListAsync();
}

6
workflow/Tnb.WorkFlow/Service/FlowBeforeService.cs
View File

@@ -194,7 +194,7 @@ public class FlowBeforeService : IDynamicApiController, ITransient
var flowJson = _flowTaskRepository.GetFlowTemplateJsonInfo(x => x.Id == item.FlowId && x.DeleteMark == null);
if (flowJson.IsNotEmptyOrNull())
{
output.Add(new { id = flowJson.Id, fullName =string.Format("{0}(v{1})", flowJson.FullName, flowJson.Version), flowTemplateJson= flowJson.FlowTemplateJson });
output.Add(new { id = flowJson.Id, fullName = string.Format("{0}(v{1})", flowJson.FullName, flowJson.Version), flowTemplateJson = flowJson.FlowTemplateJson });
}
}
return output.Distinct();
@@ -304,7 +304,7 @@ public class FlowBeforeService : IDynamicApiController, ITransient
[HttpGet("Suspend/{taskId}")]
public async Task<dynamic> Suspend(string taskId)
{
return await _flowTaskRepository.AnyFlowTask(x => x.ParentId == taskId && x.IsAsync == 1 && x.DeleteMark == null);
return await _flowTaskRepository.AnyFlowTask(x => x.ParentId == taskId && x.IsAsync == 1 && x.DeleteMark == null);
}
#endregion
@@ -491,7 +491,7 @@ public class FlowBeforeService : IDynamicApiController, ITransient
/// <param name="flowHandleModel">审批参数.</param>
/// <returns></returns>
[HttpPost("Suspend/{taskId}")]
public async Task Suspend(string taskId,[FromBody] FlowHandleModel flowHandleModel)
public async Task Suspend(string taskId, [FromBody] FlowHandleModel flowHandleModel)
{
var flowTaskParamter = await _flowTaskRepository.GetTaskParamterByTaskId(taskId, flowHandleModel);
await _flowTaskManager.Suspend(flowTaskParamter);

2
workflow/Tnb.WorkFlow/Service/FlowDelegateService.cs
View File

@@ -182,7 +182,7 @@ public class FlowDelegateService : IDynamicApiController, ITransient
public async Task<dynamic> GetFlowList([FromQuery] string flowId)
{
var userList = await _repository.AsSugarClient()
.Queryable<FlowTemplateJsonEntity, FlowDelegateEntity, UserEntity>((a, b, c) => new JoinQueryInfos(JoinType.Left, b.FlowId.Contains(a.TemplateId)||b.FlowName=="全部流程", JoinType.Left, b.UserId == c.Id))
.Queryable<FlowTemplateJsonEntity, FlowDelegateEntity, UserEntity>((a, b, c) => new JoinQueryInfos(JoinType.Left, b.FlowId.Contains(a.TemplateId) || b.FlowName == "全部流程", JoinType.Left, b.UserId == c.Id))
.Where((a, b, c) => a.Id == flowId && b.Type == "0" && b.ToUserId == _userManager.UserId && b.EndTime > DateTime.Now && b.StartTime < DateTime.Now).Select((a, b, c) => new UserListOutput
{
id = c.Id,

4
workflow/Tnb.WorkFlow/Service/FlowEngineService.cs
View File

@@ -147,7 +147,7 @@ public class FlowEngineService : IFlowEngineService, IDynamicApiController, ITra
data = data.FindAll(o => o.fullName.Contains(input.keyword) || o.enCode.Contains(input.keyword));
var pageList = new SqlSugarPagedList<FlowEngineListOutput>()
{
list = data.Skip((input.currentPage - 1)* input.pageSize).Take(input.pageSize).ToList(),
list = data.Skip((input.currentPage - 1) * input.pageSize).Take(input.pageSize).ToList(),
pagination = new Pagination()
{
CurrentPage = input.currentPage,
@@ -619,7 +619,7 @@ public class FlowEngineService : IFlowEngineService, IDynamicApiController, ITra
sortCode = a.SortCode,
type = c.Type,
visibleType = c.VisibleType,
parentId = SqlFunc.Subqueryable<DictionaryDataEntity>().Where(d => d.EnCode == c.Category && d.DictionaryTypeId== "507f4f5df86b47588138f321e0b0dac7").Select(d => d.Id),
parentId = SqlFunc.Subqueryable<DictionaryDataEntity>().Where(d => d.EnCode == c.Category && d.DictionaryTypeId == "507f4f5df86b47588138f321e0b0dac7").Select(d => d.Id),
}).MergeTable().OrderBy(a => a.sortCode).OrderBy(a => a.creatorTime, OrderByType.Desc)
.OrderBy(a => a.lastModifyTime, OrderByType.Desc).ToListAsync();
}

3
workflow/Tnb.WorkFlow/Service/FlowFormService.cs
View File

@@ -7,18 +7,15 @@ using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.FriendlyException;
using JNPF.Systems.Entitys.Dto.ModuleForm;
using JNPF.Systems.Entitys.Model.DataBase;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev.Engine.Core;
using JNPF.VisualDev.Engine.Model;
using JNPF.VisualDev.Interfaces;
using JNPF.WorkFlow.Entitys.Dto.FlowEngine;
using JNPF.WorkFlow.Entitys.Dto.FlowForm;
using JNPF.WorkFlow.Entitys.Entity;
using JNPF.WorkFlow.Interfaces.Repository;
using Mapster;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;

2
workflow/Tnb.WorkFlow/Service/FlowLaunchService.cs
View File

@@ -80,7 +80,7 @@ public class FlowLaunchService : IDynamicApiController, ITransient
if (await _flowTaskRepository.AnyFlowTask(x => flowTaskParamter.flowTaskEntity.Id == x.ParentId && x.DeleteMark == null && x.Suspend == 1)) throw Oops.Oh(ErrorCode.WF0046);
if (flowTaskParamter.flowTaskEntity.Status != 1)
throw Oops.Oh(ErrorCode.WF0011);
if (flowTaskParamter.flowTaskEntity.ParentId.IsNotEmptyOrNull()&& !flowTaskParamter.flowTaskEntity.ParentId.Equals("0"))
if (flowTaskParamter.flowTaskEntity.ParentId.IsNotEmptyOrNull() && !flowTaskParamter.flowTaskEntity.ParentId.Equals("0"))
throw Oops.Oh(ErrorCode.WF0015);
await _flowTaskManager.Revoke(flowTaskParamter);
}

1
workflow/Tnb.WorkFlow/Service/FlowTaskService.cs
View File

@@ -6,7 +6,6 @@ using JNPF.FriendlyException;
using JNPF.WorkFlow.Entitys.Model;
using JNPF.WorkFlow.Interfaces.Manager;
using JNPF.WorkFlow.Interfaces.Service;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
namespace JNPF.WorkFlow.Service;

2
workflow/Tnb.WorkFlow/Service/FlowTemplateService.cs
View File

@@ -11,9 +11,7 @@ using JNPF.FriendlyException;
using JNPF.LinqBuilder;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.Permission;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev.Entitys;
using JNPF.WorkFlow.Entitys.Dto.FlowTemplate;
using JNPF.WorkFlow.Entitys.Entity;
using JNPF.WorkFlow.Entitys.Model;

1
workflow/Tnb.WorkFlow/Tnb.WorkFlow.csproj
View File

@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(SolutionDir)\common.props" />
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>

1
workflow/Tnb.WorkFlow/WorkFlowForm/LeaveApplyService.cs
View File

@@ -5,7 +5,6 @@ using JNPF.Common.Core.Manager.Files;
using JNPF.Common.Extension;
using JNPF.Common.Manager;
using JNPF.Common.Models;
using JNPF.Common.Models.WorkFlow;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;

1
workflow/Tnb.WorkFlow/WorkFlowForm/SalesOrderService.cs
View File

@@ -5,7 +5,6 @@ using JNPF.Common.Core.Manager.Files;
using JNPF.Common.Extension;
using JNPF.Common.Manager;
using JNPF.Common.Models;
using JNPF.Common.Models.WorkFlow;
using JNPF.Common.Security;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;