diff --git a/MDM/Controllers/Process/ProcessOperationController.cs b/MDM/Controllers/Process/ProcessOperationController.cs index ea615df..672fa88 100644 --- a/MDM/Controllers/Process/ProcessOperationController.cs +++ b/MDM/Controllers/Process/ProcessOperationController.cs @@ -148,9 +148,9 @@ namespace MDM.Controllers.Process //TODO 获取并筛选流程 [HttpGet("get_flow")] - public IActionResult GetFlow(string flow_code) + public IActionResult GetFlow(string flow_type_code) { - var response = _ProcessOperationService.GetFlow(flow_code); + var response = _ProcessOperationService.GetFlow(flow_type_code); return SUCCESS(response); } //TODO 工序绑定流程 废弃 diff --git a/MDM/Models/Process/ProcessFlowList.cs b/MDM/Models/Process/ProcessFlowList.cs index 71ed8c5..6877a98 100644 --- a/MDM/Models/Process/ProcessFlowList.cs +++ b/MDM/Models/Process/ProcessFlowList.cs @@ -17,12 +17,12 @@ namespace MDM.Models.Process public int id { get; set; } - [SugarColumn(ColumnName = "flow_code")] - public string FlowCode { get; set; } + [SugarColumn(ColumnName = "flow_type_code")] + public string FlowTypeCode { get; set; } - [SugarColumn(ColumnName = "flow_name")] - public string FlowName { get; set; } + [SugarColumn(ColumnName = "flow_type_name")] + public string FlowTypeName { get; set; } [SugarColumn(ColumnName = "created_time")] diff --git a/MDM/Services/Process/IService/IProcessOperationService.cs b/MDM/Services/Process/IService/IProcessOperationService.cs index 915fd9b..589299c 100644 --- a/MDM/Services/Process/IService/IProcessOperationService.cs +++ b/MDM/Services/Process/IService/IProcessOperationService.cs @@ -29,7 +29,7 @@ namespace MDM.Services.IProcessService List QueryProcessOprerationTransitionDict(ProcessOprerationTransitionDictQueryDto parm); - List GetFlow(string flow_code); + List GetFlow(string flow_type_code); int BindFlow(ProcessOperationBindFlowDto parm); diff --git a/MDM/Services/Process/ProcessOperationService.cs b/MDM/Services/Process/ProcessOperationService.cs index 3d19415..4da04a7 100644 --- a/MDM/Services/Process/ProcessOperationService.cs +++ b/MDM/Services/Process/ProcessOperationService.cs @@ -202,10 +202,10 @@ namespace MDM.Services.Process return response; } - public List GetFlow(string flow_code) + public List GetFlow(string flow_type_code) { var response = Context.Queryable() - .WhereIF(!string.IsNullOrEmpty(flow_code), m => m.FlowCode.Contains(flow_code)) + .WhereIF(!string.IsNullOrEmpty(flow_type_code), m => m.FlowTypeCode.Contains(flow_type_code)) .ToList(); return response; }