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

首末巡检自动自检报废 设备相关报表

Browse Source
This commit is contained in:
周科达
2024-09-02 15:50:23 +08:00
parent 8abd058478
commit 58dbda9430
13 changed files with 421 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpFaultReportOutput.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EqpFaultReportOutput
{
public string id { get; set; }
public string fault_name { get; set; }
public string fault_type_name { get; set; }
public string equip_type_name { get; set; }
public string month { get; set; }
public int count { get; set; }
public decimal? repair_take_time { get; set; }
}
}

13
EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpMaintainReportOutput.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EqpMaintainReportOutput
{
public string id { get; set; }
public string code { get; set; }
public string name { get; set; }
public string workshop_name { get; set; }
public string month { get; set; }
public int execute_num { get; set; }
public int unqualified_num { get; set; }
}
}

13
EquipMgr/Tnb.EquipMgr.Entities/Dto/EqpRepairReportOutput.cs Normal file
View File

@@ -0,0 +1,13 @@
namespace Tnb.EquipMgr.Entities.Dto
{
public class EqpRepairReportOutput
{
public string id { get; set; }
public string code { get; set; }
public string name { get; set; }
public string workshop_name { get; set; }
public string month { get; set; }
public int fault_num { get; set; }
public int repair_completed_num { get; set; }
}
}

81
EquipMgr/Tnb.EquipMgr/EqpFaultReportService.cs Normal file
View File

@@ -0,0 +1,81 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
using Tnb.BasicData;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr
{
/// <summary>
/// 设备故障统计报表
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModuleId)]
public class EqpFaultReportService: IOverideVisualDevService,IDynamicApiController, ITransient
{
private const string ModuleId = "27897732990485";
private readonly ISqlSugarRepository<EqpEquipment> _repository;
private readonly IVisualDevService _visualDevService;
private readonly IRunService _runService;
private readonly IUserManager _userManager;
private readonly IBillRullService _billRuleService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public EqpFaultReportService(ISqlSugarRepository<EqpEquipment> repository,
IRunService runService,
IVisualDevService visualDevService,
IBillRullService billRuleService,
IUserManager userManager)
{
_repository = repository;
_visualDevService = visualDevService;
_runService = runService;
_userManager = userManager;
_billRuleService = billRuleService;
OverideFuncs.GetListAsync = GetList;
}
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
ISqlSugarClient db = _repository.AsSugarClient();
Dictionary<string, object>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, object>>(input.queryJson) : new Dictionary<string, object>();
string month = queryJson != null && queryJson.ContainsKey("month") ? queryJson["month"].ToString() : "";
string name = queryJson != null && queryJson.ContainsKey("name") ? queryJson["name"].ToString() : "";
string userId = _userManager.UserId;
month = !string.IsNullOrEmpty(month) ? month : DateTime.Now.ToString("yyyy-MM");
SqlSugarPagedList<EqpFaultReportOutput> result = await db.Queryable<EqpEquipType>()
.LeftJoin<EqpFault>((a,b)=>1==1)
.LeftJoin<DictionaryTypeEntity>((a,b,c)=>c.EnCode==DictConst.FaultType)
.LeftJoin<DictionaryDataEntity>((a,b,c,d)=>c.Id==d.DictionaryTypeId && b.fault_type_id==d.EnCode)
.WhereIF(!string.IsNullOrEmpty("name"), (a, b) => b.fault_name.Contains(name))
.OrderBy((a,b,c,d)=>a.name)
.OrderBy((a,b,c,d)=>b.fault_name)
.OrderBy((a,b,c,d)=>d.FullName)
.Select((a, b,c,d) => new EqpFaultReportOutput
{
id = a.id,
month = month,
fault_name = b.fault_name,
fault_type_name = d.FullName,
equip_type_name = a.name,
count = SqlFunc.Subqueryable<EqpEquipment>().InnerJoin<EqpRepairApply>((x,y)=>x.id==y.equip_id).Where((x,y)=>x.equip_type_id==a.id && y.create_time.Value.ToString("yyyy-MM")==month).Count(),
repair_take_time = SqlFunc.Subqueryable<EqpEquipment>().InnerJoin<EqpRepairApply>((x,y)=>x.id==y.equip_id).Where((x,y)=>x.equip_type_id==a.id && y.create_time.Value.ToString("yyyy-MM")==month).Sum((x,y)=>SqlFunc.IsNull(y.repair_take_time,0))
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<EqpFaultReportOutput>.SqlSugarPageResult(result);
}
}
}

76
EquipMgr/Tnb.EquipMgr/EqpMaintainReportService.cs Normal file
View File

