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

20210520

Browse Source
This commit is contained in:
杨红卫
2021-05-20 17:16:01 +08:00
parent f901e87a6e
commit e7cb804684
219 changed files with 17315 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/APIBaseInfoService.cs
+1 -1
View File
@@ -39,7 +39,7 @@ namespace BLL
{
BaseInfoId = x.ProjectId,
BaseInfoCode = x.ProjectCode,
BaseInfoName = x.ProjectName
BaseInfoName = x.ProjectName
}
).ToList();
return getDataLists;
SGGL/BLL/API/APIPersonService.cs
+24 -21
View File
@@ -1551,29 +1551,32 @@ namespace BLL
/// <returns></returns>
public static List<Model.PersonInOutItem> getPersonInOutLists(string projectId, string unitId, DateTime startTimeD, DateTime endTimeD)
{
var personInOuts = from x in Funs.DB.SitePerson_PersonInOut
join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
where x.ProjectId == projectId && x.ChangeTime >= startTimeD && x.ChangeTime <= endTimeD
select new Model.PersonInOutItem
{
PersonId = x.PersonId,
PersonName = y.PersonName,
ProjectId = x.ProjectId,
UnitId = y.UnitId,
UnitName = Funs.DB.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
WorkPostId = y.WorkPostId,
WorkPostName = Funs.DB.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
IsIn = x.IsIn,
IsInName = x.IsIn == true ? "进场" : "出场",
ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
ChangeTimeD = x.ChangeTime,
};
if (!string.IsNullOrEmpty(unitId))
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
personInOuts = personInOuts.Where(x => x.UnitId == unitId);
}
var personInOuts = from x in db.SitePerson_PersonInOut
join y in db.SitePerson_Person on x.PersonId equals y.PersonId
where x.ProjectId == projectId && x.ChangeTime >= startTimeD && x.ChangeTime <= endTimeD
select new Model.PersonInOutItem
{
PersonId = x.PersonId,
PersonName = y.PersonName,
ProjectId = x.ProjectId,
UnitId = y.UnitId,
UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
WorkPostId = y.WorkPostId,
WorkPostName = db.Base_WorkPost.First(z => z.WorkPostId == y.WorkPostId).WorkPostName,
IsIn = x.IsIn,
IsInName = x.IsIn == true ? "进场" : "出场",
ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime),
ChangeTimeD = x.ChangeTime,
};
if (!string.IsNullOrEmpty(unitId))
{
personInOuts = personInOuts.Where(x => x.UnitId == unitId);
}
return personInOuts.ToList();
return personInOuts.ToList();
}
}
#endregion
SGGL/BLL/API/APIUserService.cs
+63
View File
@@ -265,5 +265,68 @@ namespace BLL
}
}
}
/// <summary>
/// 根据单位类型获取用户信息
/// </summary>
/// <param name="projectId"></param>
/// <param name="userIds"></param>
/// <param name="strParam"></param>
/// <returns></returns>
public static List<Model.UserItem> getUserByProjectIdUserIdsQuery(string projectId, string userIds, string strParam)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
List<Model.UserItem> getDataList = new List<Model.UserItem>();
List<string> userList = Funs.GetStrListByStr(userIds, ',');
if (userList.Count() > 0)
{
var getDataLists = (from x in db.Sys_User
join y in db.Project_ProjectUser on x.UserId equals y.UserId
where y.ProjectId == projectId
select new Model.UserItem
{
UserId = x.UserId,
Account = x.Account,
UserCode = x.UserCode,
Password = x.Password,
UserName = x.UserName,
RoleId = y.RoleId,
RoleName = RoleService.getRoleNamesRoleIds(y.RoleId),
UnitId = y.UnitId,
UnitName = db.Base_Unit.First(z => z.UnitId == y.UnitId).UnitName,
LoginProjectId = y.ProjectId,
LoginProjectName = db.Base_Project.First(z => z.ProjectId == y.ProjectId).ProjectName,
IdentityCard = x.IdentityCard,
Email = x.Email,
Telephone = x.Telephone,
IsOffice = x.IsOffice,
SignatureUrl = x.SignatureUrl.Replace('\\', '/'),
});
if (!string.IsNullOrEmpty(strParam))
{
getDataLists = getDataLists.Where(x => x.UserName.Contains(strParam));
}
string unitId = Const.UnitId_CWCEC;
var unitList = (from x in db.Sys_User where userList.Contains(x.UserId) select x.UnitId).Distinct().ToList();
if (unitList.Count() == 1)
{
unitId = unitList.FirstOrDefault();
getDataList = getDataLists.Where(x => x.UnitId == unitId).ToList();
}
else if (!unitList.Contains(unitId))
{
getDataList = getDataLists.Where(x => unitList.Contains(x.UnitId)).ToList();
}
else
{
getDataList = getDataLists.Where(x => x.UnitId == unitId).ToList();
}
}
return getDataList.OrderBy(x => x.UnitName).ThenBy(x => x.UserName).ToList();
}
}
}
}
SGGL/BLL/BLL.csproj
+7
View File
@@ -515,8 +515,15 @@
<Compile Include="HSSE\Technique\SpecialSchemeService.cs" />
<Compile Include="HSSE\Technique\Technique_CheckItemDetailService.cs" />
<Compile Include="HSSE\Technique\Technique_CheckItemSetService.cs" />
<Compile Include="JDGL\Check\ElectricalCompletionService.cs" />
<Compile Include="JDGL\Check\EquipmentCompletionService.cs" />
<Compile Include="JDGL\Check\MeterCompletionService.cs" />
<Compile Include="JDGL\Check\PipelineCompletionService.cs" />
<Compile Include="JDGL\Check\ProgressCompletionService.cs" />
<Compile Include="JDGL\Check\QuantityCompletionService.cs" />
<Compile Include="JDGL\Check\QuantityListService.cs" />
<Compile Include="JDGL\Check\SteelStructureCompletionService.cs" />
<Compile Include="JDGL\Check\UndergroundPipeCompletionService.cs" />
<Compile Include="JDGL\WBSCompleteAndReal\WBSReportService.cs" />
<Compile Include="JDGL\WBS\CnProfessionInitService.cs" />
<Compile Include="JDGL\WBS\CnProfessionService.cs" />
SGGL/BLL/BaseInfo/SteelService.cs
+1 -1
View File
@@ -271,7 +271,7 @@ namespace BLL
/// <param name="isShowPlease"></param>
public static void InitSteel(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "Text";
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = GetSteelList();
dropName.DataBind();
SGGL/BLL/Common/Const.cs
+210 -50
View File
@@ -6,7 +6,7 @@ using System.Text;
namespace BLL
{
public static class Const
{
{
#region 查询字段：系统设置
/// <summary>
/// 系统管理员ID
@@ -57,7 +57,7 @@ namespace BLL
/// 入场培训类型ID
/// </summary>
public const string EntryTrainTypeId = "dfb6a37e-4412-4ba9-ad59-3bc505bc21f7";
/// <summary>
/// 微信订阅模板ID
/// </summary>
@@ -217,7 +217,7 @@ namespace BLL
/// </summary>
public const string ProjectState_3 = "3";
#endregion
#region 项目单位类型
/// <summary>
/// 总包
@@ -230,11 +230,11 @@ namespace BLL
/// <summary>
/// 监理
/// </summary>
public const string ProjectUnitType_3 = "3";
public const string ProjectUnitType_3 = "3";
/// <summary>
/// 业主
/// </summary>
public const string ProjectUnitType_4 = "4";
public const string ProjectUnitType_4 = "4";
/// <summary>
/// 检测单位
/// </summary>
@@ -272,22 +272,117 @@ namespace BLL
/// <summary>
/// HSE工程师岗位Id
/// </summary>
public static string WorkPost_HSSEEngineer = "9b15af2e-6131-462c-9f8a-71533957ca0e";
public static string WorkPost_HSSEEngineer = "9b15af2e-6131-462c-9f8a-71533957ca0e";
/// <summary>
/// HSE经理岗位Id
/// </summary>
public static string WorkPost_SafetyManager = "e426e560-9906-4aba-843e-2daef9ebeb05";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder = "19B8F2A9-28D3-4F20-867A-1B2237C2E228";
/// <summary>
/// 无损检测工岗位Id
/// </summary>
public static string WorkPost_Checker = "595999E9-75A8-4064-9BD1-9EE02F236297";
/// <summary>
/// 木工岗位Id
/// </summary>
public static string WorkPost_Carpentry = "4ACC633F-BD81-4CBB-9058-A4E4DFFE7881";
/// <summary>
/// 钢筋工岗位Id
/// </summary>
public static string WorkPost_SteelWorker = "E735CF61-096B-4134-B6D4-766B4B8EF790";
/// <summary>
/// 瓦工岗位Id
/// </summary>
public static string WorkPost_Bricklayer = "5E07B570-2E2C-470E-8379-7FEAECF8F62A";
/// <summary>
/// 混凝土工岗位Id
/// </summary>
public static string WorkPost_ConcreteWorker = "14f1fa16-965e-427d-a342-edbb3230ae3c";
/// <summary>
/// 钳工岗位Id
/// </summary>
public static string WorkPost_Fitter1 = "c7431c69-fb64-4960-a9da-2c7b8d380097";
/// <summary>
/// 钳工岗位Id
/// </summary>
public static string WorkPost_Fitter2 = "F49B8430-AC71-40B2-86A3-6825C73F59E5";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder1 = "16c736b6-7ee1-4069-8b57-1a658e6a615f";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder2 = "36644e8c-0593-4ca7-880f-6a55510c51a1";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder3 = "5383f797-da4a-4547-b2aa-905a99c1bcfa";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder4 = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder5 = "F8CD2EB0-1D46-422B-A21C-331669B2CF6C";
/// <summary>
/// 铆工岗位Id
/// </summary>
public static string WorkPost_Riveter = "338A8CB9-FB41-4E09-A2BD-ADD27BDBE9DE";
/// <summary>
/// 管工岗位Id
/// </summary>
public static string WorkPost_Foreman = "edc167d9-e2ed-4ed9-8c4d-9c179ff0286f";
/// <summary>
/// 电工岗位Id
/// </summary>
public static string WorkPost_Electrician1 = "29999836-fcdd-43f5-ab6c-77c5e0d6ce0d";
/// <summary>
/// 电工岗位Id
/// </summary>
public static string WorkPost_Electrician2 = "5CBA1BD0-B66B-4362-8CF3-CEA9D3F425DB";
/// <summary>
/// 电工岗位Id
/// </summary>
public static string WorkPost_Electrician3 = "bb71b5f6-d6c6-49d8-83aa-577c6f0808a0";
/// <summary>
/// 仪表工岗位Id
/// </summary>
public static string WorkPost_Instrumentalist = "EFBA9A9A-FF98-47B4-949E-951A8F4E42E5";
/// <summary>
/// 防腐保温工岗位Id
/// </summary>
public static string WorkPost_AnticorrosionWorker = "010CBFD3-51B9-4C48-A6F8-15326D810AA5";
/// <summary>
/// 其他岗位Id
/// </summary>
public static string WorkPost_Other = "71D6437A-6EE4-434A-A68C-BBB2B00FB6C6";
#endregion
#region 系统环境设置常量
@@ -585,7 +680,7 @@ namespace BLL
/// 党建群团
/// </summary>
public const string Menu_Party = "Menu_Party";
/*项目*/
/// <summary>
/// 项目设置
@@ -674,6 +769,8 @@ namespace BLL
/// </summary>
public const string ActionPlan_ProjectManagerRuleMenuId = "ec0942af-b1ae-4676-8442-4be3a5e22ea0";
#region 本部检查
/// <summary>
/// 检查通知单
@@ -970,7 +1067,7 @@ namespace BLL
/// <summary>
/// 安全组织体系
/// </summary>
public const string HSSEOrganizeMenuId = "8IDKGJE2-09B1-6UIO-3EFM-5TGED48F0001";
public const string HSSEOrganizeMenuId = "8IDKGJE2-09B1-6UIO-3EFM-5TGED48F0001";
/// <summary>
/// 安全管理机构
/// </summary>
@@ -1212,7 +1309,7 @@ namespace BLL
public const string ServerSafeUnitReportMenuId = "2C673125-AAA4-4F41-A827-0F04DFE55DED";
#endregion
#region 企业安全大检查
/// <summary>
/// 安全监督检查报告
@@ -1441,15 +1538,15 @@ namespace BLL
/// <summary>
/// 安全组织机构
/// </summary>
public const string ProjectSafetyOrganizationMenuId = "1EDD072E-473A-4CDB-A2D3-E401C146B2B2";
public const string ProjectSafetyOrganizationMenuId = "1EDD072E-473A-4CDB-A2D3-E401C146B2B2";
/// <summary>
/// 安全体系
/// </summary>
public const string ProjectSafetySystemMenuId = "21C779D6-269B-4CB7-AFFB-F59958AC0EF0";
public const string ProjectSafetySystemMenuId = "21C779D6-269B-4CB7-AFFB-F59958AC0EF0";
/// <summary>
/// 安全制度
/// </summary>
public const string ProjectSafetyInstitutionMenuId = "9D04CD8B-575C-4854-B8B0-F90CEEB75815";
public const string ProjectSafetyInstitutionMenuId = "9D04CD8B-575C-4854-B8B0-F90CEEB75815";
/// <summary>
/// 安全管理组织机构
/// </summary>
@@ -1654,8 +1751,8 @@ namespace BLL
/// <summary>
/// 现场人员统计
/// </summary>
public const string PersonStatisticMenuId = "7D36E853-CC79-48B9-9E7F-E34797B4E87E";
public const string PersonStatisticMenuId = "7D36E853-CC79-48B9-9E7F-E34797B4E87E";
/// <summary>
/// 人员变化
/// </summary>
@@ -1772,7 +1869,7 @@ namespace BLL
/// <summary>
/// HSSE专项检查
/// </summary>
public const string ProjectCheckSpecialMenuId = "1B08048F-93ED-4E84-AE65-DB7917EA2DFB";
public const string ProjectCheckSpecialMenuId = "1B08048F-93ED-4E84-AE65-DB7917EA2DFB";
/// <summary>
/// HSSE综合检查
/// </summary>
@@ -1784,11 +1881,11 @@ namespace BLL
/// <summary>
/// 开工前HSSE检查
/// </summary>
public const string ProjectCheckWorkMenuId = "9212291A-FBC5-4F6D-A5F6-60BFF4E30F6F";
public const string ProjectCheckWorkMenuId = "9212291A-FBC5-4F6D-A5F6-60BFF4E30F6F";
/// <summary>
/// 季节性/节假日HSSE检查
/// </summary>
public const string ProjectCheckHolidayMenuId = "0D23A707-ADA0-4C2B-9665-611134243529";
public const string ProjectCheckHolidayMenuId = "0D23A707-ADA0-4C2B-9665-611134243529";
/// <summary>
/// 危险因素统计分析
/// </summary>
@@ -1898,11 +1995,11 @@ namespace BLL
/// <summary>
/// HSSE月例会
/// </summary>
public const string ProjectMonthMeetingMenuId = "D5DD5EBD-A5F2-4A43-BA4C-E9A242B43684";
public const string ProjectMonthMeetingMenuId = "D5DD5EBD-A5F2-4A43-BA4C-E9A242B43684";
/// <summary>
/// HSSE专题会议
/// </summary>
public const string ProjectSpecialMeetingMenuId = "BB6CEC48-283B-46AD-BEDD-F964D261698F";
public const string ProjectSpecialMeetingMenuId = "BB6CEC48-283B-46AD-BEDD-F964D261698F";
/// <summary>
/// 其他会议记录
/// </summary>
@@ -1994,11 +2091,11 @@ namespace BLL
/// <summary>
/// 合同HSE费用及支付台账
/// </summary>
public const string ProjectCostLedgerMenuId = "19C1370F-92C0-4E31-87B4-8BADA74113E4";
public const string ProjectCostLedgerMenuId = "19C1370F-92C0-4E31-87B4-8BADA74113E4";
/// <summary>
/// HSSE费用统计表
/// </summary>
public const string TC_CostMenuId = "89B42B7B-8AEE-4199-923E-81A602FC77E0";
public const string TC_CostMenuId = "89B42B7B-8AEE-4199-923E-81A602FC77E0";
/// <summary>
/// HSSE物资管理
/// </summary>
@@ -2006,11 +2103,11 @@ namespace BLL
/// <summary>
/// 物资入库管理
/// </summary>
public const string GoodsIn2MenuId = "FDA02FCA-4E23-469E-AB26-2D625D0E579A";
public const string GoodsIn2MenuId = "FDA02FCA-4E23-469E-AB26-2D625D0E579A";
/// <summary>
/// 物资出库管理
/// </summary>
public const string GoodsOut2MenuId = "881D6FE5-C281-4DA8-80CD-D7C6624796FC";
public const string GoodsOut2MenuId = "881D6FE5-C281-4DA8-80CD-D7C6624796FC";
/// <summary>
/// 物资库存管理
/// </summary>
@@ -2037,19 +2134,19 @@ namespace BLL
/// <summary>
/// HSSE检查类别设置
/// </summary>
public const string CheckTypeSetMenuId = "7353F3C1-0EAF-4DB7-86B4-93E3B96805F8";
public const string CheckTypeSetMenuId = "7353F3C1-0EAF-4DB7-86B4-93E3B96805F8";
/// <summary>
/// HSSE行政管理检查记录
/// </summary>
public const string ManageCheckMenuId = "A25EB19A-F06E-4AAF-A589-E2B8F7FA7857";
public const string ManageCheckMenuId = "A25EB19A-F06E-4AAF-A589-E2B8F7FA7857";
/// <summary>
/// 现场车辆管理
/// </summary>
public const string CarManagerMenuId = "CF82805A-84BE-400A-B939-83F7612D76F5";
public const string CarManagerMenuId = "CF82805A-84BE-400A-B939-83F7612D76F5";
/// <summary>
/// 现场驾驶员管理
/// </summary>
public const string DriverManagerMenuId = "754C23CA-F1BC-4F44-9D34-B185099EDCA0";
public const string DriverManagerMenuId = "754C23CA-F1BC-4F44-9D34-B185099EDCA0";
/// <summary>
/// 职业健康管理
/// </summary>
@@ -2064,7 +2161,7 @@ namespace BLL
/// <summary>
/// 月度安全评比
/// </summary>
public const string ProjectMonthlyRatingMenuId = "293FD782-7B39-4F0F-A826-CA790A70CCC7";
public const string ProjectMonthlyRatingMenuId = "293FD782-7B39-4F0F-A826-CA790A70CCC7";
/// <summary>
/// 全国安全月
/// </summary>
@@ -2078,7 +2175,7 @@ namespace BLL
/// </summary>
public const string ProjectOtherActivitiesMenuId = "446D702B-F0C1-4D12-A862-0B8317D95928";
#endregion
#region 职业健康
/// <summary>
/// 危害检测
@@ -2124,7 +2221,7 @@ namespace BLL
/// HSSE管理周报
/// </summary>
public const string ProjectManagerWeekMenuId = "AE118E9C-C309-43B7-A198-8CA90A8D98EB";
/// <summary>
/// 月报(赛鼎)
/// </summary>
@@ -2172,7 +2269,7 @@ namespace BLL
/// <summary>
/// 企业安全管理资料
/// </summary>
public const string ProjectSafetyDataMenuId = "54A3E23A-DAC7-484B-8C97-40AD785688FC";
public const string ProjectSafetyDataMenuId = "54A3E23A-DAC7-484B-8C97-40AD785688FC";
/// <summary>
/// HSSE日志暨管理数据收集
/// </summary>
@@ -2206,7 +2303,7 @@ namespace BLL
/// </summary>
public const string ProjectHSEDiaryMenuId = "8E5B4A8E-B06E-4C8A-A2C8-1091A9BCAF72";
#endregion
#region HSSE绩效评价管理
/// <summary>
/// HSSE分包方绩效评价
@@ -2287,27 +2384,27 @@ namespace BLL
/// <summary>
/// HSSE宣传活动
/// </summary>
public const string ProjectPromotionalActivitiesMenuId = "16092FE7-938B-4713-8084-4FBFA030F386";
public const string ProjectPromotionalActivitiesMenuId = "16092FE7-938B-4713-8084-4FBFA030F386";
/// <summary>
/// 项目图片
/// </summary>
public const string ProjectPictureMenuId = "B58179BE-FE6E-4E91-84FC-D211E4692354";
public const string ProjectPictureMenuId = "B58179BE-FE6E-4E91-84FC-D211E4692354";
/// <summary>
/// 一般来文管理
/// </summary>
public const string ReceiveFileManagerMenuId = "4F5C00F3-DA7D-4B2D-B1EF-310DFFCA77DD";
public const string ReceiveFileManagerMenuId = "4F5C00F3-DA7D-4B2D-B1EF-310DFFCA77DD";
/// <summary>
/// 项目文件夹
/// </summary>
public const string ProjectFolderMenuId = "05C6C2AF-3B0B-4BF0-A8CE-1FC15DAC3C54";
public const string ProjectFolderMenuId = "05C6C2AF-3B0B-4BF0-A8CE-1FC15DAC3C54";
/// <summary>
/// 文件柜1
/// </summary>
public const string ProjectFileCabinetAMenuId = "C69B7409-BE1E-4754-AC90-57B56EEE198B";
public const string ProjectFileCabinetAMenuId = "C69B7409-BE1E-4754-AC90-57B56EEE198B";
/// <summary>
/// 文件柜2
/// </summary>
public const string ProjectFileCabinetBMenuId = "200019A4-E24F-4C87-8C52-9970F78DBF73";
public const string ProjectFileCabinetBMenuId = "200019A4-E24F-4C87-8C52-9970F78DBF73";
/// <summary>
/// 信息统计
/// </summary>
@@ -2824,6 +2921,34 @@ namespace BLL
/// 人员初步规划导入模板
/// </summary>
public const string PersonPlanTemplateUrl = "File\\Excel\\DataIn\\人员初步规划导入模板.xls";
/// <summary>
/// 项目进度完成情况导入模版文件原始的虚拟路径
/// </summary>
public const string QuantityCompletionTemplateUrl = "File\\Excel\\DataIn\\项目进度完成情况导入模板.xls";
/// <summary>
/// 钢结构完成情况导入模版文件原始的虚拟路径
/// </summary>
public const string SteelStructureCompletionTemplateUrl = "File\\Excel\\DataIn\\钢结构完成情况导入模板.xls";
/// <summary>
/// 设备完成情况导入模版文件原始的虚拟路径
/// </summary>
public const string EquipmentCompletionTemplateUrl = "File\\Excel\\DataIn\\设备完成情况导入模板.xls";
/// <summary>
/// 管道完成情况导入模版文件原始的虚拟路径
/// </summary>
public const string PipelineCompletionTemplateUrl = "File\\Excel\\DataIn\\管道完成情况导入模板.xls";
/// <summary>
/// 电气完成情况导入模版文件原始的虚拟路径
/// </summary>
public const string ElectricalCompletionTemplateUrl = "File\\Excel\\DataIn\\电气完成情况导入模板.xls";
/// <summary>
/// 仪表完成情况导入模版文件原始的虚拟路径
/// </summary>
public const string MeterCompletionTemplateUrl = "File\\Excel\\DataIn\\仪表完成情况导入模板.xls";
/// <summary>
/// 全厂地下管网完成情况导入模版文件原始的虚拟路径
/// </summary>
public const string UndergroundPipeCompletionTemplateUrl = "File\\Excel\\DataIn\\全厂地下管网完成情况导入模板.xls";
#endregion
#region 绩效考核模板文件路径
@@ -2881,19 +3006,19 @@ namespace BLL
/// <summary>
/// 职工伤亡事故原因分析报表
/// </summary>
public const string Information_AccidentCauseReportId = "2";
public const string Information_AccidentCauseReportId = "2";
/// <summary>
/// 安全生产数据季报
/// </summary>
public const string Information_SafetyQuarterlyReportId = "3";
public const string Information_SafetyQuarterlyReportId = "3";
/// <summary>
/// 应急演练开展情况季报表
/// </summary>
public const string Information_DrillConductedQuarterlyReportId = "4";
public const string Information_DrillConductedQuarterlyReportId = "4";
/// <summary>
/// 应急演练工作计划半年报表
/// </summary>
public const string Information_DrillPlanHalfYearReportId = "5";
public const string Information_DrillPlanHalfYearReportId = "5";
/// <summary>
/// 培训记录
/// </summary>
@@ -2901,7 +3026,7 @@ namespace BLL
/// <summary>
/// 环境危险源辨识与评价打印报表
/// </summary>
public const string EnvironmentalRiskReportId = "12";
public const string EnvironmentalRiskReportId = "12";
/// <summary>
/// 环境危险源辨识与评价（重要环境因素）打印报表
/// </summary>
@@ -2909,7 +3034,7 @@ namespace BLL
/// <summary>
/// 职业健康安全危险源辨识与评价打印报表
/// </summary>
public const string HazardListReportId = "14";
public const string HazardListReportId = "14";
/// <summary>
/// 职业健康安全危险源辨识与评价（重大危险源）打印报表
/// </summary>
@@ -4016,7 +4141,7 @@ namespace BLL
/// <summary>
/// 审批完成
/// </summary>
public const string ConstructionPlan_Complete= "5";
public const string ConstructionPlan_Complete = "5";
#endregion
#region 总承包商施工报告
@@ -4512,6 +4637,11 @@ namespace BLL
/// </summary>
public const string RectificationMeasureMenuId = "0629BAB1-DB1C-42CE-A333-49F3813617D7";
/// <summary>
/// 进度完成情况
/// </summary>
public const string ProgressCompletionMenuId = "F3AA42B3-5776-4992-A625-1216C579FEDE";
/// <summary>
/// 工程量清单设置
/// </summary>
@@ -4521,6 +4651,36 @@ namespace BLL
/// 工程量完成情况
/// </summary>
public const string QuantityCompletionMenuId = "2AE9D982-A499-497F-8F54-ADDA5856887E";
/// <summary>
/// 钢结构完成情况
/// </summary>
public const string SteelStructureCompletionMenuId = "4ACA0647-4D44-462E-8277-1EF9F100566A";
/// <summary>
/// 设备完成情况
/// </summary>
public const string EquipmentCompletionMenuId = "92FD1845-F56C-4111-8BA0-91838A18B750";
/// <summary>
/// 管道完成情况
/// </summary>
public const string PipelineCompletionMenuId = "9AE07A76-3A54-4414-BC8C-C86A18C737BA";
/// <summary>
/// 电气完成情况
/// </summary>
public const string ElectricalCompletionMenuId = "8A8A1050-F227-42ED-9456-8CB5ECA36512";
/// <summary>
/// 仪表完成情况
/// </summary>
public const string MeterCompletionMenuId = "7EC1FBAF-BEC9-46CD-9E3B-0D0093B4E1C2";
/// <summary>
/// 全厂地下管网完成情况
/// </summary>
public const string UndergroundPipeCompletionMenuId = "C7037A5D-D8A6-4C1C-A5B8-2083C31C0A7B";
#endregion
/// <summary>
SGGL/BLL/Common/Funs.cs
+42 -5
View File
@@ -120,6 +120,24 @@ namespace BLL
set;
} = 15;
///// <summary>
///// 数据库上下文。
///// </summary>
//public static SGGLDB DB
//{
// get
// {
// if (!DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
// {
// DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, new SGGLDB(connString));
// }
// // DBList[System.Threading.Thread.CurrentThread.ManagedThreadId].CommandTimeout = 1200;
// return DBList[System.Threading.Thread.CurrentThread.ManagedThreadId];
// }
//}
private static object locker = new object();
/// <summary>
/// 数据库上下文。
/// </summary>
@@ -127,13 +145,32 @@ namespace BLL
{
get
{
if (!DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
lock (locker)
{
DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, new SGGLDB(connString));
}
try
{
if (!DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
{
DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, new SGGLDB(connString));
}
// DBList[System.Threading.Thread.CurrentThread.ManagedThreadId].CommandTimeout = 1200;
return DBList[System.Threading.Thread.CurrentThread.ManagedThreadId];
// DBList[System.Threading.Thread.CurrentThread.ManagedThreadId].CommandTimeout = 1200;
return DBList[System.Threading.Thread.CurrentThread.ManagedThreadId];
}
catch
{
var db = new SGGLDB(connString);
if (DBList.ContainsKey(System.Threading.Thread.CurrentThread.ManagedThreadId))
{
DBList[System.Threading.Thread.CurrentThread.ManagedThreadId] = db;
}
else
{
DBList.Add(System.Threading.Thread.CurrentThread.ManagedThreadId, db);
}
return db;
}
}
}
}
SGGL/BLL/HSSE/HiddenInspection/HSSE_Hazard_HazardRegisterService.cs
+2
View File
@@ -57,6 +57,7 @@ namespace BLL
newHazardRegister.ResponsibleMan = hazardRegister.ResponsibleMan;
newHazardRegister.CheckManId = hazardRegister.CheckManId;
newHazardRegister.CheckTime = hazardRegister.CheckTime;
newHazardRegister.Requirements = hazardRegister.Requirements;
newHazardRegister.RectificationPeriod = hazardRegister.RectificationPeriod;
newHazardRegister.ImageUrl = hazardRegister.ImageUrl;
newHazardRegister.RectificationImageUrl = hazardRegister.RectificationImageUrl;
@@ -91,6 +92,7 @@ namespace BLL
newHazardRegister.AttachUrl = hazardRegister.AttachUrl;
newHazardRegister.ProjectId = hazardRegister.ProjectId;
newHazardRegister.States = hazardRegister.States;
newHazardRegister.Requirements = hazardRegister.Requirements;
newHazardRegister.IsEffective = hazardRegister.IsEffective;
newHazardRegister.ResponsibleMan = hazardRegister.ResponsibleMan;
newHazardRegister.CheckManId = hazardRegister.CheckManId;
SGGL/BLL/JDGL/Check/ElectricalCompletionService.cs
+83
View File
@@ -0,0 +1,83 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 电气完成情况
/// </summary>
public class ElectricalCompletionService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取电气完成情况
/// </summary>
/// <param name="electricalCompletionId"></param>
/// <returns></returns>
public static Model.JDGL_ElectricalCompletion GetElectricalCompletionById(string electricalCompletionId)
{
return Funs.DB.JDGL_ElectricalCompletion.FirstOrDefault(e => e.ElectricalCompletionId == electricalCompletionId);
}
/// <summary>
/// 添加电气完成情况
/// </summary>
/// <param name="electricalCompletion"></param>
public static void AddElectricalCompletion(Model.JDGL_ElectricalCompletion electricalCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_ElectricalCompletion newElectricalCompletion = new Model.JDGL_ElectricalCompletion
{
ElectricalCompletionId = electricalCompletion.ElectricalCompletionId,
ProjectId = electricalCompletion.ProjectId,
UnitId = electricalCompletion.UnitId,
Name = electricalCompletion.Name,
Unit = electricalCompletion.Unit,
TotalNum = electricalCompletion.TotalNum,
ThisNum = electricalCompletion.ThisNum,
CompileMan = electricalCompletion.CompileMan,
CompileDate = electricalCompletion.CompileDate,
StartDate = electricalCompletion.StartDate,
EndDate = electricalCompletion.EndDate
};
db.JDGL_ElectricalCompletion.InsertOnSubmit(newElectricalCompletion);
db.SubmitChanges();
}
/// <summary>
/// 修改电气完成情况
/// </summary>
/// <param name="electricalCompletion"></param>
public static void UpdateElectricalCompletion(Model.JDGL_ElectricalCompletion electricalCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_ElectricalCompletion newElectricalCompletion = db.JDGL_ElectricalCompletion.FirstOrDefault(e => e.ElectricalCompletionId == electricalCompletion.ElectricalCompletionId);
if (newElectricalCompletion != null)
{
newElectricalCompletion.TotalNum = electricalCompletion.TotalNum;
newElectricalCompletion.ThisNum = electricalCompletion.ThisNum;
newElectricalCompletion.CompileMan = electricalCompletion.CompileMan;
newElectricalCompletion.CompileDate = electricalCompletion.CompileDate;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除电气完成情况
/// </summary>
/// <param name="electricalCompletionId"></param>
public static void DeleteElectricalCompletionById(string electricalCompletionId)
{
Model.SGGLDB db = Funs.DB;
var electricalCompletion = (from x in db.JDGL_ElectricalCompletion where x.ElectricalCompletionId == electricalCompletionId select x).FirstOrDefault();
if (electricalCompletion != null)
{
db.JDGL_ElectricalCompletion.DeleteOnSubmit(electricalCompletion);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/JDGL/Check/EquipmentCompletionService.cs
+83
View File
@@ -0,0 +1,83 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 设备完成情况
/// </summary>
public class EquipmentCompletionService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取设备完成情况
/// </summary>
/// <param name="equipmentCompletionId"></param>
/// <returns></returns>
public static Model.JDGL_EquipmentCompletion GetEquipmentCompletionById(string equipmentCompletionId)
{
return Funs.DB.JDGL_EquipmentCompletion.FirstOrDefault(e => e.EquipmentCompletionId == equipmentCompletionId);
}
/// <summary>
/// 添加设备完成情况
/// </summary>
/// <param name="equipmentCompletion"></param>
public static void AddEquipmentCompletion(Model.JDGL_EquipmentCompletion equipmentCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_EquipmentCompletion newEquipmentCompletion = new Model.JDGL_EquipmentCompletion
{
EquipmentCompletionId = equipmentCompletion.EquipmentCompletionId,
ProjectId = equipmentCompletion.ProjectId,
UnitId = equipmentCompletion.UnitId,
TotalNum = equipmentCompletion.TotalNum,
ArrivalNum = equipmentCompletion.ArrivalNum,
ThisNum = equipmentCompletion.ThisNum,
CompileMan = equipmentCompletion.CompileMan,
CompileDate = equipmentCompletion.CompileDate,
StartDate = equipmentCompletion.StartDate,
EndDate = equipmentCompletion.EndDate
};
db.JDGL_EquipmentCompletion.InsertOnSubmit(newEquipmentCompletion);
db.SubmitChanges();
}
/// <summary>
/// 修改设备完成情况
/// </summary>
/// <param name="equipmentCompletion"></param>
public static void UpdateEquipmentCompletion(Model.JDGL_EquipmentCompletion equipmentCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_EquipmentCompletion newEquipmentCompletion = db.JDGL_EquipmentCompletion.FirstOrDefault(e => e.EquipmentCompletionId == equipmentCompletion.EquipmentCompletionId);
if (newEquipmentCompletion != null)
{
newEquipmentCompletion.TotalNum = equipmentCompletion.TotalNum;
newEquipmentCompletion.ArrivalNum = equipmentCompletion.ArrivalNum;
newEquipmentCompletion.ThisNum = equipmentCompletion.ThisNum;
newEquipmentCompletion.CompileMan = equipmentCompletion.CompileMan;
newEquipmentCompletion.CompileDate = equipmentCompletion.CompileDate;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除设备完成情况
/// </summary>
/// <param name="equipmentCompletionId"></param>
public static void DeleteEquipmentCompletionById(string equipmentCompletionId)
{
Model.SGGLDB db = Funs.DB;
var equipmentCompletion = (from x in db.JDGL_EquipmentCompletion where x.EquipmentCompletionId == equipmentCompletionId select x).FirstOrDefault();
if (equipmentCompletion != null)
{
db.JDGL_EquipmentCompletion.DeleteOnSubmit(equipmentCompletion);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/JDGL/Check/MeterCompletionService.cs
+83
View File
@@ -0,0 +1,83 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 仪表完成情况
/// </summary>
public class MeterCompletionService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取仪表完成情况
/// </summary>
/// <param name="meterCompletionId"></param>
/// <returns></returns>
public static Model.JDGL_MeterCompletion GetMeterCompletionById(string meterCompletionId)
{
return Funs.DB.JDGL_MeterCompletion.FirstOrDefault(e => e.MeterCompletionId == meterCompletionId);
}
/// <summary>
/// 添加仪表完成情况
/// </summary>
/// <param name="meterCompletion"></param>
public static void AddMeterCompletion(Model.JDGL_MeterCompletion meterCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_MeterCompletion newMeterCompletion = new Model.JDGL_MeterCompletion
{
MeterCompletionId = meterCompletion.MeterCompletionId,
ProjectId = meterCompletion.ProjectId,
UnitId = meterCompletion.UnitId,
Name = meterCompletion.Name,
Unit = meterCompletion.Unit,
TotalNum = meterCompletion.TotalNum,
ThisNum = meterCompletion.ThisNum,
CompileMan = meterCompletion.CompileMan,
CompileDate = meterCompletion.CompileDate,
StartDate = meterCompletion.StartDate,
EndDate = meterCompletion.EndDate
};
db.JDGL_MeterCompletion.InsertOnSubmit(newMeterCompletion);
db.SubmitChanges();
}
/// <summary>
/// 修改仪表完成情况
/// </summary>
/// <param name="meterCompletion"></param>
public static void UpdateMeterCompletion(Model.JDGL_MeterCompletion meterCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_MeterCompletion newMeterCompletion = db.JDGL_MeterCompletion.FirstOrDefault(e => e.MeterCompletionId == meterCompletion.MeterCompletionId);
if (newMeterCompletion != null)
{
newMeterCompletion.TotalNum = meterCompletion.TotalNum;
newMeterCompletion.ThisNum = meterCompletion.ThisNum;
newMeterCompletion.CompileMan = meterCompletion.CompileMan;
newMeterCompletion.CompileDate = meterCompletion.CompileDate;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除仪表完成情况
/// </summary>
/// <param name="meterCompletionId"></param>
public static void DeleteMeterCompletionById(string meterCompletionId)
{
Model.SGGLDB db = Funs.DB;
var meterCompletion = (from x in db.JDGL_MeterCompletion where x.MeterCompletionId == meterCompletionId select x).FirstOrDefault();
if (meterCompletion != null)
{
db.JDGL_MeterCompletion.DeleteOnSubmit(meterCompletion);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/JDGL/Check/PipelineCompletionService.cs
+81
View File
@@ -0,0 +1,81 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 管道完成情况
/// </summary>
public class PipelineCompletionService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取管道完成情况
/// </summary>
/// <param name="pipelineCompletionId"></param>
/// <returns></returns>
public static Model.JDGL_PipelineCompletion GetPipelineCompletionById(string pipelineCompletionId)
{
return Funs.DB.JDGL_PipelineCompletion.FirstOrDefault(e => e.PipelineCompletionId == pipelineCompletionId);
}
/// <summary>
/// 添加管道完成情况
/// </summary>
/// <param name="pipelineCompletion"></param>
public static void AddPipelineCompletion(Model.JDGL_PipelineCompletion pipelineCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_PipelineCompletion newPipelineCompletion = new Model.JDGL_PipelineCompletion
{
PipelineCompletionId = pipelineCompletion.PipelineCompletionId,
ProjectId = pipelineCompletion.ProjectId,
UnitId = pipelineCompletion.UnitId,
TotalNum = pipelineCompletion.TotalNum,
ThisNum = pipelineCompletion.ThisNum,
CompileMan = pipelineCompletion.CompileMan,
CompileDate = pipelineCompletion.CompileDate,
StartDate = pipelineCompletion.StartDate,
EndDate = pipelineCompletion.EndDate
};
db.JDGL_PipelineCompletion.InsertOnSubmit(newPipelineCompletion);
db.SubmitChanges();
}
/// <summary>
/// 修改管道完成情况
/// </summary>
/// <param name="pipelineCompletion"></param>
public static void UpdatePipelineCompletion(Model.JDGL_PipelineCompletion pipelineCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_PipelineCompletion newPipelineCompletion = db.JDGL_PipelineCompletion.FirstOrDefault(e => e.PipelineCompletionId == pipelineCompletion.PipelineCompletionId);
if (newPipelineCompletion != null)
{
newPipelineCompletion.TotalNum = pipelineCompletion.TotalNum;
newPipelineCompletion.ThisNum = pipelineCompletion.ThisNum;
newPipelineCompletion.CompileMan = pipelineCompletion.CompileMan;
newPipelineCompletion.CompileDate = pipelineCompletion.CompileDate;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除管道完成情况
/// </summary>
/// <param name="pipelineCompletionId"></param>
public static void DeletePipelineCompletionById(string pipelineCompletionId)
{
Model.SGGLDB db = Funs.DB;
var pipelineCompletion = (from x in db.JDGL_PipelineCompletion where x.PipelineCompletionId == pipelineCompletionId select x).FirstOrDefault();
if (pipelineCompletion != null)
{
db.JDGL_PipelineCompletion.DeleteOnSubmit(pipelineCompletion);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/JDGL/Check/ProgressCompletionService.cs
+90
View File
@@ -0,0 +1,90 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 进度完成情况
/// </summary>
public class ProgressCompletionService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取进度完成情况
/// </summary>
/// <param name="progressCompletionId"></param>
/// <returns></returns>
public static Model.JDGL_ProgressCompletion GetProgressCompletionById(string progressCompletionId)
{
return Funs.DB.JDGL_ProgressCompletion.FirstOrDefault(e => e.ProgressCompletionId == progressCompletionId);
}
/// <summary>
/// 根据项目id和月份获取进度完成情况
/// </summary>
/// <param name="projectId"></param>
/// <param name="months"></param>
/// <returns></returns>
public static Model.JDGL_ProgressCompletion GetProgressCompletionByProjectIdAndMonths(string projectId, string months)
{
return Funs.DB.JDGL_ProgressCompletion.FirstOrDefault(e => e.ProjectId == projectId && e.Months == Convert.ToDateTime(months));
}
/// <summary>
/// 添加进度完成情况
/// </summary>
/// <param name="progressCompletion"></param>
public static void AddProgressCompletion(Model.JDGL_ProgressCompletion progressCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_ProgressCompletion newProgressCompletion = new Model.JDGL_ProgressCompletion
{
ProgressCompletionId = progressCompletion.ProgressCompletionId,
ProjectId = progressCompletion.ProjectId,
Months = progressCompletion.Months,
PlanNum = progressCompletion.PlanNum,
RealNum = progressCompletion.RealNum,
CompileMan = progressCompletion.CompileMan,
CompileDate = progressCompletion.CompileDate,
};
db.JDGL_ProgressCompletion.InsertOnSubmit(newProgressCompletion);
db.SubmitChanges();
}
/// <summary>
/// 修改进度完成情况
/// </summary>
/// <param name="progressCompletion"></param>
public static void UpdateProgressCompletion(Model.JDGL_ProgressCompletion progressCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_ProgressCompletion newProgressCompletion = db.JDGL_ProgressCompletion.FirstOrDefault(e => e.ProgressCompletionId == progressCompletion.ProgressCompletionId);
if (newProgressCompletion != null)
{
newProgressCompletion.PlanNum = progressCompletion.PlanNum;
newProgressCompletion.RealNum = progressCompletion.RealNum;
newProgressCompletion.CompileMan = progressCompletion.CompileMan;
newProgressCompletion.CompileDate = progressCompletion.CompileDate;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除进度完成情况
/// </summary>
/// <param name="progressCompletionId"></param>
public static void DeleteProgressCompletionById(string progressCompletionId)
{
Model.SGGLDB db = Funs.DB;
var progressCompletion = (from x in db.JDGL_ProgressCompletion where x.ProgressCompletionId == progressCompletionId select x).FirstOrDefault();
if (progressCompletion != null)
{
db.JDGL_ProgressCompletion.DeleteOnSubmit(progressCompletion);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/JDGL/Check/QuantityCompletionService.cs
+3 -1
View File
@@ -38,7 +38,9 @@ namespace BLL
PlanNum = quantityCompletion.PlanNum,
RealNum = quantityCompletion.RealNum,
CompileMan = quantityCompletion.CompileMan,
CompileDate = quantityCompletion.CompileDate
CompileDate = quantityCompletion.CompileDate,
StartDate=quantityCompletion.StartDate,
EndDate=quantityCompletion.EndDate
};
db.JDGL_QuantityCompletion.InsertOnSubmit(newQuantityCompletion);
db.SubmitChanges();
SGGL/BLL/JDGL/Check/SteelStructureCompletionService.cs
+83
View File
@@ -0,0 +1,83 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 钢结构完成情况
/// </summary>
public class SteelStructureCompletionService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取钢结构完成情况
/// </summary>
/// <param name="steelStructureCompletionId"></param>
/// <returns></returns>
public static Model.JDGL_SteelStructureCompletion GetSteelStructureCompletionById(string steelStructureCompletionId)
{
return Funs.DB.JDGL_SteelStructureCompletion.FirstOrDefault(e => e.SteelStructureCompletionId == steelStructureCompletionId);
}
/// <summary>
/// 添加钢结构完成情况
/// </summary>
/// <param name="steelStructureCompletion"></param>
public static void AddSteelStructureCompletion(Model.JDGL_SteelStructureCompletion steelStructureCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_SteelStructureCompletion newSteelStructureCompletion = new Model.JDGL_SteelStructureCompletion
{
SteelStructureCompletionId = steelStructureCompletion.SteelStructureCompletionId,
ProjectId = steelStructureCompletion.ProjectId,
UnitId = steelStructureCompletion.UnitId,
TotalNum = steelStructureCompletion.TotalNum,
ArrivalNum = steelStructureCompletion.ArrivalNum,
ThisNum = steelStructureCompletion.ThisNum,
CompileMan = steelStructureCompletion.CompileMan,
CompileDate = steelStructureCompletion.CompileDate,
StartDate = steelStructureCompletion.StartDate,
EndDate = steelStructureCompletion.EndDate
};
db.JDGL_SteelStructureCompletion.InsertOnSubmit(newSteelStructureCompletion);
db.SubmitChanges();
}
/// <summary>
/// 修改钢结构完成情况
/// </summary>
/// <param name="steelStructureCompletion"></param>
public static void UpdateSteelStructureCompletion(Model.JDGL_SteelStructureCompletion steelStructureCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_SteelStructureCompletion newSteelStructureCompletion = db.JDGL_SteelStructureCompletion.FirstOrDefault(e => e.SteelStructureCompletionId == steelStructureCompletion.SteelStructureCompletionId);
if (newSteelStructureCompletion != null)
{
newSteelStructureCompletion.TotalNum = steelStructureCompletion.TotalNum;
newSteelStructureCompletion.ArrivalNum = steelStructureCompletion.ArrivalNum;
newSteelStructureCompletion.ThisNum = steelStructureCompletion.ThisNum;
newSteelStructureCompletion.CompileMan = steelStructureCompletion.CompileMan;
newSteelStructureCompletion.CompileDate = steelStructureCompletion.CompileDate;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除钢结构完成情况
/// </summary>
/// <param name="steelStructureCompletionId"></param>
public static void DeleteSteelStructureCompletionById(string steelStructureCompletionId)
{
Model.SGGLDB db = Funs.DB;
var steelStructureCompletion = (from x in db.JDGL_SteelStructureCompletion where x.SteelStructureCompletionId == steelStructureCompletionId select x).FirstOrDefault();
if (steelStructureCompletion != null)
{
db.JDGL_SteelStructureCompletion.DeleteOnSubmit(steelStructureCompletion);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/JDGL/Check/UndergroundPipeCompletionService.cs
+81
View File
@@ -0,0 +1,81 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
{
/// <summary>
/// 全厂地下管网完成情况
/// </summary>
public class UndergroundPipeCompletionService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 根据主键获取全厂地下管网完成情况
/// </summary>
/// <param name="pipelineCompletionId"></param>
/// <returns></returns>
public static Model.JDGL_UndergroundPipeCompletion GetUndergroundPipeCompletionById(string pipelineCompletionId)
{
return Funs.DB.JDGL_UndergroundPipeCompletion.FirstOrDefault(e => e.UndergroundPipeCompletionId == pipelineCompletionId);
}
/// <summary>
/// 添加全厂地下管网完成情况
/// </summary>
/// <param name="pipelineCompletion"></param>
public static void AddUndergroundPipeCompletion(Model.JDGL_UndergroundPipeCompletion pipelineCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_UndergroundPipeCompletion newUndergroundPipeCompletion = new Model.JDGL_UndergroundPipeCompletion
{
UndergroundPipeCompletionId = pipelineCompletion.UndergroundPipeCompletionId,
ProjectId = pipelineCompletion.ProjectId,
UnitId = pipelineCompletion.UnitId,
TotalNum = pipelineCompletion.TotalNum,
ThisNum = pipelineCompletion.ThisNum,
CompileMan = pipelineCompletion.CompileMan,
CompileDate = pipelineCompletion.CompileDate,
StartDate = pipelineCompletion.StartDate,
EndDate = pipelineCompletion.EndDate
};
db.JDGL_UndergroundPipeCompletion.InsertOnSubmit(newUndergroundPipeCompletion);
db.SubmitChanges();
}
/// <summary>
/// 修改全厂地下管网完成情况
/// </summary>
/// <param name="pipelineCompletion"></param>
public static void UpdateUndergroundPipeCompletion(Model.JDGL_UndergroundPipeCompletion pipelineCompletion)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_UndergroundPipeCompletion newUndergroundPipeCompletion = db.JDGL_UndergroundPipeCompletion.FirstOrDefault(e => e.UndergroundPipeCompletionId == pipelineCompletion.UndergroundPipeCompletionId);
if (newUndergroundPipeCompletion != null)
{
newUndergroundPipeCompletion.TotalNum = pipelineCompletion.TotalNum;
newUndergroundPipeCompletion.ThisNum = pipelineCompletion.ThisNum;
newUndergroundPipeCompletion.CompileMan = pipelineCompletion.CompileMan;
newUndergroundPipeCompletion.CompileDate = pipelineCompletion.CompileDate;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除全厂地下管网完成情况
/// </summary>
/// <param name="pipelineCompletionId"></param>
public static void DeleteUndergroundPipeCompletionById(string pipelineCompletionId)
{
Model.SGGLDB db = Funs.DB;
var pipelineCompletion = (from x in db.JDGL_UndergroundPipeCompletion where x.UndergroundPipeCompletionId == pipelineCompletionId select x).FirstOrDefault();
if (pipelineCompletion != null)
{
db.JDGL_UndergroundPipeCompletion.DeleteOnSubmit(pipelineCompletion);
db.SubmitChanges();
}
}
}
}
SGGL/BLL/ProjectData/ProjectService.cs
+1 -1
View File
@@ -265,7 +265,7 @@
{
return (from x in Funs.DB.Base_Project
join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
where y.UserId == userId
where y.UserId == userId && y.IsPost == true
orderby x.ProjectCode descending
select x).Distinct().ToList();
}
SGGL/BLL/ZHGL/Supervise/SuperviseCheckRectifyItemService.cs
+1 -4
View File
@@ -47,11 +47,8 @@ namespace BLL
OrderEndDate = superviseCheckRectifyItem.OrderEndDate,
OrderEndPerson = superviseCheckRectifyItem.OrderEndPerson,
RealEndDate = superviseCheckRectifyItem.RealEndDate,
AttachUrl = superviseCheckRectifyItem.AttachUrl,
VerifierDate = superviseCheckRectifyItem.VerifierDate,
VerifierName = superviseCheckRectifyItem.VerifierName,
AttachUrl = superviseCheckRectifyItem.AttachUrl
};
Funs.DB.Supervise_SuperviseCheckRectifyItem.InsertOnSubmit(newSuperviseCheckRectifyItem);
Funs.DB.SubmitChanges();
}