wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

addtaskinfo

Browse Source
This commit is contained in:
何美荣 2025-11-22 10:59:58 +08:00
parent f572730cec
commit a653c78cfa
1 changed files with 111 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

203
APT.MicroApi/APT.PP.WebApi/Controllers/Api/BIAnalysisController.cs
View File

@ -3146,6 +3146,9 @@ namespace APT.PP.WebApi.Controllers.Api.PP
}); });
} }
//折线图 //折线图
var deleteIds = new List<Guid>();
var deletemouIds = new List<Guid>();
var deletemonthIds = new List<Guid>();
List<T_BI_DEPARTMENT_MONTH_RUN> monthRuns = new List<T_BI_DEPARTMENT_MONTH_RUN>(); List<T_BI_DEPARTMENT_MONTH_RUN> monthRuns = new List<T_BI_DEPARTMENT_MONTH_RUN>();
var ksDepartId = departmentInfos.FirstOrDefault(t => t.NAME == "矿山部")?.ID; var ksDepartId = departmentInfos.FirstOrDefault(t => t.NAME == "矿山部")?.ID;
var xkDepartId = departmentInfos.FirstOrDefault(t => t.NAME == "选矿部")?.ID; var xkDepartId = departmentInfos.FirstOrDefault(t => t.NAME == "选矿部")?.ID;
@ -3154,108 +3157,112 @@ namespace APT.PP.WebApi.Controllers.Api.PP
ksDepartId = departmentInfos.FirstOrDefault(t => t.NAME == "选矿一部")?.ID; ksDepartId = departmentInfos.FirstOrDefault(t => t.NAME == "选矿一部")?.ID;
xkDepartId = departmentInfos.FirstOrDefault(t => t.NAME == "选矿二部")?.ID; xkDepartId = departmentInfos.FirstOrDefault(t => t.NAME == "选矿二部")?.ID;
} }
var currentMonth = DateTime.Now.Month; //获取当月 if (ksDepartId != null && xkDepartId != null)
var currentDay = DateTime.Now.Day; //...........天
for (DateTime i = year; i <= dt; i = i.AddMonths(1)) //for (int i = 1; i <= 12; i++)
{ {
//var monthStart = DateTime.Now.AddMonths(i - currentMonth).AddDays(1 - currentDay); var currentMonth = DateTime.Now.Month; //获取当月
//var monthEnd = DateTime.Now.AddMonths(i - currentMonth + 1).AddDays(1 - currentDay - 1); var currentDay = DateTime.Now.Day; //...........天
var monthStart = Convert.ToDateTime(i.Year + "-" + i.Month + "-01 00:00:00"); for (DateTime i = year; i <= dt; i = i.AddMonths(1)) //for (int i = 1; i <= 12; i++)
var monthEnd = Convert.ToDateTime(monthStart.AddMonths(1).AddDays(-1).ToString().Replace("0:00:00", "23:59:59"));
if (i.Date == year.Date)
{ {
monthStart = year; //var monthStart = DateTime.Now.AddMonths(i - currentMonth).AddDays(1 - currentDay);
} //var monthEnd = DateTime.Now.AddMonths(i - currentMonth + 1).AddDays(1 - currentDay - 1);
if (i.Date == dt.Date) var monthStart = Convert.ToDateTime(i.Year + "-" + i.Month + "-01 00:00:00");
{ var monthEnd = Convert.ToDateTime(monthStart.AddMonths(1).AddDays(-1).ToString().Replace("0:00:00", "23:59:59"));
monthEnd = dt; if (i.Date == year.Date)
} {
var ksJantask = taskYear.Where(t => t.CREATE_DATE >= monthStart && t.CREATE_DATE <= monthEnd && t.DEPT_DEPARTMENT_ID == ksDepartId).ToList(); monthStart = year;
if (ksJantask.Any()) }
{ if (i.Date == dt.Date)
T_BI_DEPARTMENT_MONTH_RUN run = new T_BI_DEPARTMENT_MONTH_RUN(); {
run.DEPARTMENT_ID = ksDepartId.Value; monthEnd = dt;
run.ORG_ID = pageFilter.OrgId; }
var depart = departmentInfos.FirstOrDefault(m => m.ID == ksDepartId.Value); var ksJantask = taskYear.Where(t => t.CREATE_DATE >= monthStart && t.CREATE_DATE <= monthEnd && t.DEPT_DEPARTMENT_ID == ksDepartId).ToList();
run.DEPARTMENT_NAME = depart?.NAME; if (ksJantask.Any())
run.MONTH = monthStart; {
run.MONTHStr = monthStart.Year + "年" + monthStart.Month + "月"; T_BI_DEPARTMENT_MONTH_RUN run = new T_BI_DEPARTMENT_MONTH_RUN();
var total = ksJantask.Count(); run.DEPARTMENT_ID = ksDepartId.Value;
var finish = ksJantask.Where(t => t.NOTICE_STATUS == 1).Count(); run.ORG_ID = pageFilter.OrgId;
var overFinish = ksJantask.Where(t => t.NOTICE_STATUS == 2).Count(); var depart = departmentInfos.FirstOrDefault(m => m.ID == ksDepartId.Value);
var temp = total == 0 ? 0 : (double)(finish + overFinish) / total * 100; run.DEPARTMENT_NAME = depart?.NAME;
run.FINISH_RATE = temp.ToString("0"); run.MONTH = monthStart;
var temp2 = total == 0 ? 0 : (double)finish / total * 100; run.MONTHStr = monthStart.Year + "年" + monthStart.Month + "月";
run.NORMAL_FINISH_RATE = temp2.ToString("0"); var total = ksJantask.Count();
monthRuns.Add(run); var finish = ksJantask.Where(t => t.NOTICE_STATUS == 1).Count();
} var overFinish = ksJantask.Where(t => t.NOTICE_STATUS == 2).Count();
else var temp = total == 0 ? 0 : (double)(finish + overFinish) / total * 100;
{ run.FINISH_RATE = temp.ToString("0");
T_BI_DEPARTMENT_MONTH_RUN run = new T_BI_DEPARTMENT_MONTH_RUN(); var temp2 = total == 0 ? 0 : (double)finish / total * 100;
run.DEPARTMENT_ID = ksDepartId.Value; run.NORMAL_FINISH_RATE = temp2.ToString("0");
run.ORG_ID = pageFilter.OrgId; monthRuns.Add(run);
var depart = departmentInfos.FirstOrDefault(m => m.ID == ksDepartId.Value); }
run.DEPARTMENT_NAME = depart?.NAME; else
run.MONTH = monthStart; {
run.MONTHStr = monthStart.Year + "年" + monthStart.Month + "月"; T_BI_DEPARTMENT_MONTH_RUN run = new T_BI_DEPARTMENT_MONTH_RUN();
run.FINISH_RATE = "0"; run.DEPARTMENT_ID = ksDepartId.Value;
run.NORMAL_FINISH_RATE = "0"; run.ORG_ID = pageFilter.OrgId;
//if (i == 12) var depart = departmentInfos.FirstOrDefault(m => m.ID == ksDepartId.Value);
//{ run.DEPARTMENT_NAME = depart?.NAME;
// var lastInfo = monthRuns.FirstOrDefault(t => t.DEPARTMENT_ID == ksDepartId.Value && t.MONTHStr == monthStart.Year + "年" + monthStart.AddMonths(-1).Month + "月"); run.MONTH = monthStart;
// if (lastInfo != null) run.MONTHStr = monthStart.Year + "年" + monthStart.Month + "月";
// { run.FINISH_RATE = "0";
// run.FINISH_RATE = lastInfo.FINISH_RATE; run.NORMAL_FINISH_RATE = "0";
// run.NORMAL_FINISH_RATE = lastInfo.NORMAL_FINISH_RATE; //if (i == 12)
// } //{
//} // var lastInfo = monthRuns.FirstOrDefault(t => t.DEPARTMENT_ID == ksDepartId.Value && t.MONTHStr == monthStart.Year + "年" + monthStart.AddMonths(-1).Month + "月");
monthRuns.Add(run); // if (lastInfo != null)
} // {
var xkJantask = taskYear.Where(t => t.CREATE_DATE >= monthStart && t.CREATE_DATE <= monthEnd && t.DEPT_DEPARTMENT_ID == xkDepartId).ToList(); // run.FINISH_RATE = lastInfo.FINISH_RATE;
if (xkJantask.Any()) // run.NORMAL_FINISH_RATE = lastInfo.NORMAL_FINISH_RATE;
{ // }
T_BI_DEPARTMENT_MONTH_RUN run = new T_BI_DEPARTMENT_MONTH_RUN(); //}
run.DEPARTMENT_ID = xkDepartId.Value; monthRuns.Add(run);
run.ORG_ID = pageFilter.OrgId; }
var depart = departmentInfos.FirstOrDefault(m => m.ID == xkDepartId.Value); var xkJantask = taskYear.Where(t => t.CREATE_DATE >= monthStart && t.CREATE_DATE <= monthEnd && t.DEPT_DEPARTMENT_ID == xkDepartId).ToList();
run.DEPARTMENT_NAME = depart?.NAME; if (xkJantask.Any())
run.MONTH = monthStart; {
run.MONTHStr = monthStart.Year + "年" + monthStart.Month + "月"; T_BI_DEPARTMENT_MONTH_RUN run = new T_BI_DEPARTMENT_MONTH_RUN();
var total = xkJantask.Count(); run.DEPARTMENT_ID = xkDepartId.Value;
var finish = xkJantask.Where(t => t.NOTICE_STATUS == 1).Count(); run.ORG_ID = pageFilter.OrgId;
var overFinish = xkJantask.Where(t => t.NOTICE_STATUS == 2).Count(); var depart = departmentInfos.FirstOrDefault(m => m.ID == xkDepartId.Value);
var temp = total == 0 ? 0 : (double)(finish + overFinish) / total * 100; run.DEPARTMENT_NAME = depart?.NAME;
run.FINISH_RATE = temp.ToString("0"); run.MONTH = monthStart;
var temp2 = total == 0 ? 0 : (double)finish / total * 100; run.MONTHStr = monthStart.Year + "年" + monthStart.Month + "月";
run.NORMAL_FINISH_RATE = temp2.ToString("0"); var total = xkJantask.Count();
monthRuns.Add(run); var finish = xkJantask.Where(t => t.NOTICE_STATUS == 1).Count();
} var overFinish = xkJantask.Where(t => t.NOTICE_STATUS == 2).Count();
else var temp = total == 0 ? 0 : (double)(finish + overFinish) / total * 100;
{ run.FINISH_RATE = temp.ToString("0");
T_BI_DEPARTMENT_MONTH_RUN run = new T_BI_DEPARTMENT_MONTH_RUN(); var temp2 = total == 0 ? 0 : (double)finish / total * 100;
run.DEPARTMENT_ID = xkDepartId.Value; run.NORMAL_FINISH_RATE = temp2.ToString("0");
run.ORG_ID = pageFilter.OrgId; monthRuns.Add(run);
var depart = departmentInfos.FirstOrDefault(m => m.ID == xkDepartId.Value); }
run.DEPARTMENT_NAME = depart?.NAME; else
run.MONTH = monthStart; {
run.MONTHStr = monthStart.Year + "年" + monthStart.Month + "月"; T_BI_DEPARTMENT_MONTH_RUN run = new T_BI_DEPARTMENT_MONTH_RUN();
run.FINISH_RATE = "0"; run.DEPARTMENT_ID = xkDepartId.Value;
run.NORMAL_FINISH_RATE = "0"; run.ORG_ID = pageFilter.OrgId;
//if (i == 12) var depart = departmentInfos.FirstOrDefault(m => m.ID == xkDepartId.Value);
//{ run.DEPARTMENT_NAME = depart?.NAME;
// var lastInfo = monthRuns.FirstOrDefault(t => t.DEPARTMENT_ID == xkDepartId.Value && t.MONTHStr == monthStart.Year + "年" + monthStart.AddMonths(-1).Month + "月"); run.MONTH = monthStart;
// if (lastInfo != null) run.MONTHStr = monthStart.Year + "年" + monthStart.Month + "月";
// { run.FINISH_RATE = "0";
// run.FINISH_RATE = lastInfo.FINISH_RATE; run.NORMAL_FINISH_RATE = "0";
// run.NORMAL_FINISH_RATE = lastInfo.NORMAL_FINISH_RATE; //if (i == 12)
// } //{
//} // var lastInfo = monthRuns.FirstOrDefault(t => t.DEPARTMENT_ID == xkDepartId.Value && t.MONTHStr == monthStart.Year + "年" + monthStart.AddMonths(-1).Month + "月");
monthRuns.Add(run); // if (lastInfo != null)
// {
// run.FINISH_RATE = lastInfo.FINISH_RATE;
// run.NORMAL_FINISH_RATE = lastInfo.NORMAL_FINISH_RATE;
// }
//}
monthRuns.Add(run);
}
} }
deleteIds = this.GetEntities<T_BI_SYSTEM_RUN_SUMMARY>(t => true, new BaseFilter(pageFilter.OrgId)).Select(m => m.ID).ToList();
deletemouIds = this.GetEntities<T_BI_MOULD_RUN_SUMMARY>(t => true, new BaseFilter(pageFilter.OrgId)).Select(m => m.ID).ToList();
deletemonthIds = this.GetEntities<T_BI_DEPARTMENT_MONTH_RUN>(t => true, new BaseFilter(pageFilter.OrgId)).Select(m => m.ID).ToList();
} }
var deleteIds = this.GetEntities<T_BI_SYSTEM_RUN_SUMMARY>(t => true, new BaseFilter(pageFilter.OrgId)).Select(m => m.ID).ToList();
var deletemouIds = this.GetEntities<T_BI_MOULD_RUN_SUMMARY>(t => true, new BaseFilter(pageFilter.OrgId)).Select(m => m.ID).ToList();
var deletemonthIds = this.GetEntities<T_BI_DEPARTMENT_MONTH_RUN>(t => true, new BaseFilter(pageFilter.OrgId)).Select(m => m.ID).ToList();
this.UnifiedCommit(() => this.UnifiedCommit(() =>
{ {
if (deleteIds != null && deleteIds.Any()) if (deleteIds != null && deleteIds.Any())