@@ -0,0 +1,76 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr
{
/// <summary>
/// 设备保养统计报表
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModuleId)]
public class EqpMaintainReportService: IOverideVisualDevService,IDynamicApiController, ITransient
{
private const string ModuleId = "27897660420117";
private readonly ISqlSugarRepository<EqpEquipment> _repository;
private readonly IVisualDevService _visualDevService;
private readonly IRunService _runService;
private readonly IUserManager _userManager;
private readonly IBillRullService _billRuleService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public EqpMaintainReportService(ISqlSugarRepository<EqpEquipment> repository,
IRunService runService,
IVisualDevService visualDevService,
IBillRullService billRuleService,
IUserManager userManager)
{
_repository = repository;
_visualDevService = visualDevService;
_runService = runService;
_userManager = userManager;
_billRuleService = billRuleService;
OverideFuncs.GetListAsync = GetList;
}
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
ISqlSugarClient db = _repository.AsSugarClient();
Dictionary<string, object>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, object>>(input.queryJson) : new Dictionary<string, object>();
string month = queryJson != null && queryJson.ContainsKey("month") ? queryJson["month"].ToString() : "";
string name = queryJson != null && queryJson.ContainsKey("name") ? queryJson["name"].ToString() : "";
string userId = _userManager.UserId;
month = !string.IsNullOrEmpty(month) ? month : DateTime.Now.ToString("yyyy-MM");
SqlSugarPagedList<EqpMaintainReportOutput> result = await db.Queryable<EqpEquipment>()
.LeftJoin<OrganizeEntity>((a,b)=>a.use_department_id==b.Id)
.WhereIF(!string.IsNullOrEmpty("name"), (a, b) => a.name.Contains(name))
.OrderBy((a,b)=>a.code)
.Select((a, b) => new EqpMaintainReportOutput
{
id = a.id,
code = a.code,
name = a.name,
workshop_name = b.FullName,
month = month,
execute_num = SqlFunc.Subqueryable<EqpMaintainRecordH>().Where(x=>x.equip_id==a.id && x.status!="1" && x.create_time.Value.ToString("yyyy-MM")==month).Count(),
unqualified_num = SqlFunc.Subqueryable<EqpMaintainRecordH>().Where(x=>x.equip_id==a.id && (x.repeat_result=="2" || (x.result=="2" && x.repeat_result==null)) && x.create_time.Value.ToString("yyyy-MM")==month).Count(),
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<EqpMaintainReportOutput>.SqlSugarPageResult(result);
}
}
}

76
EquipMgr/Tnb.EquipMgr/EqpRepairReportService.cs Normal file
View File

@@ -0,0 +1,76 @@
using JNPF.Common.Core.Manager;
using JNPF.Common.Filter;
using JNPF.DependencyInjection;
using JNPF.DynamicApiController;
using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev;
using JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
using JNPF.VisualDev.Interfaces;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
using Tnb.EquipMgr.Entities;
using Tnb.EquipMgr.Entities.Dto;
namespace Tnb.EquipMgr
{
/// <summary>
/// 设备维修统计报表
/// </summary>
[ApiDescriptionSettings(Tag = ModuleConsts.Tag, Area = ModuleConsts.Area, Order = 700)]
[Route("api/[area]/[controller]/[action]")]
[OverideVisualDev(ModuleId)]
public class EqpRepairReportService: IOverideVisualDevService,IDynamicApiController, ITransient
{
private const string ModuleId = "27897802470421";
private readonly ISqlSugarRepository<EqpEquipment> _repository;
private readonly IVisualDevService _visualDevService;
private readonly IRunService _runService;
private readonly IUserManager _userManager;
private readonly IBillRullService _billRuleService;
public OverideVisualDevFunc OverideFuncs { get; } = new OverideVisualDevFunc();
public EqpRepairReportService(ISqlSugarRepository<EqpEquipment> repository,
IRunService runService,
IVisualDevService visualDevService,
IBillRullService billRuleService,
IUserManager userManager)
{
_repository = repository;
_visualDevService = visualDevService;
_runService = runService;
_userManager = userManager;
_billRuleService = billRuleService;
OverideFuncs.GetListAsync = GetList;
}
private async Task<dynamic> GetList(VisualDevModelListQueryInput input)
{
ISqlSugarClient db = _repository.AsSugarClient();
Dictionary<string, object>? queryJson = !string.IsNullOrEmpty(input.queryJson) ? JsonConvert.DeserializeObject<Dictionary<string, object>>(input.queryJson) : new Dictionary<string, object>();
string month = queryJson != null && queryJson.ContainsKey("month") ? queryJson["month"].ToString() : "";
string name = queryJson != null && queryJson.ContainsKey("name") ? queryJson["name"].ToString() : "";
string userId = _userManager.UserId;
month = !string.IsNullOrEmpty(month) ? month : DateTime.Now.ToString("yyyy-MM");
SqlSugarPagedList<EqpRepairReportOutput> result = await db.Queryable<EqpEquipment>()
.LeftJoin<OrganizeEntity>((a,b)=>a.use_department_id==b.Id)
.WhereIF(!string.IsNullOrEmpty("name"), (a, b) => a.name.Contains(name))
.OrderBy((a,b)=>a.code)
.Select((a, b) => new EqpRepairReportOutput
{
id = a.id,
code = a.code,
name = a.name,
workshop_name = b.FullName,
month = month,
fault_num = SqlFunc.Subqueryable<EqpRepairApply>().Where(x=>x.equip_id==a.id && x.status!=null && x.create_time.Value.ToString("yyyy-MM")==month).Count(),
repair_completed_num = SqlFunc.Subqueryable<EqpRepairApply>().Where(x=>x.equip_id==a.id && x.status=="6" && x.create_time.Value.ToString("yyyy-MM")==month).Count(),
}).ToPagedListAsync(input.currentPage, input.pageSize);
return PageResult<EqpRepairReportOutput>.SqlSugarPageResult(result);
}
}
}