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:
周科达
2024-08-08 11:46:12 +08:00
parent 06c870c5a1
commit 18dac9b6b2
4 changed files with 144 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpSpotInsRecordListOutput.cs
View File

@@ -3,6 +3,7 @@ namespace Tnb.EquipMgr.Entities.Dto
public class EqpSpotInsRecordListOutput
{
public string id { get; set; }
public string f_flowid { get; set; }
public string equip_id { get; set; }
public string equip_id_id { get; set; }
public string status { get; set; }

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

@@ -53,6 +53,7 @@ namespace Tnb.EquipMgr
Dictionary<string, object>? queryJson = (input == null || string.IsNullOrEmpty(input.queryJson)) ? new Dictionary<string, object>() : input.queryJson.ToObject<Dictionary<string, object>>();
string equioInfo = queryJson.ContainsKey("query_info") ? (queryJson["query_info"].ToString() ?? "") : "";
string status = queryJson.ContainsKey("status") ? (queryJson["status"].ToString() ?? "") : "";
string equipTypeId = queryJson.ContainsKey("f_flowid") ? (queryJson["f_flowid"].ToString() ?? "") : "";
DateTime? start_time = queryJson.ContainsKey("start_time") ? queryJson["start_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["start_time"]) : null;
DateTime? end_time = queryJson.ContainsKey("end_time") ? queryJson["end_time"].ToString() == "" ? null : Convert.ToDateTime(queryJson["end_time"]) : null;
string now = DateTime.Now.ToString("yyyy-MM-dd");
@@ -66,22 +67,25 @@ namespace Tnb.EquipMgr
input.sidx = "a." + input.sidx;
}
SqlSugarPagedList<EqpSpotInsRecordListOutput> list = await db.Queryable<EqpSpotInsRecordH, EqpEquipment, UserEntity, UserEntity,UserEntity>((a, b, c, d,e) => new object[]
SqlSugarPagedList<EqpSpotInsRecordListOutput> list = await db.Queryable<EqpSpotInsRecordH, EqpEquipment, UserEntity, UserEntity,UserEntity,EqpEquipType>((a, b, c, d,e,f) => new object[]
{
JoinType.Left, a.equip_id == b.id,
JoinType.Left, a.spot_record_user_id == c.Id,
JoinType.Left, a.repeat_user_id == d.Id,
JoinType.Left, a.modify_id == e.Id,
JoinType.Left, b.equip_type_id == f.id
})
.WhereIF(!string.IsNullOrEmpty(status), (a, b, c) => a.status == status)
.WhereIF(!string.IsNullOrEmpty(equioInfo), (a, b, c) => b.code.Contains(equioInfo) || b.name.Contains(equioInfo))
.WhereIF(!string.IsNullOrEmpty(equipTypeId), (a, b, c) => b.equip_type_id==equipTypeId)
.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)
.Where(a => a.create_time.Value.ToString("yyyy-MM-dd") == now)
.OrderBy($"{input.sidx} {input.sort}")
.Select((a, b, c, d,e) => new EqpSpotInsRecordListOutput
.Select((a, b, c, d,e,f) => new EqpSpotInsRecordListOutput
{
id = a.id,
f_flowid = f.name,
equip_id = b.code + "/" + b.name,
equip_id_id = a.equip_id,
status = a.status,