From 2f0d61d3859953f78559e725e52b01c8982539ad Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Fri, 7 Jul 2023 14:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=8D=E5=8A=A1=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceWorkFlowReleaseInfo.cs | 60 ++++++++++++++++++- .../ServiceWorkFlowBaseService.cs | 49 +++++++++++++-- 2 files changed, 101 insertions(+), 8 deletions(-) diff --git a/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowReleaseInfo.cs b/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowReleaseInfo.cs index d7ef6c3a..c5a7e178 100644 --- a/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowReleaseInfo.cs +++ b/Myshipping.Application/Entity/TrackingSystem/ServiceWorkFlowReleaseInfo.cs @@ -1,12 +1,68 @@ -using System; +using Myshipping.Core; +using SqlSugar; +using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; namespace Myshipping.Application.Entity { - internal class ServiceWorkFlowReleaseInfo + [Tenant(CommonConst.MasterDb)] + [SugarTable("service_workflow_release")] + [Description("服务流程发布表")] + public class ServiceWorkFlowReleaseInfo { + /// + /// 主键 + /// + [SugarColumn(ColumnDescription = "主键", IsPrimaryKey = true)] + public string PK_ID { get; set; } + + /// + /// 服务流程主键 + /// + public string SERVICE_WORKFLOW_ID { get; set; } + + /// + /// 发布版本 + /// + public string RELEASE_VERSION { get; set; } + + /// + /// 发布日期 + /// + public DateTime PUBLISH_DATE { get; set; } + + /// + /// 发布人 + /// + public string PUBLISH_ER { get; set; } + + /// + /// 发布人名称 + /// + public string PUBLISH_NAME { get; set; } + + /// + /// 是否作废 1-已作废 0-未作废(默认未作废) + /// + public int IS_DEL { get; set; } + + /// + /// 上一版本主键 + /// + public string LAST_PK_ID { get; set; } + + /// + /// 累计计数 + /// + public int TOTAL_NUM { get; set; } + + /// + /// 报文MD5 + /// + public string MSG_MD5 { get; set; } } } diff --git a/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs b/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs index 72ac61d7..0d3d1d8b 100644 --- a/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs +++ b/Myshipping.Application/Service/TrackingSystem/ServiceWorkFlowBaseService.cs @@ -33,8 +33,7 @@ namespace Myshipping.Application private readonly SqlSugarRepository _serviceWorkFlowProjectRelationRepository; private readonly SqlSugarRepository _serviceWorkFlowActivitiesRelationRepository; private readonly SqlSugarRepository _serviceWorkFlowActivitiesSubRelationRepository; - - + private readonly SqlSugarRepository _serviceWorkFlowReleaseInfoRepository; private readonly ILogger _logger; public ServiceWorkFlowBaseService(SqlSugarRepository serviceWorkFlowBaseRepository, @@ -942,10 +941,10 @@ namespace Myshipping.Application List rltList = new List(); - //list.ForEach(pr => { - - // rltList.Add(InnerExcuteServiceWF(pr, OperateTypeEnum.Delete).GetAwaiter().GetResult()); - //}); + list.ForEach(pr => + { + rltList.Add(InnerPublishReleasServiceWF(pr).GetAwaiter().GetResult()); + }); result.succ = true; result.msg = rltList.FirstOrDefault().msg; @@ -982,6 +981,44 @@ namespace Myshipping.Application return result; } + #region 发布服务流程内部方法 + /// + /// 发布服务流程内部方法 + /// + /// 服务流程详情 + /// 返回回执 + private async Task InnerPublishReleasServiceWF(ServiceWorkFlowBaseInfo model) + { + TaskManageOrderResultDto result = new TaskManageOrderResultDto(); + + result.bno = model?.SERVICE_WORKFLOW_NAME; + + try + { + if (model == null) + throw Oops.Oh($"服务流程获取失败,服务流程信息不存在或已作废", typeof(InvalidOperationException)); + + + + + model.UpdatedTime = DateTime.Now; + model.UpdatedUserId = UserManager.UserId; + model.UpdatedUserName = UserManager.Name; + + result.succ = true; + result.msg = "执行成功"; + + } + catch (Exception ex) + { + result.succ = false; + result.msg = $"执行启用异常,原因:{ex.Message}"; + } + + return result; + } + #endregion + #region 获取展示服务流程时间轴列表 /// /// 获取展示服务流程时间轴列表