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-03-03 14:04:31 +08:00
commit c53417df0f
13 changed files with 95 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3471,7 +3471,8 @@ namespace APT.PP.WebApi.Controllers.Api
{
endtime = DateTime.Now.AddMonths(3);
}
var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + "安全检查通知" + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
var checkType = checkTypes.FirstOrDefault(t => t.ID == item.CHECK_TYPE_ID);
var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + checkType?.NAME + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
notices.Add(notice);
}
}
@ -3547,7 +3548,8 @@ namespace APT.PP.WebApi.Controllers.Api
{
endtime = DateTime.Now.AddMonths(3);
}
var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + "安全检查通知" + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
var checkType = checkTypes.FirstOrDefault(t => t.ID == item.CHECK_TYPE_ID);
var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CHECK_TYPE.GetDescription() + checkType?.NAME + date + item.Nav_CheckType?.NAME, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
notices.Add(notice);
}
}
@ -5584,7 +5586,8 @@ namespace APT.PP.WebApi.Controllers.Api
{
endtime = DateTime.Now.AddMonths(3);
}
var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + "安全检查通知" + date, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
var checkType = checkTypes.FirstOrDefault(t => t.ID == item.CheckTypeId);
var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + checkType?.NAME + date, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
notices.Add(notice);
j++;
}
@ -5838,6 +5841,7 @@ namespace APT.PP.WebApi.Controllers.Api
{
dt = DateTime.Parse(filter.Parameter1);
}
var checkTypes = GetEntities<T_SK_CHECK_TYPE>(i => !i.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
List<T_SK_SECURITY_INSPECTION_NOTICE> notices = new List<T_SK_SECURITY_INSPECTION_NOTICE>();
List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL> details = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
List<T_FM_NOTIFICATION_TASK> tasks = new List<T_FM_NOTIFICATION_TASK>();
@ -5915,7 +5919,8 @@ namespace APT.PP.WebApi.Controllers.Api
{
endtime = DateTime.Now.AddMonths(3);
}
var task = NotificationTaskService.InsertUserNoticeTaskModel(set.CHECK_CYCLE.GetDescription() + "安全检查通知" + date, notice.ID, set.ORG_ID, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
var checkType = checkTypes.FirstOrDefault(t => t.ID == set.CHECK_TYPE_ID);
var task = NotificationTaskService.InsertUserNoticeTaskModel(set.CHECK_CYCLE.GetDescription() + checkType?.NAME + date, notice.ID, set.ORG_ID, user.ID, user.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
tasks.Add(task);
j++;
}

33
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
View File

@ -237,7 +237,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
[HttpPost, Route("ReturnAllData")]
public JsonActionResult<ReturnAll> ReturnAllData([FromBody] KeywordFilter filter)
{
string connhead = ConfigurationManager.ConnectionStrings["head"];
//string connhead = ConfigurationManager.ConnectionStrings["head"];
JsonActionResult<ReturnAll> result = new JsonActionResult<ReturnAll>();
result.Data = new ReturnAll();
DataTable tableRisk = new DataTable();
@ -256,8 +256,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
DataSet ds = new DataSet();
GETDBDATA(strConn, listVNAME, ref ds);//获取视图 数据 listVNAME 与 ds.Tables 一一对应
result.Data.listSETrainSum = GetTrainInfo(ds.Tables[0], ListAllORG);
using (SqlConnection connection = new SqlConnection(connhead))
using (SqlConnection connection = new SqlConnection(strConn))
{
try
{
@ -267,7 +266,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
SqlCommand comRisk = new SqlCommand(sqlRisk, connection);
SqlDataAdapter riskData = new SqlDataAdapter(comRisk);
riskData.Fill(tableRisk);
result.Data.riskTypeRate = RiskTypeRateData(connhead, tableRisk);
result.Data.riskTypeRate = RiskTypeRateData(tableRisk);
//当日工作票排名前三
string sqlJob = "select * from vhome_jobtop3_today ";
SqlCommand comJob = new SqlCommand(sqlJob, connection);
@ -277,37 +276,37 @@ namespace APT.SC.WebApi.Controllers.Api.BI
SqlCommand comJobGroup = new SqlCommand(sqlJobGroup, connection);
SqlDataAdapter jobGroupData = new SqlDataAdapter(comJobGroup);
jobGroupData.Fill(tableJobGroup);
result.Data.jobTodayTop3 = JobTodayTopData(connhead, filter.OrgId.Value, tableJob, tableJobGroup);
result.Data.jobTodayTop3 = JobTodayTopData(filter.OrgId.Value, tableJob, tableJobGroup);
//隐患整改率
string sqlHidden = "select * from vhome_hidden_data_result ";
SqlCommand comHidden = new SqlCommand(sqlHidden, connection);
SqlDataAdapter hiddenData = new SqlDataAdapter(comHidden);
hiddenData.Fill(tableHidden);
result.Data.hiddenRectify = HiddenRectifyData(connhead, tableHidden);
result.Data.hiddenRectify = HiddenRectifyData(tableHidden);
//各事项排名前三
string sqlTask = "select * from vhome_task_data_result ";
SqlCommand comTask = new SqlCommand(sqlTask, connection);
SqlDataAdapter taskData = new SqlDataAdapter(comTask);
taskData.Fill(tableTask);
result.Data.taskTop3 = TaskTopData(connhead, tableTask);
result.Data.taskTop3 = TaskTopData(tableTask);
//作业现场完成情况统计
string sqlJobRate = "select * from vhome_jobrecord_data ";
SqlCommand comJobRate = new SqlCommand(sqlJobRate, connection);
SqlDataAdapter jobRateData = new SqlDataAdapter(comJobRate);
jobRateData.Fill(tableJobRate);
result.Data.jobFinishRate = jobFinishRateData(connhead, tableJobRate);
result.Data.jobFinishRate = jobFinishRateData(tableJobRate);
//各公司安全检查统计
string sqlSafecCheck = "select * from vhome_check_total ";
SqlCommand comSafecCheck = new SqlCommand(sqlSafecCheck, connection);
SqlDataAdapter safecCheckData = new SqlDataAdapter(comSafecCheck);
safecCheckData.Fill(tableSafeCheck);
result.Data.safeCheckSum = safeCheckSumData(connhead, tableSafeCheck);
result.Data.safeCheckSum = safeCheckSumData(tableSafeCheck);
//各公司危险分类统计
string sqlLink = "select * from vhome_operationLink_data ";
SqlCommand comLink = new SqlCommand(sqlLink, connection);
SqlDataAdapter linkData = new SqlDataAdapter(comLink);
linkData.Fill(tableLink);
result.Data.linkSum = linkSumData(connhead, tableLink);
result.Data.linkSum = linkSumData(tableLink);
connection.Close();
}
@ -364,7 +363,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
/// 风险等级占比
/// </summary>
/// <param name="filter">分页过滤实体</param>
public List<RiskTypeRate> RiskTypeRateData(string connhead, DataTable Table)
public List<RiskTypeRate> RiskTypeRateData(DataTable Table)
{
List<RiskTypeRate> result = new List<RiskTypeRate>();
if (Table != null && Table.Rows.Count > 0)
@ -387,7 +386,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
/// </summary>
/// <param name="filter">参数</param>
/// <returns></returns>
public List<JobTodayTop3> JobTodayTopData(string connhead, Guid orgId, DataTable Table, DataTable Table2)
public List<JobTodayTop3> JobTodayTopData(Guid orgId, DataTable Table, DataTable Table2)
{
List<JobTodayTop3> result = new List<JobTodayTop3>();
var details = new List<JobTodayDetail>();
@ -441,7 +440,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
/// </summary>
/// <param name="filter">参数</param>
/// <returns></returns>
public HiddenRectify HiddenRectifyData(string connhead, DataTable Table)
public HiddenRectify HiddenRectifyData(DataTable Table)
{
HiddenRectify result = new HiddenRectify();
if (Table != null && Table.Rows.Count > 0)
@ -459,7 +458,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
/// </summary>
/// <param name="filter">参数</param>
/// <returns></returns>
public List<TaskTop3> TaskTopData(string connhead, DataTable Table)
public List<TaskTop3> TaskTopData(DataTable Table)
{
List<TaskTop3> result = new List<TaskTop3>();
var dataTemps = new List<TaskTopTemp>();
@ -508,7 +507,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
/// </summary>
/// <param name="filter">参数</param>
/// <returns></returns>
public List<JobFinishRate> jobFinishRateData(string connhead, DataTable Table)
public List<JobFinishRate> jobFinishRateData(DataTable Table)
{
List<JobFinishRate> result = new List<JobFinishRate>();
if (Table != null && Table.Rows.Count > 0)
@ -533,7 +532,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
/// </summary>
/// <param name="filter">参数</param>
/// <returns></returns>
public List<SafeCheckSum> safeCheckSumData(string connhead, DataTable Table)
public List<SafeCheckSum> safeCheckSumData(DataTable Table)
{
List<SafeCheckSum> result = new List<SafeCheckSum>();
if (Table != null && Table.Rows.Count > 0)
@ -555,7 +554,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
/// </summary>
/// <param name="filter">参数</param>
/// <returns></returns>
public List<LinkSum> linkSumData(string connhead, DataTable Table)
public List<LinkSum> linkSumData(DataTable Table)
{
List<LinkSum> result = new List<LinkSum>();
if (Table != null && Table.Rows.Count > 0)

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

@ -6,8 +6,10 @@ using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.IServices;
using APT.BaseData.Domain.IServices.FM;
using APT.BaseData.Domain.IServices.OP;
using APT.BaseData.Services.DomainServices;
using APT.BaseData.Services.Services.FM;
using APT.BaseData.Services.Services.OP;
using APT.Infrastructure.Api;
using APT.Infrastructure.Api.Redis;
using APT.Infrastructure.Core;
@ -179,11 +181,13 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
/// </summary>
[Route("api/BI/BIStatiscialAnalysisController")]
public class BIStatiscialAnalysisController : AuthorizeApiController<T_FM_NOTIFICATION_TASK>
{
{
IOPTenantDBConnService OPTenantDBConnService { get; set; }
IPFApproveCallBackService ApproveCallBackService { get; set; }
public BIStatiscialAnalysisController(IPFApproveCallBackService approveCallBackService)
public BIStatiscialAnalysisController(IPFApproveCallBackService approveCallBackService,IOPTenantDBConnService opTenantDBConnService)
{
ApproveCallBackService = approveCallBackService;
ApproveCallBackService = approveCallBackService;
OPTenantDBConnService = opTenantDBConnService;
}
#region 安全事务执行情况汇总
/// <summary>
@ -11183,11 +11187,12 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
[HttpPost, Route("GetTaskViewInfo")]
public JsonActionResult<List<TaskViewInfo>> GetTaskViewInfo([FromBody] KeywordFilter filter)
{
string connhead = ConfigurationManager.ConnectionStrings["head"];
//string connhead = ConfigurationManager.ConnectionStrings["head"];
string strConn = OPTenantDBConnService.GetConnByORGID(filter.OrgId.Value);//获取数据库链接
JsonActionResult<List<TaskViewInfo>> result = new JsonActionResult<List<TaskViewInfo>>();
result.Data = new List<TaskViewInfo>();
DataTable Table = new DataTable();
using (SqlConnection connection = new SqlConnection(connhead))
using (SqlConnection connection = new SqlConnection(strConn))
{
try
{

2
APT.MicroApi/APT.SC.WebApi/appsettings.Development.json
View File

@ -2,7 +2,7 @@
"ConnectionStrings": {
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
"default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;",
"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
//"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
},
"AppSettings": {
"DataBaseType": "sqlserver",

2
APT.MicroApi/APT.SC.WebApi/appsettings.Pdev.json
View File

@ -9,7 +9,7 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
//"default": "Server=120.25.146.51;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;"
"default": "Server=124.117.209.78;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;",
"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
//"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
},
"AppSettings": {
"DataBaseType": "sqlserver",

2
APT.MicroApi/APT.SC.WebApi/appsettings.Production.json
View File

@ -9,7 +9,7 @@
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
//"default": "Server=172.26.13.0;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;"
"default": "Server=127.0.0.1;Database=mh_jy_ops;uid=sa;pwd=JySafe@2025*;",
"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
//"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
},
"AppSettings": {
"DataBaseType": "sqlserver",

2
APT.MicroApi/APT.SC.WebApi/appsettings.Test.json
View File

@ -2,7 +2,7 @@
"ConnectionStrings": {
//"default": "User ID=postgres;Password=dfdn!energy;Host=36.134.166.114;Port=5432;Database=mh_op;CommandTimeout=1024;"
"default": "Server=121.41.2.71;Database=mh_jy_ops;uid=sa;pwd=mhsafe!2021;",
"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
//"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
},
"AppSettings": {
"DataBaseType": "sqlserver",

2
APT.MicroApi/APT.SC.WebApi/appsettings.json
View File

@ -5,7 +5,7 @@
//"default": "Data Source=172.20.8.83:1521/DB2;User Id=\"dbo\";Password=mssuat;Pooling=false;PERSIST SECURITY INFO=True;"
//"default": "User ID=postgres;Password=ldxmesadm;Host=172.20.8.91;Port=5432;Database=mes;CommandTimeout=1024;"
"default": "Server=127.0.0.1;Database=mh_jy_ops;uid=sa;pwd=123456;",
"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
//"head": "Server=124.117.209.78;Database=mh_jy_head;uid=sa;pwd=JySafe@2025*;"
//"default": "User ID=postgres;Password=opt!energy;Host=36.133.75.96;Port=5432;Database=postgres;CommandTimeout=1024;"
},
"AppSettings": {

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs
View File

@ -57,7 +57,11 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> deleteDetailIds = new List<Guid>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE> fileList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC> basicList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> reasonList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> reasonList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON>();
if (details != null)
{
details = details.Where(t => !t.IS_DELETED).ToList();
}
if (details != null && details.Any())
{
var evaluationIsExist = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>(t => t.ID == entity.ID, new string[] { "Nav_RectifyDetails", "Nav_RectifyDetails.Nav_RectifyDetailFiles", "Nav_RectifyDetails.Nav_RectifyDetailBasics", "Nav_RectifyDetails.Nav_RectifyDetailReasons" });

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerReportController.cs
View File

@ -72,7 +72,11 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE> fileList = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE>();
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC> basicList = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC>();
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> reasonList = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON>();
SKHiddenLevel? hiddenLevel = SKHiddenLevel.General;
SKHiddenLevel? hiddenLevel = SKHiddenLevel.General;
if (details != null)
{
details = details.Where(t => !t.IS_DELETED).ToList();
}
if (details != null && details.Any())
{
var evaluationIsExist = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(t => t.ID == entity.ID, new string[] { "Nav_ReportDetails", "Nav_ReportDetails.Nav_ReportDetailFiles", "Nav_ReportDetails.Nav_ReportDetailBasics" , "Nav_ReportDetails.Nav_ReportDetailReasons" });

7
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
View File

@ -176,8 +176,11 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> deleteUserIds = new List<Guid>();
List<Guid> deleteBasicIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>();
List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL_USER> userList = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL_USER>();
List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL_BASIC> basicList = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL_BASIC>();
List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL_USER> userList = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL_USER>();
if (details != null)
{
details = details.Where(t => !t.IS_DELETED).ToList();
}
if (details != null && details.Any())
{
var evaluationIsExist = this.GetEntity<T_SK_SECURITY_INSPECTION_NOTICE>(t => t.ID == entity.ID, new string[] { "Nav_CheckNoticeDetails", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics" });

7
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
View File

@ -474,7 +474,11 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER> userList = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_BASIC> basicList = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_BASIC>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_FILE> fileList = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_FILE>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> reasonList = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> reasonList = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON>();
if (details != null)
{
details = details.Where(t => !t.IS_DELETED).ToList();
}
if (details != null && details.Any())
{
var evaluationIsExist = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(t => t.ID == entity.ID, new string[] { "Nav_CheckRecordDetails", "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles", "Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics", "Nav_CheckRecordDetails.Nav_CheckRecordDetailReasons" });
@ -506,6 +510,7 @@ namespace APT.SK.WebApi.Controllers.Api
deleteDetailIds.Add(t.ID);
});
}
foreach (var item in details)
{
if (item.CHECK_RESULT == null)

39
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
View File

@ -68,7 +68,11 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER> userList = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_BASIC> basicList = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_BASIC>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> reasonList = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE> fileList = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE> fileList = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE>();
if (details != null)
{
details = details.Where(t => !t.IS_DELETED).ToList();
}
if (details != null && details.Any())
{
var groupDetails = details.Where(m => m.CHECK_RESULT == SKCheckResultEnum.Yes && m.IS_DELETED == false).GroupBy(t => new { t.RISK_AREA_ID, t.CHECK_CONTENTS_ID, t.CHECK_QUESTION_ID }).ToList();
@ -107,8 +111,8 @@ namespace APT.SK.WebApi.Controllers.Api
}
deleteDetailIds.Add(t.ID);
});
}
}
foreach (var item in details)
{
if (item.CHECK_RESULT == null)
@ -118,6 +122,26 @@ namespace APT.SK.WebApi.Controllers.Api
if (item.CHECK_RESULT == SKCheckResultEnum.None)
{
item.HIDDEN_LEVEL = null;
}
var isExsists = details.FirstOrDefault(t => t.CHECK_RESULT == SKCheckResultEnum.Yes && (t.CHECK_QUESTION_ID == null || t.HIDDEN_LEVEL == null || t.HIDDEN_PLACE == null));
if (isExsists != null)
{
throw new Exception("有隐患必须选择隐患描述和隐患等级隐患地点");
}
var isExsistFirsts = details.FirstOrDefault(t => t.CHECK_RESULT == SKCheckResultEnum.Yes && (t.Nav_CheckRecordDetailFiles == null || !t.Nav_CheckRecordDetailFiles.Any()));
if (isExsistFirsts != null)
{
throw new Exception("有隐患必须上传隐患照片");
}
var noExsists = details.FirstOrDefault(t => t.CHECK_RESULT != SKCheckResultEnum.Yes && (t.CHECK_QUESTION_ID != null || t.HIDDEN_LEVEL != null || t.HIDDEN_PLACE != null));
if (noExsists != null)
{
throw new Exception("无隐患、不涉及无需填写隐患描述和隐患等级隐患地点，请确认检查情况");
}
var noExsistTwos = details.FirstOrDefault(t => t.CHECK_RESULT != SKCheckResultEnum.Yes && t.Nav_CheckRecordDetailFiles != null && t.Nav_CheckRecordDetailFiles.Where(m => !m.IS_DELETED).Any());
if (noExsistTwos != null)
{
throw new Exception("无隐患、不涉及无需上传隐患照片");
}
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
@ -771,8 +795,13 @@ namespace APT.SK.WebApi.Controllers.Api
}
item.Nav_CheckRecordDetailUsers = userTemps;
}
result.Nav_CheckRecordDetails = details.OrderByDescending(t=>t.CHECK_RESULT).ToList();
}
//有隐患的排前面
var tempsYes = result.Nav_CheckRecordDetails.Where(t => t.CHECK_RESULT == SKCheckResultEnum.Yes).OrderBy(m => m.RISK_AREA_ID).ToList();
var tempsNo = result.Nav_CheckRecordDetails.Where(t => t.CHECK_RESULT != SKCheckResultEnum.Yes).OrderBy(m => m.RISK_AREA_ID).ToList();
tempsYes.AddRange(tempsNo);
result.Nav_CheckRecordDetails = tempsYes.OrderByDescending(n => (int)n.MARK).ToList();
//result.Nav_CheckRecordDetails = details.OrderByDescending(t=>t.CHECK_RESULT).ToList();
}
}
return result;