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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2026-05-20 16:40:42 +08:00
commit 7257b3469f
4 changed files with 159 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -1572,7 +1572,7 @@ namespace APT.PP.WebApi.Controllers.Api
var endtime = DateTime.Now.AddHours(24); var endtime = DateTime.Now.AddHours(24);
if (plan.END_DATE != null) if (plan.END_DATE != null)
{ {
endtime = Convert.ToDateTime(plan.END_DATE.ToString()); endtime = Convert.ToDateTime(plan.END_DATE.ToString().ToString().Replace("0:00:00", "23:59:59"));
} }
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表" + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0'), ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033"); var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识表" + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0'), ide.ID, filter.OrgId, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK033");
notices.Add(noticeTask); notices.Add(noticeTask);
@ -1670,7 +1670,7 @@ namespace APT.PP.WebApi.Controllers.Api
var libPosts = GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(i => libIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList(); var libPosts = GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(i => libIds.Contains(i.ENTERPRISE_LIBRARY_ID), new BaseFilter(filter.OrgId)).ToList();
var libPostIds = libPosts.Select(t => t.ID).ToList(); var libPostIds = libPosts.Select(t => t.ID).ToList();
var libPostDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL>(i => libPostIds.Contains(i.ENTERPRISE_LIBRARY_POST_ID), new BaseFilter(filter.OrgId)).ToList(); var libPostDetails = GetEntities<T_SK_ENTERPRISE_LIBRARY_POST_DETAIL>(i => libPostIds.Contains(i.ENTERPRISE_LIBRARY_POST_ID), new BaseFilter(filter.OrgId)).ToList();
if (planIds != null && planIds.Any() )//&& dtNow.Hour >= 16 && dtNow.Hour <= 20 if (planIds != null && planIds.Any() && dtNow.Hour >= 23)//&& dtNow.Hour >= 16 && dtNow.Hour <= 20
{ {
//plans.ForEach(t => t.STATUS = PFStandardStatus.Close); //plans.ForEach(t => t.STATUS = PFStandardStatus.Close);
identitys.ForEach(m => { m.STATUS = PFStandardStatus.Close; m.END_DATE = DateTime.Now; }); identitys.ForEach(m => { m.STATUS = PFStandardStatus.Close; m.END_DATE = DateTime.Now; });

138
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
View File

@ -158,7 +158,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
public int UNFINISH { get; set; } public int UNFINISH { get; set; }
public int OVER_UNFINISH { get; set; } public int OVER_UNFINISH { get; set; }
public string FINISH_RATE { get; set; } public string FINISH_RATE { get; set; }
public string NORMAL_RATE { get; set; } public string NORMAL_RATE { get; set; }
public int NUM { get; set; }
public List<TaskViewInfoDetail> details { get; set; } public List<TaskViewInfoDetail> details { get; set; }
} }
public class TaskViewInfoDetail public class TaskViewInfoDetail
@ -11200,7 +11201,21 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{ {
connection.Open(); connection.Open();
//各公司待办明细 //各公司待办明细
string sql = "select * from vhome_task_data_form "; string sql = "select * from vhome_task_data_form order by CASE WHEN MODEL_NAME = '双重预防机制' THEN 1 " +
" WHEN MODEL_NAME = '作业现场安全管理' THEN 2" +
" WHEN MODEL_NAME = '安全教育与培训' THEN 3 ELSE 4 END, CASE WHEN FORM_NAME = '安全风险辨识与评估计划' THEN 2 WHEN FORM_NAME = '安全风险辨识表' THEN 4 " +
" WHEN FORM_NAME = '安全风险辨识结果表' THEN 6 WHEN FORM_NAME = '安全风险辨识结果汇总表' THEN 8" +
" WHEN FORM_NAME = '安全风险评估表' THEN 10 WHEN FORM_NAME = '安全风险评估汇总表' THEN 12 WHEN FORM_NAME = '风险检查关联表' THEN 14" +
" WHEN FORM_NAME = '安全检查通知' THEN 16 WHEN FORM_NAME = '安全检查记录' THEN 18 WHEN FORM_NAME = '安全检查记录汇总' THEN 20 " +
" WHEN FORM_NAME = '隐患上报' THEN 22 WHEN FORM_NAME = '手动隐患上报完善' THEN 24 WHEN FORM_NAME = '隐患确认单' THEN 26 WHEN FORM_NAME = '隐患整改通知单' THEN 28 " +
" WHEN FORM_NAME = '隐患整改记录' THEN 30 WHEN FORM_NAME = '延期整改申请' THEN 32 WHEN FORM_NAME = '班前会议' THEN 34 " +
" WHEN FORM_NAME = '岗位当班记录' THEN 36 WHEN FORM_NAME = '交接班记录' THEN 38 WHEN FORM_NAME = '班组活动记录' THEN 40 WHEN FORM_NAME = '一般作业活动记录' THEN 42 " +
" WHEN FORM_NAME = '作业方案讨论记录' THEN 44 WHEN FORM_NAME = '关键许可工作票' THEN 46 WHEN FORM_NAME = '安全技术交底表' THEN 48 " +
" WHEN FORM_NAME = '关键许可作业活动记录' THEN 50 WHEN FORM_NAME = '矿山动火作业工作票' THEN 52 WHEN FORM_NAME = '技术交底表' THEN 54 WHEN FORM_NAME = '安全交底表' " +
" THEN 56 WHEN FORM_NAME = '领导带班下井记录' THEN 58 WHEN FORM_NAME = '安全意识调查' THEN 60 WHEN FORM_NAME = '培训需求调查' THEN 62" +
" WHEN FORM_NAME = '培训计划' THEN 64 WHEN FORM_NAME = '培训通知' THEN 66 WHEN FORM_NAME = '培训通知（转训）' THEN 68 WHEN FORM_NAME = '培训记录' THEN 70" +
" WHEN FORM_NAME = '培训效果评估调查表' THEN 72 WHEN FORM_NAME = '三级安全教育培训记录' THEN 74 WHEN FORM_NAME = '新三级安全教育记录' THEN 76 " +
" WHEN FORM_NAME = '新三级安全教育卡' THEN 78 ELSE 100 END;";
SqlCommand com = new SqlCommand(sql, connection); SqlCommand com = new SqlCommand(sql, connection);
SqlDataAdapter Data = new SqlDataAdapter(com); SqlDataAdapter Data = new SqlDataAdapter(com);
Data.Fill(Table); Data.Fill(Table);
@ -11236,6 +11251,40 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{ {
listAddNew = listAddNew.Where(t => t.COMPANY_NAME == filter.Keyword).ToList(); listAddNew = listAddNew.Where(t => t.COMPANY_NAME == filter.Keyword).ToList();
} }
if (!string.IsNullOrEmpty(filter.Parameter1))
{
var startDate = DateTime.Parse(filter.Parameter1);
if (startDate.Year != DateTime.Now.Year)
{
throw new Exception("开始时间必须是本年度");
}
else
{
listAddNew = listAddNew.Where(t => t.TASK_STARTDT >= startDate).ToList();
}
}
if (!string.IsNullOrEmpty(filter.Parameter2))
{
var endDate = DateTime.Parse(filter.Parameter2);
if (endDate.Year != DateTime.Now.Year)
{
throw new Exception("结束时间必须是本年度");
}
else
{
listAddNew = listAddNew.Where(t => t.TASK_STARTDT <= endDate).ToList();
}
}
var resultTemps = new List<TaskViewInfo>();
var skForms = "安全风险辨识与评估计划,安全风险辨识表,安全风险辨识结果表,安全风险辨识结果汇总表,安全风险评估表,安全风险评估汇总表,风险检查关联表" +
",安全检查通知,安全检查记录,安全检查记录汇总,隐患上报,手动隐患上报完善,隐患确认单,隐患整改通知单,隐患整改记录,延期整改申请";
var skFormList = skForms.Split(",").ToList();
var foForms = "班前会议,岗位当班记录,交接班记录,班组活动记录,一般作业活动记录,作业方案讨论记录,关键许可工作票" +
",安全技术交底表,关键许可作业活动记录,矿山动火作业工作票,技术交底表,安全交底表,领导带班下井记录";
var foFormList = foForms.Split(",").ToList();
var seForms = "安全意识调查,培训需求调查,培训通知,培训通知（转训）,培训记录,培训效果评估调查表,三级安全教育培训记录" +
",新三级安全教育记录,新三级安全教育卡";
var seFormList = seForms.Split(",").ToList();
var taskGroup = listAddNew.GroupBy(t => new { t.COMPANY_NAME, t.MOULD_NAME, t.FORM_NAME }).ToList(); var taskGroup = listAddNew.GroupBy(t => new { t.COMPANY_NAME, t.MOULD_NAME, t.FORM_NAME }).ToList();
if (taskGroup != null && taskGroup.Any()) if (taskGroup != null && taskGroup.Any())
{ {
@ -11256,6 +11305,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
info.OVER_UNFINISH = details.Count(t => t.NOTICE_STATUS == "0" && t.TASK_ENDDT < DateTime.Now); info.OVER_UNFINISH = details.Count(t => t.NOTICE_STATUS == "0" && t.TASK_ENDDT < DateTime.Now);
info.FINISH_RATE = info.TOTAL_QTY == 0 ? "0" : ((double)(info.NORMAL_FINISH + info.OVER_FINISH) / info.TOTAL_QTY * 100).ToString("0.00"); info.FINISH_RATE = info.TOTAL_QTY == 0 ? "0" : ((double)(info.NORMAL_FINISH + info.OVER_FINISH) / info.TOTAL_QTY * 100).ToString("0.00");
info.NORMAL_RATE = info.TOTAL_QTY == 0 ? "0" : ((double)info.NORMAL_FINISH / info.TOTAL_QTY * 100).ToString("0.00"); info.NORMAL_RATE = info.TOTAL_QTY == 0 ? "0" : ((double)info.NORMAL_FINISH / info.TOTAL_QTY * 100).ToString("0.00");
info.details = new List<TaskViewInfoDetail>();
if (details != null && details.Any()) if (details != null && details.Any())
{ {
info.details = new List<TaskViewInfoDetail>(); info.details = new List<TaskViewInfoDetail>();
@ -11278,9 +11328,93 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
} }
info.details = info.details.OrderBy(t => t.NUM).ToList(); info.details = info.details.OrderBy(t => t.NUM).ToList();
} }
//resultTemps.Add(info);
result.Data.Add(info); result.Data.Add(info);
} }
} }
int i = 1;
foreach (var item in skFormList)
{
var temp = result.Data.FirstOrDefault(t => t.MOULD_NAME == "双重预防机制" && t.FORM_NAME == item.ToString().Trim());
if (temp == null)
{
TaskViewInfo info = new TaskViewInfo();
info.COMPANY_NAME = filter.Keyword;
info.MOULD_NAME = "双重预防机制";
info.FORM_NAME = item.ToString().Trim();
info.TOTAL_QTY = 0;
info.NORMAL_FINISH = 0;
info.OVER_FINISH = 0;
info.DOING = 0;
info.UNFINISH = 0;
info.OVER_UNFINISH = 0;
info.FINISH_RATE = "0.00";
info.NORMAL_RATE = "0.00";
info.NUM = i;
result.Data.Add(info);
}
else
{
temp.NUM = i;
}
i++;
}
int j = 1;
foreach (var item in foFormList)
{
var temp = result.Data.FirstOrDefault(t => t.MOULD_NAME == "作业现场安全管理" && t.FORM_NAME == item.ToString().Trim());
if (temp == null)
{
TaskViewInfo info = new TaskViewInfo();
info.COMPANY_NAME = filter.Keyword;
info.MOULD_NAME = "作业现场安全管理";
info.FORM_NAME = item.ToString().Trim();
info.TOTAL_QTY = 0;
info.NORMAL_FINISH = 0;
info.OVER_FINISH = 0;
info.DOING = 0;
info.UNFINISH = 0;
info.OVER_UNFINISH = 0;
info.FINISH_RATE = "0.00";
info.NORMAL_RATE = "0.00";
info.NUM = j;
result.Data.Add(info);
}
else
{
temp.NUM = j;
}
j++;
}
int k = 1;
foreach (var item in seFormList)
{
var temp = result.Data.FirstOrDefault(t => t.MOULD_NAME == "安全教育与培训" && t.FORM_NAME == item.ToString().Trim());
if (temp == null)
{
TaskViewInfo info = new TaskViewInfo();
info.COMPANY_NAME = filter.Keyword;
info.MOULD_NAME = "安全教育与培训";
info.FORM_NAME = item.ToString().Trim();
info.TOTAL_QTY = 0;
info.NORMAL_FINISH = 0;
info.OVER_FINISH = 0;
info.DOING = 0;
info.UNFINISH = 0;
info.OVER_UNFINISH = 0;
info.FINISH_RATE = "0.00";
info.NORMAL_RATE = "0.00";
info.NUM = k;
result.Data.Add(info);
}
else
{
temp.NUM = k;
}
k++;
}
result.Data = result.Data.OrderBy(t => t.NUM).ToList();
} }
} }
return result; return result;

8
APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs
View File

@ -134,19 +134,19 @@ namespace APT.SK.WebApi.Controllers.Api
} }
else else
{ {
if (departPost.DEPARTMENT_TYPE == 0) if (departPost.DEPARTMENT_TYPE == 10)
{ {
entity.POST_NAME = "部门安全员"; entity.POST_NAME = "部门安全员";
} }
if (departPost.DEPARTMENT_TYPE == 1) if (departPost.DEPARTMENT_TYPE == 15)
{ {
entity.POST_NAME = "车间安全员"; entity.POST_NAME = "车间安全员";
} }
if (departPost.DEPARTMENT_TYPE == 2) if (departPost.DEPARTMENT_TYPE == 20)
{ {
entity.POST_NAME = "班组负责人"; entity.POST_NAME = "班组负责人";
} }
if (departPost.DEPARTMENT_TYPE == 3) if (departPost.DEPARTMENT_TYPE == 5)
{ {
entity.POST_NAME = "安环部安全员"; entity.POST_NAME = "安环部安全员";
} }

25
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -97,10 +97,7 @@ namespace APT.SK.WebApi.Controllers
entity.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID; entity.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID;
entity.NOTICE_CODE = record.NOTICE_CODE; entity.NOTICE_CODE = record.NOTICE_CODE;
} }
if (entity.COMPLETE_DATE == null)
{
entity.COMPLETE_DATE = DateTime.Now;
}
var photoas = entity.Nav_RectifyPhotoas; var photoas = entity.Nav_RectifyPhotoas;
entity.Nav_RectifyPhotoas = null; entity.Nav_RectifyPhotoas = null;
var photobs = entity.Nav_RectifyPhotobs; var photobs = entity.Nav_RectifyPhotobs;
@ -155,6 +152,10 @@ namespace APT.SK.WebApi.Controllers
item.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID; item.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID;
item.Nav_Reason = null; item.Nav_Reason = null;
} }
}
if (entity.COMPLETE_DATE == null)
{
entity.COMPLETE_DATE = DateTime.Now;
} }
T_FM_NOTIFICATION_TASK notice = null; T_FM_NOTIFICATION_TASK notice = null;
T_FM_NOTIFICATION_TASK task = null; T_FM_NOTIFICATION_TASK task = null;
@ -166,7 +167,10 @@ namespace APT.SK.WebApi.Controllers
if (entity.RECITIFY_USER_ID != null) if (entity.RECITIFY_USER_ID != null)
{ {
entity.STATUS = PFStandardStatus.Reading; entity.STATUS = PFStandardStatus.Reading;
entity.COMPLETE_DATE = DateTime.Now; if (entity.COMPLETE_DATE == null)
{
entity.COMPLETE_DATE = DateTime.Now;
}
//var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME; //var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>(); var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.RECITIFY_USER_ID); var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.RECITIFY_USER_ID);
@ -663,7 +667,10 @@ namespace APT.SK.WebApi.Controllers
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(id); var entity = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(id);
FilterRule ruleArea = new FilterRule(); FilterRule ruleArea = new FilterRule();
ruleArea.Field = "RISK_AREA_ID"; ruleArea.Field = "RISK_AREA_ID";
ruleArea.Value = entity.RISK_AREA_ID; ruleArea.Value = entity.RISK_AREA_ID;
FilterRule rulePro = new FilterRule();
rulePro.Field = "PRODUCTION_UNIT_ID";
rulePro.Value = entity.PRODUCTION_UNIT_ID;
FilterRule ruleOrg = new FilterRule(); FilterRule ruleOrg = new FilterRule();
ruleOrg.Field = "ORG_ID"; ruleOrg.Field = "ORG_ID";
ruleOrg.Value = entity.ORG_ID; ruleOrg.Value = entity.ORG_ID;
@ -671,13 +678,14 @@ namespace APT.SK.WebApi.Controllers
ruleContent.Field = "CHECK_CONTENTS_ID"; ruleContent.Field = "CHECK_CONTENTS_ID";
ruleContent.Value = entity.CHECK_CONTENTS_ID; ruleContent.Value = entity.CHECK_CONTENTS_ID;
FilterRule ruleName = new FilterRule(); FilterRule ruleName = new FilterRule();
ruleName.Field = "HIDDEN_DESCRIPTION"; ruleName.Field = "CHECK_QUESTION_ID";
ruleName.Value = entity.HIDDEN_DESCRIPTION; ruleName.Value = entity.CHECK_QUESTION_ID;
FilterRule ruleLevel = new FilterRule(); FilterRule ruleLevel = new FilterRule();
ruleLevel.Field = "HIDDEN_LEVEL"; ruleLevel.Field = "HIDDEN_LEVEL";
ruleLevel.Value = entity.HIDDEN_LEVEL; ruleLevel.Value = entity.HIDDEN_LEVEL;
pageFilter = new KeywordPageFilter(); pageFilter = new KeywordPageFilter();
pageFilter.IgnoreDataRule = true; pageFilter.IgnoreDataRule = true;
pageFilter.FilterGroup.Rules.Add(rulePro);
pageFilter.FilterGroup.Rules.Add(ruleArea); pageFilter.FilterGroup.Rules.Add(ruleArea);
pageFilter.FilterGroup.Rules.Add(ruleOrg); pageFilter.FilterGroup.Rules.Add(ruleOrg);
pageFilter.FilterGroup.Rules.Add(ruleContent); pageFilter.FilterGroup.Rules.Add(ruleContent);
@ -686,6 +694,7 @@ namespace APT.SK.WebApi.Controllers
pageFilter.Include.Add("Nav_ApplyDepartment"); pageFilter.Include.Add("Nav_ApplyDepartment");
pageFilter.Include.Add("Nav_RecitifyUser"); pageFilter.Include.Add("Nav_RecitifyUser");
pageFilter.Include.Add("Nav_CheckType"); pageFilter.Include.Add("Nav_CheckType");
pageFilter.Include.Add("Nav_RiskArea");
pageFilter.Include.Add("Nav_ProductionUnit"); pageFilter.Include.Add("Nav_ProductionUnit");
result = this.GetOrderPageEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(null, pageFilter); result = this.GetOrderPageEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(null, pageFilter);
return result; return result;