lpf/xinjiang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自主管理加分项

Browse Source
This commit is contained in:
夏菊
2025-03-04 18:12:07 +08:00
parent 6b48da4eff
commit 5d3273f119
92 changed files with 3646 additions and 4595 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/WebAPI/Controllers/CQMS/CheckListController.cs
+1 -1
View File
@@ -92,7 +92,7 @@ namespace Mvc.Controllers
{
if (string.IsNullOrEmpty(CheckControl.DocCode))
{
string prefix = BLL.ProjectService.GetProjectByProjectId(CheckControl.ProjectId).ProjectCode + "-QC-TCC-XJ-";
string prefix = BLL.ProjectService.GetProjectByProjectId(CheckControl.ProjectId).ProjectCode + "-QC-XJYJ-XJ-";
CheckControl.DocCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.Check_CheckControl", "DocCode",CheckControl.ProjectId, prefix);
}
CheckControl.CheckControlCode = Guid.NewGuid().ToString();
SGGL/WebAPI/Controllers/CQMS/CommenInfoController.cs
+3 -3
View File
@@ -426,7 +426,7 @@ namespace Mvc.Controllers
{
case "checkList":
{
string prefix = BLL.ProjectService.GetProjectByProjectId(projectId).ProjectCode + "-QC-TCC-XJ-";
string prefix = BLL.ProjectService.GetProjectByProjectId(projectId).ProjectCode + "-QC-XJYJ-XJ-";
//res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.Check_CheckControl", "DocCode", prefix);
res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.Check_CheckControl", "DocCode", projectId, prefix);
@@ -434,7 +434,7 @@ namespace Mvc.Controllers
break;
case "jointCheck":
{
string prefix = BLL.ProjectService.GetProjectByProjectId(projectId).ProjectCode + "-QC-TCC-XJ-";
string prefix = BLL.ProjectService.GetProjectByProjectId(projectId).ProjectCode + "-QC-XJYJ-XJ-";
res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetNewCode3", "dbo.Check_JointCheck", "JointCheckCode", prefix);
}
break;
@@ -455,7 +455,7 @@ namespace Mvc.Controllers
break;
case "spotCheck":
{
string prefix = BLL.ProjectService.GetProjectByProjectId(projectId).ProjectCode + "-QC-TCC-XJ-";
string prefix = BLL.ProjectService.GetProjectByProjectId(projectId).ProjectCode + "-QC-XJYJ-XJ-";
//res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetNewCode5", "dbo.Check_SpotCheck", "DocCode", prefix);
res.resultValue = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.Check_CheckControl", "DocCode", projectId, prefix);
SGGL/WebAPI/Controllers/HJGL/ElectrodeRecoveryController.cs
+1 -1
View File
@@ -44,7 +44,7 @@ namespace WebAPI.Controllers.HJGL
{
if (string.IsNullOrEmpty(ElectrodeRecovery.RecoveryCode))
{
string prefix = BLL.ProjectService.GetProjectByProjectId(ElectrodeRecovery.ProjectId).ProjectCode + "-HJ-TCC-LL-";
string prefix = BLL.ProjectService.GetProjectByProjectId(ElectrodeRecovery.ProjectId).ProjectCode + "-HJ-XJYJ-LL-";
ElectrodeRecovery.RecoveryCode = BLL.SQLHelper.RunProcNewId("SpGetNewCode5ByProjectId", "dbo.HJGL_ElectrodeRecovery", "RecoveryCode", ElectrodeRecovery.ProjectId, prefix);
}
ElectrodeRecovery.RecoveryId = Guid.NewGuid().ToString();
SGGL/WebAPI/Controllers/HSSE/BonusScoreSelfManagementController.cs
+212
View File
@@ -0,0 +1,212 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using Aspose.Words;
using BLL;
using Model;
namespace WebAPI.Controllers
{
/// <summary>
/// 自主管理加分项
/// </summary>
public class BonusScoreSelfManagementController : ApiController
{
#region 获取自主管理加分项类型
/// <summary>
/// 获取自主管理加分项类型
/// </summary>
/// <returns></returns>
public Model.ResponeData getBonusScoreTypeList()
{
var responeData = new Model.ResponeData();
try
{
var getDataList = BonusScoreTypeService.GetBonusScoreTypeList();
responeData.data = getDataList.Select(x => new { TypeId = x.Id, TypeName = x.Name });
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 获取自主管理加分项列表
/// <summary>
/// 获取自主管理加分项列表、明细
/// </summary>
/// <returns></returns>
public Model.ResponeData getBonusScoreSelfManagementList(string projectId, string personId, string typeId, int pageIndex)
{
var responeData = new Model.ResponeData();
try
{
var getDataList = BonusScoreSelfManagementService.GetBonusScoreSelfManagementList(projectId, personId, typeId);
int pageCount = getDataList.Count;
if (pageCount > 0 && pageIndex > 0)
{
var getdata = from x in getDataList.Skip(BLL.Funs.PageSize * (pageIndex - 1)).Take(BLL.Funs.PageSize)
select new
{
x.Id,
x.Code,
x.Name,
x.BonusScoreTypeName,
x.Score,
x.CompileDate,
};
responeData.data = new { pageCount, getdata };
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 根据ID获取自主管理加分项详细
/// </summary>
/// <param name="Id">自主管理加分项ID</param>
/// <returns></returns>
public Model.ResponeData getBonusScoreSelfManagementById(string Id)
{
var responeData = new Model.ResponeData();
try
{
var model = BonusScoreSelfManagementService.GetBonusScoreSelfManagementById(Id);
if (model != null)
{
var file = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == Id);
responeData.data = new
{
model.Id,
model.Code,
model.Name,
model.BonusScoreTypeId,
model.BonusScoreTypeName,
model.Content,
model.Remark,
model.CompileDate,
AttachUrl = file != null ? file.AttachUrl : string.Empty
};
}
else
{
responeData.code = 0;
responeData.message = "自主管理加分项不存在";
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 新增、编辑、删除自主管理加分项
/// <summary>
/// 新增、编辑自主管理加分项
/// </summary>
/// <param name="item">自主管理加分项</param>
[HttpPost]
public Model.ResponeData saveBonusScoreSelfManagement([FromBody] Model.BonusScoreSelfManagementItem item)
{
var responeData = new Model.ResponeData();
try
{
Model.Examine_BonusScoreSelfManagement newModel = new Model.Examine_BonusScoreSelfManagement();
newModel.Name = item.Name;
newModel.PersonId = item.PersonId;
newModel.BonusScoreTypeId = item.BonusScoreTypeId;
newModel.Remark = item.Remark;
newModel.Content = item.Content;
var bonusScoreType = BLL.BonusScoreTypeService.GetBonusScoreTypeById(item.BonusScoreTypeId);
if (bonusScoreType != null)
{
newModel.BonusScoreTypeName = bonusScoreType.Name;
newModel.Score = bonusScoreType.Score;
if (!string.IsNullOrWhiteSpace(item.Id))
{
newModel.Id = item.Id;
BLL.BonusScoreSelfManagementService.UpdateBonusScoreSelfManagement(newModel);
}
else
{
newModel.Id = SQLHelper.GetNewID(typeof(Model.Examine_BonusScoreSelfManagement));
newModel.Code = SQLHelper.RunProcNewId2("SpGetNewCode3ByProjectId", "dbo.Examine_BonusScoreSelfManagement", "Code", item.ProjectId);
newModel.CompileDate = DateTime.Now;
//newModel.CompileMan = item.PersonId;
//newModel.CompileMan = Const.hfnbdId;
newModel.ProjectId = item.ProjectId;
BLL.BonusScoreSelfManagementService.AddBonusScoreSelfManagement(newModel);
}
//保存附件
if (!string.IsNullOrEmpty(item.AttachUrl))
{
UploadFileService.SaveAttachUrl(UploadFileService.GetSourceByAttachUrl(item.AttachUrl, 1024, null), item.AttachUrl, Const.BonusScoreSelfManagementMenuId, newModel.Id);
}
else if (!string.IsNullOrWhiteSpace(item.Id))
{//编辑时，附件地址传空时，删除附件信息
CommonService.DeleteAttachFileById(Const.BonusScoreSelfManagementMenuId, newModel.Id);
}
responeData.message = "操作成功";
}
else
{
responeData.code = 0;
responeData.message = "自主管理加分项类型不存在";
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
/// <summary>
/// 删除自主管理加分项
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpPost]
public Model.ResponeData deleteBonusScoreSelfManagementById(string Id)
{
var responeData = new Model.ResponeData();
try
{
BLL.BonusScoreSelfManagementService.DeleteBonusScoreSelfManagementById(Id);
responeData.message = "操作成功";
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
}
}
SGGL/WebAPI/Controllers/UserController.cs
+45 -1
View File
@@ -13,7 +13,7 @@ namespace WebAPI.Controllers
/// </summary>
public class UserController : ApiController
{
#region 根据账号或手机号码登录方法
#region 根据账号或手机号码、身份证号登录方法
/// <summary>
/// 登录方法
/// </summary>
@@ -21,6 +21,50 @@ namespace WebAPI.Controllers
/// <returns></returns>
[HttpPost]
public Model.ResponeData postLoginOn([FromBody] Model.UserItem userInfo)
{
//登录方法 Model.UserItem
var responeData = new Model.ResponeData
{
message = "账号密码不匹配！"
};
try
{
var user = APIUserService.UserLogOn(userInfo);
if (user != null)
{
responeData.message = "登录成功！";
responeData.data = user;
}
else
{
var user1 = APIPersonService.PersonLogOn(userInfo);
if (user1 != null)
{
responeData.message = "登录成功！";
responeData.code = 2;
responeData.data = user1;
}
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
#endregion
#region 根据账号或手机号码登录方法
/// <summary>
/// 登录方法
/// </summary>
/// <param name="userInfo"></param>
/// <returns></returns>
[HttpPost]
public Model.ResponeData postLoginOn2([FromBody] Model.UserItem userInfo)
{
//登录方法 Model.UserItem
var responeData = new Model.ResponeData
SGGL/WebAPI/Filter/TestPermissionAttribute.cs
+33 -22
View File
@@ -30,10 +30,10 @@ namespace WebAPI.Filter
if (lists.FirstOrDefault(x => x == strValues) != null)
{
isOk = true;
isWithOut=true;
isWithOut = true;
}
if (!isOk && token != null)
{
var getUser = BLL.UserService.GetUserByUserId(token.FirstOrDefault());
@@ -50,6 +50,10 @@ namespace WebAPI.Filter
}
}
}
else if (token == null)
{
isOk = false;
}
//FormsAuthenticationTicket authTicket = null;
//if (lists.FirstOrDefault(x => x == strValues) == null && auth!=null&&auth.Count()>0 && !string.IsNullOrEmpty(auth.FirstOrDefault()))
//{
@@ -69,7 +73,9 @@ namespace WebAPI.Filter
//{
// isOk = false;
//}
if (lists.FirstOrDefault(x => x == strValues) == null && actionContext.ActionDescriptor.ControllerDescriptor.ControllerName != "FileUpload" && !System.Web.HttpContext.Current.User.Identity.IsAuthenticated)
//&& !System.Web.HttpContext.Current.User.Identity.IsAuthenticated
if (isOk && lists.FirstOrDefault(x => x == strValues) == null && actionContext.ActionDescriptor.ControllerDescriptor.ControllerName != "FileUpload")
{
isOk = false;
actionContext.Response = actionContext.Request.CreateResponse(System.Net.HttpStatusCode.OK,
@@ -86,7 +92,7 @@ namespace WebAPI.Filter
IDictionary<string, object> arguments = actionContext.ActionArguments; // 获取参数
foreach (KeyValuePair<string, object> item in arguments)
{
if (item.Key == "projectid" || item.Key == "ProjectId" || item.Key == "projectId" || item.Key == "Projectid")
if (item.Key.ToLower() == "projectid")
{
var ProjectItems = APIProjectService.geProjectsByUserId(token.FirstOrDefault());
List<string> projects = new List<string>();
@@ -116,27 +122,27 @@ namespace WebAPI.Filter
/// <summary>
///
/// </summary>
public static List<string> lists = new List<string>
{
public static List<string> lists = new List<string>
{
"SY*SaveRisk",
"SY*SaveEnvironmentProtection",
"SY*SaveEnvironmentProtection",
"SY*SaveLicence",
"SY*SavePromise",
"SY*SaveDataBase",
"SY*SaveMajorHazard",
"SY*SaveDataBase",
"SY*SaveMajorHazard",
"SY*SaveHiddenDangers",
"HazardRealTime*SaveHazardRealTime",
"upload*attendance",
"upload*person",
"User*postLoginOn",
"HazardRealTime*SaveHazardRealTime",
"upload*attendance",
"upload*person",
"User*postLoginOn",
"Person*getPersonInOut",
"Person*getUpdatePersonExchangeTime",
"Person*getPersonDataExchange",
"Person*getPersonByProjectIdIdentityCard",
"Person*getAllPersonDataExchange",
"Person*SaveSitePerson",
"DoorService*getAttendance",
"CommenInfo*FileUpload" ,
"DoorService*getAttendance",
"CommenInfo*FileUpload" ,
"CNCECServer*PostGetCQMSData",
"CNCECServer*PostGetCQMSData_CallBalk",
"CNCECServer*PostGetHJGLData",
@@ -145,23 +151,28 @@ namespace WebAPI.Filter
"CNCECServer*PostGetHSSEData_CallBalk",
"CNCECServer*PostGetSYHSEData",
"CNCECServer*PostGetSYHSEData_CallBalk",
"BaseInfo*getProjectPersonAndSafeHour",
"BaseInfo*getProjectPersonAndSafeHour",
"BaseInfo*getSafeHourFromLastAccident",
"Unit*AddUnit",
"BaseInfo*getSafeHourFromLastAccident",
"BaseInfo*getSafeHourFromLastAccident",
"HazardRegister*getHazardRegisterTotalCount",
"Person*SaveAndUpdateSitePerson",
"Person*addToBlack",
"Person*addToBlack",
"Person*getPersonData", "Person*getPersonInOutList",
"Person*getPersonAllData",
"HazardRegister*getHazardRegisterByProjectIdStates",
"Person*getPersonPresenceData",
"Vehicle*getVehicleDataExchange",
"Vehicle*getUpdateVehicleExchangeTime",
"Vehicle*getVehicleInOut",
"Vehicle*getVehicleInOut",
"Person*getPersonPresenceData",
"User*getUserByProjectIdUnitIdQuery",
"Environmental*AddMonitoring"
"Environmental*AddMonitoring",
"BonusScoreSelfManagement*getBonusScoreTypeList",
"BonusScoreSelfManagement*getBonusScoreSelfManagementList",
"BonusScoreSelfManagement*getBonusScoreSelfManagementById",
"BonusScoreSelfManagement*saveBonusScoreSelfManagement",
"BonusScoreSelfManagement*deleteBonusScoreSelfManagementById"
};
@@ -178,9 +189,9 @@ namespace WebAPI.Filter
isOk = true;
}
if (!isOk)
{
if (BLL.Funs.DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
SGGL/WebAPI/WebAPI.csproj
+1
View File
@@ -175,6 +175,7 @@
<Compile Include="Controllers\HSSE\GoodsManageController.cs" />
<Compile Include="Controllers\HSSE\HazardRealTimeController.cs" />
<Compile Include="Controllers\HSSE\MaterialController.cs" />
<Compile Include="Controllers\HSSE\BonusScoreSelfManagementController.cs" />
<Compile Include="Controllers\HSSE\TrainTestRecordController.cs" />
<Compile Include="Controllers\Person\PersonCheckController.cs" />
<Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />