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-05-11 10:21:46 +08:00
parent 7bfa4eed8c a12824d040
commit d9189e13aa
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BasicData/Tnb.BasicData.Entities/Dto/BasRoute/VaildRouteOutput.cs
View File

@@ -8,8 +8,8 @@ namespace Tnb.BasicData.Entities.Dto
public string name { get; set; } public string name { get; set; }
public DateTime? start_time { get; set; } public string start_time { get; set; }
public DateTime? end_time { get; set; } public string end_time { get; set; }
} }
} }

3
BasicData/Tnb.BasicData.Interfaces/IBasRouteService.cs
View File

@@ -1,3 +1,4 @@
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Filter; using JNPF.Common.Filter;
namespace Tnb.BasicData.Interfaces namespace Tnb.BasicData.Interfaces
@@ -20,6 +21,6 @@ namespace Tnb.BasicData.Interfaces
/// 获取有效的已发布的工艺路线 /// 获取有效的已发布的工艺路线
/// </summary> /// </summary>
/// <param name="parameters"></param> /// <param name="parameters"></param>
public Task<dynamic> GetValidRouteList(PageInputBase pageInputBase); public Task<dynamic> GetValidRouteList(VisualDevDataFieldDataListInput pageInput);
} }
} }

15
BasicData/Tnb.BasicData/BasRouteService.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Core.Manager; using JNPF.Common.Core.Manager;
using JNPF.Common.Dtos.VisualDev;
using JNPF.Common.Enums; using JNPF.Common.Enums;
using JNPF.Common.Filter; using JNPF.Common.Filter;
using JNPF.Common.Security; using JNPF.Common.Security;
@@ -83,23 +84,23 @@ namespace Tnb.BasicData
/// </summary> /// </summary>
/// <param name="parameters"></param> /// <param name="parameters"></param>
[HttpPost] [HttpPost]
public async Task<dynamic> GetValidRouteList([FromBody]PageInputBase pageInputBase) public async Task<dynamic> GetValidRouteList([FromBody]VisualDevDataFieldDataListInput pageInput)
{ {
var db = _repository.AsSugarClient(); var db = _repository.AsSugarClient();
var result = await db.Queryable<BasRouteH>() var result = await db.Queryable<BasRouteH>()
.Where(x => x.status == "1" && ((x.start_time != null && x.start_time.Value <= DateTime.Now && x.end_time != null && x.end_time.Value>=DateTime.Now) .Where(x => x.status == "1"
&& ((x.start_time != null && x.start_time.Value <= DateTime.Now && x.end_time != null && x.end_time.Value>=DateTime.Now)
|| (x.start_time==null && x.end_time>=DateTime.Now) || (x.start_time==null && x.end_time>=DateTime.Now)
|| (x.end_time==null && x.start_time<=DateTime.Now) || (x.end_time==null && x.start_time<=DateTime.Now)
|| (x.start_time == null && x.end_time == null) || (x.start_time == null && x.end_time == null)
)) )).Select(x=>new VaildRouteOutput()
.Select(x=>new VaildRouteOutput()
{ {
id = x.id, id = x.id,
code = x.code, code = x.code,
name = x.name, name = x.name,
start_time = x.start_time, start_time = x.start_time.Value.ToString("yyyy-MM-dd"),
end_time = x.end_time, end_time = x.end_time.Value.ToString("yyyy-MM-dd"),
}).ToPagedListAsync(pageInputBase.currentPage, pageInputBase.pageSize); }).ToPagedListAsync(pageInput.currentPage, pageInput.pageSize);
return PageResult<VaildRouteOutput>.SqlSugarPageResult(result); return PageResult<VaildRouteOutput>.SqlSugarPageResult(result);
} }
} }