lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改施工日志

Browse Source
This commit is contained in:
高飞
2023-09-22 14:09:58 +08:00
parent 1cacd53725
commit 764455acd9
38 changed files with 3031 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs
+27 -23
View File
@@ -146,21 +146,23 @@ namespace BLL
/// <param name="managerRuleApprove">实体验收审批实体</param>
public static void AddSpotCheckApprove(Model.Check_SpotCheckApprove approve)
{
Model.SGGLDB db = Funs.DB;
string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_SpotCheckApprove));
Model.Check_SpotCheckApprove newApprove = new Model.Check_SpotCheckApprove();
newApprove.SpotCheckApproveId = newKeyID;
newApprove.SpotCheckCode = approve.SpotCheckCode;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
newApprove.SpotCheckDetailId = approve.SpotCheckDetailId;
newApprove.Sign = approve.Sign;
using (var db = new Model.SGGLDB(Funs.ConnString))
{
string newKeyID = SQLHelper.GetNewID(typeof(Model.Check_SpotCheckApprove));
Model.Check_SpotCheckApprove newApprove = new Model.Check_SpotCheckApprove();
newApprove.SpotCheckApproveId = newKeyID;
newApprove.SpotCheckCode = approve.SpotCheckCode;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
newApprove.SpotCheckDetailId = approve.SpotCheckDetailId;
newApprove.Sign = approve.Sign;
db.Check_SpotCheckApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
db.Check_SpotCheckApprove.InsertOnSubmit(newApprove);
db.SubmitChanges();
}
}
public static string AddSpotCheckApproveForApi(Model.Check_SpotCheckApprove approve)
{
@@ -193,16 +195,18 @@ namespace BLL
/// <param name="managerRuleApprove">实体验收审批实体</param>
public static void UpdateSpotCheckApprove(Model.Check_SpotCheckApprove approve)
{
Model.SGGLDB db = Funs.DB;
Model.Check_SpotCheckApprove newApprove = db.Check_SpotCheckApprove.First(e => e.SpotCheckApproveId == approve.SpotCheckApproveId && e.ApproveDate == null);
newApprove.SpotCheckCode = approve.SpotCheckCode;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
using (var db = new Model.SGGLDB(Funs.ConnString))
{
Model.Check_SpotCheckApprove newApprove = db.Check_SpotCheckApprove.First(e => e.SpotCheckApproveId == approve.SpotCheckApproveId && e.ApproveDate == null);
newApprove.SpotCheckCode = approve.SpotCheckCode;
newApprove.ApproveMan = approve.ApproveMan;
newApprove.ApproveDate = approve.ApproveDate;
newApprove.ApproveIdea = approve.ApproveIdea;
newApprove.IsAgree = approve.IsAgree;
newApprove.ApproveType = approve.ApproveType;
db.SubmitChanges();
db.SubmitChanges();
}
}
/// <summary>
SGGL/BLL/CQMS/WBS/WorkPackageInitService.cs
+50
View File
@@ -79,6 +79,38 @@ namespace BLL
return Funs.DB.WBS_WorkPackageInit.FirstOrDefault(x => x.WorkPackageCode == workPackageCode);
}
/// <summary>
/// 根据分部分项编号获取分部分项信息
/// </summary>
/// <param name="workPackageCode"></param>
/// <returns></returns>
public static string GetWorkPackageCodeByPackageContent(string packageContent)
{
string workPackageCode = string.Empty;
var q= Funs.DB.WBS_WorkPackageInit.FirstOrDefault(x => x.PackageContent == packageContent);
if (q != null)
{
workPackageCode = q.WorkPackageCode;
}
return workPackageCode;
}
/// <summary>
/// 根据分部分项编号获取分部分项信息
/// </summary>
/// <param name="workPackageCode"></param>
/// <returns></returns>
public static string GetPackageContentByWorkPackageCode(string workPackageCode)
{
string packageContent = string.Empty;
var q = Funs.DB.WBS_WorkPackageInit.FirstOrDefault(x => x.WorkPackageCode == workPackageCode);
if (q != null)
{
packageContent = q.PackageContent;
}
return packageContent;
}
/// <summary>
/// 根据分部分项编号获取子级分部分项信息集合
/// </summary>
@@ -88,5 +120,23 @@ namespace BLL
{
return (from x in Funs.DB.WBS_WorkPackageInit where x.SuperWorkPack == workPackageCode select x).ToList();
}
/// <summary>
/// 样板类型下拉框
/// </summary>
/// <param name="dropName"></param>
/// <param name="projectId"></param>
/// <param name="isShowPlease"></param>
public static void InitDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "PackageContent";
dropName.DataTextField = "PackageContent";
dropName.DataSource = from x in Funs.DB.WBS_WorkPackageInit where x.SuperWorkPack == null orderby x.ProjectType, x.WorkPackageCode select x;
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
}
}
SGGL/BLL/CQMS/WBS/WorkPackageService.cs
+33 -8
View File
@@ -788,7 +788,21 @@ namespace BLL
IQueryable<Model.WBS_WorkPackage> workPackages = from x in db.WBS_WorkPackage where x.ProjectId == projectId select x;
IQueryable<Model.WBS_UnitWork> unitWorks = from x in db.WBS_UnitWork where x.ProjectId == projectId select x;
IQueryable<Model.View_WBS_WorkPackageDetail> getDetails = from x in db.View_WBS_WorkPackageDetail where x.ProjectId == projectId select x;
//获取符合时间范围的所有项
List<Model.View_WBS> getWBSs = (from x in db.View_WBS where x.ProjectId == projectId select x).ToList();
List<Model.View_WBS> list = getWBSs.Where(x => x.PlanEndDate > startTime && x.PlanEndDate <= endTime).ToList();
List<Model.View_WBS> newLists = new List<Model.View_WBS>();
foreach (var item in list)
{
var supItem = getWBSs.FirstOrDefault(x => x.Id == item.SupId);
if (supItem != null)
{
newLists.Add(item);
newLists.Add(supItem);
AddSupItem(supItem, getWBSs, newLists);
}
}
List<string> ids = newLists.Select(x => x.Id).ToList();
List<Model.View_WBS> WBSList = new List<Model.View_WBS>();
DateTime startDate, endDate, startMonth, endMonth;
List<DateTime> months = new List<DateTime>();
@@ -844,11 +858,11 @@ namespace BLL
newList.Add(item);
if (string.IsNullOrEmpty(IsOut))
{
AddDetail2(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime);
AddDetail2(newList, getWBSs.ToList(), item.Id, a.ToString(), startTime, endTime, ids);
}
else
{
AddDetail2(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime);
AddDetail2(newList, getWBSs.ToList(), item.Id, a.ToString(), string.Empty, startTime, endTime, ids);
}
a++;
}
@@ -990,29 +1004,40 @@ namespace BLL
}
}
private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, DateTime startTime, DateTime endTime)
private static void AddSupItem(Model.View_WBS item, List<Model.View_WBS> getWBSs, List<Model.View_WBS> newLists)
{
var items = oldList.Where(x => x.SupId == id && x.PlanEndDate > startTime && x.PlanEndDate <= endTime).OrderBy(x => x.Code);
var supItem = getWBSs.FirstOrDefault(x => x.Id == item.SupId);
if (supItem != null)
{
newLists.Add(item);
newLists.Add(supItem);
AddSupItem(supItem, getWBSs, newLists);
}
}
private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, DateTime startTime, DateTime endTime,List<string> ids)
{
var items = oldList.Where(x => x.SupId == id && ((x.PlanEndDate > startTime && x.PlanEndDate <= endTime) || ids.Contains(x.Id))).OrderBy(x => x.Code);
int b = 1;
foreach (var item in items)
{
item.Code = preCode + "." + b.ToString();
newList.Add(item);
AddDetail2(newList, oldList, item.Id, item.Code, startTime, endTime);
AddDetail2(newList, oldList, item.Id, item.Code, startTime, endTime, ids);
b++;
}
}
private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, string prefix, DateTime startTime, DateTime endTime)
private static void AddDetail2(List<Model.View_WBS> newList, List<Model.View_WBS> oldList, string id, string preCode, string prefix, DateTime startTime, DateTime endTime, List<string> ids)
{
var items = oldList.Where(x => x.SupId == id && x.PlanEndDate > startTime && x.PlanEndDate <= endTime).OrderBy(x => x.Code);
var items = oldList.Where(x => x.SupId == id && ((x.PlanEndDate > startTime && x.PlanEndDate <= endTime) || ids.Contains(x.Id))).OrderBy(x => x.Code);
int b = 1;
foreach (var item in items)
{
item.Code = preCode + "." + b.ToString();
item.Name = prefix + "...." + item.Name;
newList.Add(item);
AddDetail2(newList, oldList, item.Id, item.Code, prefix + "....", startTime, endTime);
AddDetail2(newList, oldList, item.Id, item.Code, prefix + "....", startTime, endTime, ids);
b++;
}
}