zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/sggl_cd

Browse Source
This commit is contained in:
李鹏飞
2024-04-02 14:28:58 +08:00
parent d87b2d5be9 49283a7433
commit 0b081ea38f
11 changed files with 1036 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/HSSE/HazardListController.cs
+185
View File
@@ -68,5 +68,190 @@ namespace WebAPI.Controllers
return responeData;
}
#endregion
#region 获取风险等级列表
/// <summary>
/// 获取风险等级列表
/// </summary>
/// <returns></returns>
public Model.ResponeData getRiskLevel()
{
var responeData = new Model.ResponeData();
try
{
////风险等级列表信息
var getRiskLevel = APIHazardListService.getRiskLevel();
responeData.data = new { getRiskLevel };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据主键ID获取风险详细
/// <summary>
/// 根据主键ID获取风险详细
/// </summary>
/// <param name="hazardSelectedItemId"></param>
/// <returns></returns>
public Model.ResponeData getHazardItemById(string hazardSelectedItemId)
{
var responeData = new Model.ResponeData();
try
{
////危险源辨识与评价明细信息
var getHazardSelectedInfo = APIHazardListService.getHazardItemInfo(hazardSelectedItemId);
responeData.data = new { getHazardSelectedInfo };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 保存风险巡检记录
/// <summary>
/// 保存风险巡检记录
/// </summary>
/// <param name="newItem">风险巡检记录</param>
/// <returns></returns>
[HttpPost]
public Model.ResponeData SaveRoutingInspection([FromBody] Model.RoutingInspectionItem newItem)
{
var responeData = new Model.ResponeData();
try
{
responeData.message = APIHazardListService.SaveRoutingInspection(newItem);
if (!string.IsNullOrEmpty(responeData.message))
{
responeData.code = 0;
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据主键ID获取二次评估详细
/// <summary>
/// 根据主键ID获取二次评估详细
/// </summary>
/// <param name="LECItemRecordId"></param>
/// <returns></returns>
public Model.ResponeData getReEvaluatorById(string LECItemRecordId)
{
var responeData = new Model.ResponeData();
try
{
var getHazardSelectedInfo = APIHazardListService.getReEvaluatorInfo(LECItemRecordId);
responeData.data = new { getHazardSelectedInfo };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 保存二次评估
/// <summary>
/// 保存二次评估
/// </summary>
/// <param name="newItem">二次评估</param>
/// <returns></returns>
[HttpPost]
public Model.ResponeData SaveReEvaluator([FromBody] Model.ReEvaluator newItem)
{
var responeData = new Model.ResponeData();
try
{
APIHazardListService.SaveReEvaluator(newItem);
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据projectId获取风险巡检记录列表
/// <summary>
/// 根据projectId获取风险巡检记录列表
/// </summary>
/// <param name="projectId"></param>
/// <param name="pageIndex"></param>
/// <returns></returns>
public Model.ResponeData getRoutingInspectionList(string projectId, int pageIndex)
{
var responeData = new Model.ResponeData();
try
{
var getDataList = APIHazardListService.getRoutingInspectionList(projectId);
int pageCount = getDataList.Count();
if (pageCount > 0 && pageIndex > 0)
{
getDataList = getDataList.Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
}
responeData.data = new { pageCount, getDataList };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据主键ID获取已生成的风险巡检记录
/// <summary>
/// 根据主键ID获取已生成的风险巡检记录
/// </summary>
/// <param name="routingInspectionId"></param>
/// <returns></returns>
public Model.ResponeData getRoutingInspectionById(string routingInspectionId)
{
var responeData = new Model.ResponeData();
try
{
////危险源辨识与评价明细信息
var getHazardSelectedInfo = APIHazardListService.getRoutingInspection(routingInspectionId);
responeData.data = new { getHazardSelectedInfo };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
}
}
SGGL/WebAPI/Controllers/HSSE/TestPlanController.cs
+31 -14
View File
@@ -79,24 +79,41 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
var getTasks = new Model.SGGLDB(Funs.ConnString).Training_Task.FirstOrDefault(x => x.PlanId == trainingPlanId);
if (getTasks != null)
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
if (CommonService.IsMainUnitOrAdmin(userId))
var getTasks =db.Training_Task.FirstOrDefault(x => x.PlanId == trainingPlanId);
if (getTasks != null)
{
responeData.data = APITestPlanService.SaveTestPlanByTrainingPlanId(trainingPlanId, userId);
bool result = false;
if (userId == Const.sysglyId || userId == Const.hfnbdId)
{
result = true;
}
else
{
var user = db.Sys_User.FirstOrDefault(e => e.UserId == userId);
if (user != null && user.UnitId == Const.UnitId_CD)
{
result = true;
}
}
if ( result)
//if (CommonService.IsMainUnitOrAdmin(userId))
{
responeData.data = APITestPlanService.SaveTestPlanByTrainingPlanId(trainingPlanId, userId);
}
else
{
responeData.code = 0;
responeData.message = "非本单位用户，不能生成考试计划！";
}
}
else
{
responeData.code = 0;
responeData.message = "非本单位用户，不能生成考试计划！";
responeData.message = "培训计划下没有培训人员，不能生成考试计划！";
}
}
else
{
responeData.code = 0;
responeData.message = "培训计划下没有培训人员，不能生成考试计划！";
}
}
catch (Exception ex)
{
@@ -201,11 +218,11 @@ namespace WebAPI.Controllers
Model.SitePerson_Person person;
if (user != null)
{
person = Funs.DB.SitePerson_Person.FirstOrDefault(e => (e.PersonId == personId || e.IdentityCard == user.IdentityCard) && e.ProjectId == getTestPlan.ProjectId);// PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
person = db.SitePerson_Person.FirstOrDefault(e => (e.PersonId == personId || e.IdentityCard == user.IdentityCard) && e.ProjectId == getTestPlan.ProjectId);// PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
}
else
{
person = Funs.DB.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId && e.ProjectId == getTestPlan.ProjectId);// PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
person = db.SitePerson_Person.FirstOrDefault(e => e.PersonId == personId && e.ProjectId == getTestPlan.ProjectId);// PersonService.GetPersonByUserId(personId, getTestPlan.ProjectId);
}
if (person != null || user != null)
@@ -246,7 +263,7 @@ namespace WebAPI.Controllers
TestPlanId = getTestPlan.TestPlanId,
TestManId = personId,
};
TestRecordService.AddTestRecord(newTestRecord);
TestRecordService.AddTestRecordForApi(newTestRecord);
responeData.code = 3;
responeData.message = "您已加入考试计划！";
}
@@ -265,7 +282,7 @@ namespace WebAPI.Controllers
TestPlanId = getTestPlan.TestPlanId,
TestManId = personId,
};
TestRecordService.AddTestRecord(newTestRecord);
TestRecordService.AddTestRecordForApi(newTestRecord);
responeData.code = 3;
responeData.message = "您已加入考试计划！";
}
SGGL/WebAPI/Controllers/HSSE/TestRecordController.cs
+1 -1
View File
@@ -165,7 +165,7 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
personId = PersonService.GetPersonIdByUserId(personId);
personId = PersonService.GetPersonIdByUserIdForApi(personId);
var getDataLists = APITestRecordService.getTrainingTestRecordListByProjectIdPersonId(projectId, personId);
int pageCount = getDataLists.Count;
if (pageCount > 0 && pageIndex > 0)
SGGL/WebAPI/Controllers/HSSE/TrainingPlanController.cs
+24 -7
View File
@@ -101,14 +101,31 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
if (CommonService.IsMainUnitOrAdmin(trainingPlan.DesignerId))
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
APITrainingPlanService.SaveTrainingPlan(trainingPlan);
}
else
{
responeData.code = 0;
responeData.message = "非本单位用户，不能制定培训计划！";
bool result = false;
if (trainingPlan.DesignerId == Const.sysglyId || trainingPlan.DesignerId == Const.hfnbdId)
{
result = true;
}
else
{
var user = db.Sys_User.FirstOrDefault(e => e.UserId == trainingPlan.DesignerId);
if (user != null && user.UnitId == Const.UnitId_CD)
{
result = true;
}
}
if (result)
// if (CommonService.IsMainUnitOrAdmin(trainingPlan.DesignerId))
{
APITrainingPlanService.SaveTrainingPlan(trainingPlan);
}
else
{
responeData.code = 0;
responeData.message = "非本单位用户，不能制定培训计划！";
}
}
}
catch (Exception ex)
SGGL/WebAPI/Controllers/HSSE/TrainingTaskController.cs
+1 -1
View File
@@ -86,7 +86,7 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
string newPersonId = PersonService.GetPersonIdByUserId(personId);
string newPersonId = PersonService.GetPersonIdByUserIdForApi(personId);
responeData.message = APITrainingTaskService.getTrainingTaskByPlanIdPersonIdCondition(planId, newPersonId);
if (string.IsNullOrEmpty(responeData.message))
{