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

bug

Browse Source
This commit is contained in:
周科达
2023-10-27 15:41:22 +08:00
parent 79045a61de
commit d54ebf3cba
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
EquipMgr/Tnb.EquipMgr/EqpRepairApplyService.cs
View File

@@ -321,9 +321,13 @@ namespace Tnb.EquipMgr
if (string.IsNullOrEmpty(input.sidx)) if (string.IsNullOrEmpty(input.sidx))
{ {
input.sidx = "create_time"; input.sidx = "a.create_time";
input.sort = "desc"; input.sort = "desc";
} }
else
{
input.sidx = "a." + input.sidx;
}
var db = _repository.AsSugarClient(); var db = _repository.AsSugarClient();
var result = await db.Queryable<EqpRepairApply>() var result = await db.Queryable<EqpRepairApply>()
@@ -355,7 +359,8 @@ namespace Tnb.EquipMgr
repairer_id_id = c.Id, repairer_id_id = c.Id,
remark = a.remark, remark = a.remark,
status = f.FullName status = f.FullName
}).ToListAsync(); })
.ToListAsync();
return result; return result;
} }

7
EquipMgr/Tnb.EquipMgr/EquMaintainRecordService.cs
View File

@@ -61,8 +61,11 @@ namespace Tnb.EquipMgr
if (string.IsNullOrEmpty(input.sidx)) if (string.IsNullOrEmpty(input.sidx))
{ {
input.sidx = "create_time"; input.sidx = "a.create_time";
input.sort = "desc"; input.sort = "desc";
}else
{
input.sidx = "a." + input.sidx;
} }
var list = await db.Queryable<EqpMaintainRecordH, EqpEquipment, UserEntity,UserEntity>((a, b, c,d) => new object[] var list = await db.Queryable<EqpMaintainRecordH, EqpEquipment, UserEntity,UserEntity>((a, b, c,d) => new object[]
@@ -75,6 +78,7 @@ namespace Tnb.EquipMgr
.WhereIF(!string.IsNullOrEmpty(equioInfo),(a,b,c)=>b.code.Contains(equioInfo)|| b.name.Contains(equioInfo)) .WhereIF(!string.IsNullOrEmpty(equioInfo),(a,b,c)=>b.code.Contains(equioInfo)|| b.name.Contains(equioInfo))
.WhereIF(status=="3" && start_time!=null,a=>a.execute_time>=start_time) .WhereIF(status=="3" && start_time!=null,a=>a.execute_time>=start_time)
.WhereIF(status=="3" && end_time!=null,a=>a.execute_time<=end_time) .WhereIF(status=="3" && end_time!=null,a=>a.execute_time<=end_time)
.OrderBy($"{input.sidx} {input.sort}")
.Select((a, b, c,d) => new EqpMaintainRecordListOutput .Select((a, b, c,d) => new EqpMaintainRecordListOutput
{ {
id = a.id, id = a.id,
@@ -94,7 +98,6 @@ namespace Tnb.EquipMgr
repeat_remark = a.repeat_remark, repeat_remark = a.repeat_remark,
date_last_execute_time = SqlFunc.Subqueryable<EqpMaintainRecordH>().Where(x=>a.equip_id==x.equip_id && a.execute_time!=null).OrderByDesc(x=>x.execute_time).Select(x=>x.execute_time) date_last_execute_time = SqlFunc.Subqueryable<EqpMaintainRecordH>().Where(x=>a.equip_id==x.equip_id && a.execute_time!=null).OrderByDesc(x=>x.execute_time).Select(x=>x.execute_time)
}) })
.OrderBy($"{input.sidx} {input.sort}")
.Mapper(a => .Mapper(a =>
{ {
a.status = a.status=="1" ? "待执行" : a.status=="2" ? "待复核" : "已完成"; a.status = a.status=="1" ? "待执行" : a.status=="2" ? "待复核" : "已完成";

8
EquipMgr/Tnb.EquipMgr/EquSpotInsRecordService.cs
View File

@@ -62,9 +62,13 @@ namespace Tnb.EquipMgr
if (string.IsNullOrEmpty(input.sidx)) if (string.IsNullOrEmpty(input.sidx))
{ {
input.sidx = "create_time"; input.sidx = "a.create_time";
input.sort = "desc"; input.sort = "desc";
} }
else
{
input.sidx = "a." + input.sidx;
}
var list = await db.Queryable<EqpSpotInsRecordH, EqpEquipment, UserEntity,UserEntity>((a, b, c,d) => new object[] var list = await db.Queryable<EqpSpotInsRecordH, EqpEquipment, UserEntity,UserEntity>((a, b, c,d) => new object[]
{ {
@@ -76,6 +80,7 @@ namespace Tnb.EquipMgr
.WhereIF(!string.IsNullOrEmpty(equioInfo),(a,b,c)=>b.code.Contains(equioInfo)|| b.name.Contains(equioInfo)) .WhereIF(!string.IsNullOrEmpty(equioInfo),(a,b,c)=>b.code.Contains(equioInfo)|| b.name.Contains(equioInfo))
.WhereIF(status=="3" && start_time!=null,a=>a.spot_record_date_time>=start_time) .WhereIF(status=="3" && start_time!=null,a=>a.spot_record_date_time>=start_time)
.WhereIF(status=="3" && end_time!=null,a=>a.spot_record_date_time<=end_time) .WhereIF(status=="3" && end_time!=null,a=>a.spot_record_date_time<=end_time)
.OrderBy($"{input.sidx} {input.sort}")
.Select((a, b, c,d) => new EqpSpotInsRecordListOutput .Select((a, b, c,d) => new EqpSpotInsRecordListOutput
{ {
id = a.id, id = a.id,
@@ -92,7 +97,6 @@ namespace Tnb.EquipMgr
repeat_user_id = d.RealName, repeat_user_id = d.RealName,
repeat_user_id_id = a.repeat_user_id, repeat_user_id_id = a.repeat_user_id,
}) })
.OrderBy($"{input.sidx} {input.sort}")
.Mapper(a => .Mapper(a =>
{ {
a.status = a.status=="1" ? "待执行" : a.status=="2" ? "待复核" : "已完成"; a.status = a.status=="1" ? "待执行" : a.status=="2" ? "待复核" : "已完成";