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

Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

Browse Source
This commit is contained in:
DEVICE8\12494
2023-04-06 14:11:00 +08:00
parent 98278bad9e 645a8beef7
commit f3c8f1cd06
5 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common.props
View File

@@ -4,9 +4,9 @@
<NoWarn>$(NoWarn);CS1591;CA1307;CS8625;CS8600;CS8601;CS8604;CS8618;</NoWarn> <NoWarn>$(NoWarn);CS1591;CA1307;CS8625;CS8600;CS8601;CS8604;CS8618;</NoWarn>
</PropertyGroup> </PropertyGroup>
<!--<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebugType>none</DebugType> <DebugType>none</DebugType>
<DebugSymbols>false</DebugSymbols> <DebugSymbols>false</DebugSymbols>
</PropertyGroup>--> </PropertyGroup>
</Project> </Project>

3
system/Tnb.Systems/System/AdvancedQueryService.cs
View File

@@ -14,9 +14,6 @@ namespace JNPF.Systems;
/// <summary> /// <summary>
/// 高级查询方案管理 /// 高级查询方案管理
/// 版 本：V3.4
/// 版 权：拓通智联科技有限公司（http://www.tuotong-tech.com）
/// 日 期：2022-06-07.
/// </summary> /// </summary>
[ApiDescriptionSettings(Tag = "System", Name = "AdvancedQuery", Order = 202)] [ApiDescriptionSettings(Tag = "System", Name = "AdvancedQuery", Order = 202)]
[Route("api/system/[controller]")] [Route("api/system/[controller]")]

13
visualdev/Tnb.VisualDev.Engine/Core/FormDataParsing.cs
View File

@@ -318,18 +318,7 @@ public class FormDataParsing : ITransient
else conversionData = data; else conversionData = data;
break; break;
default: default:
//modify by ly on 20230327 conversionData = data.ToString().ToObject<List<object>>();
var temp = data.ToString();
Regex re = new Regex("(?<=\").*?(?=\")", RegexOptions.None);
if (!re.IsMatch(temp))
{
temp = $"\"{data}\"";
}
if (!temp.StartsWith("[") && !temp.EndsWith("]"))
{
temp = $"[{temp}]";
}
conversionData = temp.ToObject<List<object>>();
break; break;
} }
} }

5
visualdev/Tnb.VisualDev.Interfaces/IRunService.cs
View File

@@ -147,9 +147,4 @@ public interface IRunService
/// <param name="formData">表单数据.</param> /// <param name="formData">表单数据.</param>
/// <param name="isSubFlow">是否子流程.</param> /// <param name="isSubFlow">是否子流程.</param>
Task<Dictionary<string, object>> SaveDataToDataByFId(string oldFId, string newFId, List<Dictionary<string, string>> mapRule, Dictionary<string, object> formData, bool isSubFlow = false); Task<Dictionary<string, object>> SaveDataToDataByFId(string oldFId, string newFId, List<Dictionary<string, string>> mapRule, Dictionary<string, object> formData, bool isSubFlow = false);
//Task<List<string>> GetUpdateSqlByTemplate(TemplateParsingBase templateInfo, VisualDevModelDataUpInput visualdevModelDataUpForm, string id);
//Task<Dictionary<string, List<Dictionary<string, object>>>> GetCreateSqlByTemplate(TemplateParsingBase templateInfo, VisualDevModelDataCrInput dataInput, string mainId);
} }

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

@@ -166,11 +166,11 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
/// </summary> /// </summary>
/// <param name="input">请求参数.</param> /// <param name="input">请求参数.</param>
/// <returns></returns> /// <returns></returns>
[HttpGet("FlowJsonList/{id}")] [HttpGet("{id}/FlowJsonList")]
public async Task<dynamic> GetFlowJsonList(string id, [FromQuery] FlowTemplateListQuery input) public async Task<dynamic> GetFlowJsonList(string id, [FromQuery] FlowTemplateListQuery input)
{ {
var whereLambda = LinqExpression.And<FlowTemplateJsonEntity>(); var whereLambda = LinqExpression.And<FlowTemplateJsonEntity>();
whereLambda = whereLambda.And(x => x.DeleteMark == null && x.Id == id); whereLambda = whereLambda.And(x => x.DeleteMark == null && x.TemplateId == id);
var start = new DateTime(); var start = new DateTime();
var end = new DateTime(); var end = new DateTime();
if (input.endTime != null && input.startTime != null) if (input.endTime != null && input.startTime != null)
@@ -617,7 +617,7 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
await _repository.AsSugarClient().Insertable(visibleList).CallEntityMethod(m => m.Creator()).ExecuteCommandAsync(); await _repository.AsSugarClient().Insertable(visibleList).CallEntityMethod(m => m.Creator()).ExecuteCommandAsync();
#region 功能流程则要回写到对应的表单表中 #region 功能流程则要回写到对应的表单表中
GetFormIdList(flowTemplateJson.ToObject<List<FlowTemplateModel>>().First().flowTemplateJson, formIdList); GetFormIdList(flowTemplateJson.ToObject<FlowTemplateJsonModel>(), formIdList);
foreach (var item in formIdList) foreach (var item in formIdList)
{ {
var formRelationEntity = new FlowFormRelationEntity var formRelationEntity = new FlowFormRelationEntity
@@ -700,7 +700,7 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
} }
if (visibleList.Count > 0) if (visibleList.Count > 0)
await _repository.AsSugarClient().Insertable(visibleList).CallEntityMethod(m => m.Creator()).ExecuteCommandAsync(); await _repository.AsSugarClient().Insertable(visibleList).CallEntityMethod(m => m.Creator()).ExecuteCommandAsync();
GetFormIdList(flowTemplateJson.ToObject<List<FlowTemplateModel>>().First().flowTemplateJson, formIdList); GetFormIdList(flowTemplateJson.ToObject<FlowTemplateJsonModel>(), formIdList);
foreach (var item in formIdList) foreach (var item in formIdList)
{ {
var formRelationEntity = new FlowFormRelationEntity var formRelationEntity = new FlowFormRelationEntity
@@ -739,10 +739,8 @@ public class FlowTemplateService : IFlowTemplateService, IDynamicApiController,
var output = new List<FlowEngineVisibleEntity>(); var output = new List<FlowEngineVisibleEntity>();
if (josnStr.IsNotEmptyOrNull()) if (josnStr.IsNotEmptyOrNull())
{ {
// 发起节点属性. // 发起节点属性.
var flow = josnStr.ToObject<List<FlowTemplateModel>>(); var pro = josnStr.ToObject<FlowTemplateJsonModel>().properties.ToObject<StartProperties>();
var pro = flow.First().flowTemplateJson.properties.ToObject<StartProperties>();
//var pro = josnStr.ToObject<FlowTemplateJsonModel>().properties.ToObject<StartProperties>();
if (pro.initiator.Any()) if (pro.initiator.Any())
{ {
var list = pro.initiator.Select(x => new FlowEngineVisibleEntity() { OperatorId = x, OperatorType = "user" }).ToList(); var list = pro.initiator.Select(x => new FlowEngineVisibleEntity() { OperatorId = x, OperatorType = "user" }).ToList();