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

提交代码

Browse Source
This commit is contained in:
高飞
2025-03-26 09:55:08 +08:00
parent fee5161f3a 0e7dae0099
commit 8412258cb3
75 changed files with 18747 additions and 1744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/.vs/BLL.csproj.dtbcache.json
+1 -1
View File
File diff suppressed because one or more lines are too long
SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs
+80 -1
View File
@@ -122,8 +122,23 @@ namespace BLL
newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
newMajorPlanApproval.RemarkCode = majorPlanApproval.RemarkCode;
newMajorPlanApproval.SchemeType = majorPlanApproval.SchemeType;
newMajorPlanApproval.HazardType = majorPlanApproval.HazardType;
newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime;
newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newMajorPlanApproval.States = majorPlanApproval.States;
db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
db.SubmitChanges();
//查询是否有数据 有则更新 没有则新增
var largerHazard = BLL.LargerHazardService.GetLargerHazardByHazardId(majorPlanApproval.MajorPlanApprovalId);
if (largerHazard != null)
{
UpdateLargerHazard(majorPlanApproval);
}
else
{
AddLargerHazard(majorPlanApproval);
}
}
/// <summary>
@@ -150,9 +165,23 @@ namespace BLL
newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId;
newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan;
newMajorPlanApproval.RemarkCode = majorPlanApproval.RemarkCode;
newMajorPlanApproval.SchemeType = majorPlanApproval.SchemeType;
newMajorPlanApproval.HazardType = majorPlanApproval.HazardType;
newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime;
newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newMajorPlanApproval.States = majorPlanApproval.States;
newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
db.SubmitChanges();
//查询是否有数据 有则更新 没有则新增
var largerHazard = BLL.LargerHazardService.GetLargerHazardByHazardId(majorPlanApproval.MajorPlanApprovalId);
if (largerHazard != null)
{
UpdateLargerHazard(majorPlanApproval);
}
else
{
AddLargerHazard(majorPlanApproval);
}
}
}
@@ -174,5 +203,55 @@ namespace BLL
db.SubmitChanges();
}
}
#region 同时新增一条到安全管理中的“危大工程施工方案清单”
public static void AddLargerHazard(Model.Comprehensive_MajorPlanApproval majorPlanApproval)
{
Model.SGGLDB db = Funs.DB;
Model.Solution_LargerHazard newLargerHazard = new Model.Solution_LargerHazard
{
HazardId = majorPlanApproval.MajorPlanApprovalId,
HazardCode = majorPlanApproval.PlanCode,
HazardType = majorPlanApproval.HazardType,
ProjectId = majorPlanApproval.ProjectId,
Address = majorPlanApproval.UnitWorkId,
ExpectedTime = majorPlanApproval.ExpectedTime,
IsArgument = majorPlanApproval.IsReview,
RecordTime = majorPlanApproval.ApprovalDate,
RecardMan = majorPlanApproval.CompileMan,
States = majorPlanApproval.States,
TrainPersonNum = majorPlanApproval.TrainPersonNum,
IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false,
};
db.Solution_LargerHazard.InsertOnSubmit(newLargerHazard);
db.SubmitChanges();
////增加一条编码记录
BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.ProjectLargerHazardListMenuId, newLargerHazard.ProjectId, null, newLargerHazard.HazardId, newLargerHazard.RecordTime);
}
public static void UpdateLargerHazard(Model.Comprehensive_MajorPlanApproval majorPlanApproval)
{
Model.SGGLDB db = Funs.DB;
Model.Solution_LargerHazard newLargerHazard = db.Solution_LargerHazard.FirstOrDefault(e => e.HazardId == majorPlanApproval.MajorPlanApprovalId);
if (newLargerHazard != null)
{
newLargerHazard.HazardCode = majorPlanApproval.PlanCode;
newLargerHazard.HazardType = majorPlanApproval.HazardType;
newLargerHazard.ProjectId = majorPlanApproval.ProjectId;
newLargerHazard.Address = majorPlanApproval.UnitWorkId;
newLargerHazard.ExpectedTime = majorPlanApproval.ExpectedTime;
newLargerHazard.IsArgument = majorPlanApproval.IsReview;
newLargerHazard.RecordTime = majorPlanApproval.ApprovalDate;
newLargerHazard.States = majorPlanApproval.States;
newLargerHazard.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newLargerHazard.IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false;
db.SubmitChanges();
}
}
#endregion
}
}
SGGL/BLL/Common/AttachFileService.cs
+6
View File
@@ -169,6 +169,12 @@ namespace BLL
listToKeyId.Add(toKeyId);
listToKeyId.Add(toKeyId + "r");
listToKeyId.Add(toKeyId + "re");
listToKeyId.Add(toKeyId + "_1");
listToKeyId.Add(toKeyId + "_2");
listToKeyId.Add(toKeyId + "_3");
listToKeyId.Add(toKeyId + "_4");
listToKeyId.Add(toKeyId + "_5");
listToKeyId.Add(toKeyId + "_6");
var list = Funs.DB.AttachFile.Where(p => listToKeyId.Contains(p.ToKeyId) && p.MenuId == menuId).ToList();
return list;
SGGL/BLL/Common/UploadAttachmentService.cs
+39
View File
@@ -200,6 +200,45 @@ namespace BLL
return htmlStr;
}
/// <summary>
/// 工作台项目图片
/// </summary>
/// <param name="rootValue"></param>
/// <param name="path"></param>
/// <returns></returns>
public static string ShowProjectImage(string rootValue, string path)
{
string htmlStr = string.Empty;
if (!string.IsNullOrEmpty(path))
{
htmlStr = "<table runat='server' cellpadding='1' cellspacing='1' style=\"width: 100%\">";
string[] arrStr = path.Split(new string[] { "," }, System.StringSplitOptions.RemoveEmptyEntries);
for (int i = 0; i < arrStr.Length; i++)
{
if (!string.IsNullOrEmpty(arrStr[i]))
{
string[] urlArray = arrStr[i].Split('\\');
string scanUrl = string.Empty;
for (int j = 0; j < urlArray.Length; j++)
{
scanUrl += urlArray[j] + "|";
}
string url = rootValue + arrStr[i].Replace('\\', '/');
string[] subUrl = url.Split('/');
string fileName = subUrl[subUrl.Count() - 1];
string newFileName = fileName.Substring(fileName.IndexOf("~") + 1);
htmlStr += "<tr><td style=\"width: 60%\" align=\"left\"><img width='30' height='30' src='" + url + "'></img><br/></td>";
}
}
htmlStr += "</table>";
}
return htmlStr;
}
#endregion
#region 附件上传
SGGL/BLL/HSSE/Solution/LargerHazardService.cs
+67
View File
@@ -50,6 +50,16 @@ namespace BLL
db.SubmitChanges();
////增加一条编码记录
BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(BLL.Const.ProjectLargerHazardListMenuId, largerHazard.ProjectId, null, largerHazard.HazardId, largerHazard.RecordTime);
//判断是否有数据 有数据则更新 没有数据则添加
var majorPlanApproval = BLL.MajorPlanApprovalService.GetMajorPlanApprovalById(largerHazard.HazardId);
if (majorPlanApproval != null)
{
UpdateMajorPlanApproval(largerHazard);
}
else
{
AddMajorPlanApproval(largerHazard);
}
}
/// <summary>
@@ -75,6 +85,16 @@ namespace BLL
newLargerHazard.IsSuperLargerHazard = largerHazard.IsSuperLargerHazard;
newLargerHazard.Descriptions = largerHazard.Descriptions;
db.SubmitChanges();
//判断是否有数据 有数据则更新 没有数据则添加
var majorPlanApproval = BLL.MajorPlanApprovalService.GetMajorPlanApprovalById(largerHazard.HazardId);
if (majorPlanApproval != null)
{
UpdateMajorPlanApproval(largerHazard);
}
else
{
AddMajorPlanApproval(largerHazard);
}
}
}
@@ -98,5 +118,52 @@ namespace BLL
db.SubmitChanges();
}
}
#region 同时编辑一条到质量管理中的危大（超危大）工程专项施工管理
private static void AddMajorPlanApproval(Model.Solution_LargerHazard largerHazard)
{
Model.SGGLDB db = Funs.DB;
Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = new Model.Comprehensive_MajorPlanApproval();
newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId;
newMajorPlanApproval.PlanCode = largerHazard.HazardCode;
newMajorPlanApproval.HazardType = largerHazard.HazardType;
newMajorPlanApproval.ProjectId = largerHazard.ProjectId;
newMajorPlanApproval.UnitWorkId = largerHazard.Address;
newMajorPlanApproval.ExpectedTime = largerHazard.ExpectedTime;
newMajorPlanApproval.IsReview = largerHazard.IsArgument;
newMajorPlanApproval.ApprovalDate = largerHazard.RecordTime;
newMajorPlanApproval.CompileMan = largerHazard.RecardMan;
newMajorPlanApproval.States = largerHazard.States;
newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum;
newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程";
db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
db.SubmitChanges();
}
private static void UpdateMajorPlanApproval(Model.Solution_LargerHazard largerHazard)
{
Model.SGGLDB db = Funs.DB;
Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = db.Comprehensive_MajorPlanApproval.FirstOrDefault(e => e.MajorPlanApprovalId == largerHazard.HazardId);
if (newMajorPlanApproval != null)
{
newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId;
newMajorPlanApproval.PlanCode = largerHazard.HazardCode;
newMajorPlanApproval.HazardType = largerHazard.HazardType;
newMajorPlanApproval.ProjectId = largerHazard.ProjectId;
newMajorPlanApproval.UnitWorkId = largerHazard.Address;
newMajorPlanApproval.ExpectedTime = largerHazard.ExpectedTime;
newMajorPlanApproval.IsReview = largerHazard.IsArgument;
newMajorPlanApproval.ApprovalDate = largerHazard.RecordTime;
newMajorPlanApproval.States = largerHazard.States;
newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum;
newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程";
db.SubmitChanges();
}
}
#endregion
}
}
SGGL/BLL/JDGL/Check/WeekPlanService.cs
+29 -10
View File
@@ -1,8 +1,7 @@
using System;
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
@@ -20,7 +19,7 @@ namespace BLL
/// <returns></returns>
public static Model.JDGL_WeekPlan GetWeekPlanById(string WeekPlanId)
{
return Funs.DB.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlanId);
return db.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlanId);
}
/// <summary>
@@ -30,7 +29,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.JDGL_WeekPlan> GetWeekPlansByWeeks(string projectId, string weekNo)
{
return (from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x).ToList();
return (from x in db.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x).ToList();
}
/// <summary>
@@ -39,7 +38,6 @@ namespace BLL
/// <param name="WeekPlan"></param>
public static void AddWeekPlan(Model.JDGL_WeekPlan WeekPlan)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_WeekPlan newWeekPlan = new Model.JDGL_WeekPlan
{
WeekPlanId = WeekPlan.WeekPlanId,
@@ -69,7 +67,6 @@ namespace BLL
/// <param name="WeekPlan"></param>
public static void UpdateWeekPlan(Model.JDGL_WeekPlan WeekPlan)
{
Model.SGGLDB db = Funs.DB;
Model.JDGL_WeekPlan newWeekPlan = db.JDGL_WeekPlan.FirstOrDefault(e => e.WeekPlanId == WeekPlan.WeekPlanId);
if (newWeekPlan != null)
{
@@ -95,7 +92,6 @@ namespace BLL
/// <param name="WeekPlanId"></param>
public static void DeleteWeekPlanByWeekPlanId(string WeekPlanId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.JDGL_WeekPlan where x.WeekPlanId == WeekPlanId select x).FirstOrDefault();
if (q != null)
{
@@ -104,13 +100,24 @@ namespace BLL
}
}
/// <summary>
/// 根据当前时间获取上一个周计划
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
public static JDGL_WeekPlan GetLastWeekPlan(string projectId)
{
return (from x in db.JDGL_WeekPlan where x.ProjectId == projectId && DateTime.Now > ((DateTime)x.EndDate).AddDays(1) orderby x.EndDate select x).FirstOrDefault();
}
/// <summary>
/// 根据主键删除周计划情况
/// </summary>
/// <param name="WeekPlanId"></param>
/// <param name="projectId"></param>
/// <param name="weekNo"></param>
public static void DeleteAllWeekPlan(string projectId, string weekNo)
{
Model.SGGLDB db = Funs.DB;
var q = from x in db.JDGL_WeekPlan where x.ProjectId == projectId && x.WeekNo == weekNo select x;
if (q != null)
{
@@ -118,5 +125,17 @@ namespace BLL
db.SubmitChanges();
}
}
/// <summary>
/// 获取周计划下责任单位Id
/// </summary>
/// <param name="projectId"></param>
/// <returns></returns>
public static List<string> GetWeekPlanUnitIdListByProjectIdWeekNo(string projectId)
{
var lstUnit = (from x in db.JDGL_WeekPlan where x.ProjectId == projectId orderby x.UnitId select x.UnitId).Distinct().ToList();
return lstUnit;
}
}
}