修改施工日志

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
@@ -31,12 +31,8 @@ namespace BLL
newConstructionLogMachine.ConstructionLogMachineId = constructionLogMachine.ConstructionLogMachineId;
newConstructionLogMachine.ConstructionLogId = constructionLogMachine.ConstructionLogId;
newConstructionLogMachine.UnitWorkId = constructionLogMachine.UnitWorkId;
newConstructionLogMachine.WJNum = constructionLogMachine.WJNum;
newConstructionLogMachine.DCNum = constructionLogMachine.DCNum;
newConstructionLogMachine.DZJNum = constructionLogMachine.DZJNum;
newConstructionLogMachine.GCNum = constructionLogMachine.GCNum;
newConstructionLogMachine.BCNum = constructionLogMachine.BCNum;
newConstructionLogMachine.BengCNum = constructionLogMachine.BengCNum;
newConstructionLogMachine.MachineId = constructionLogMachine.MachineId;
newConstructionLogMachine.Num = constructionLogMachine.Num;
db.ZHGL_ConstructionLogMachine.InsertOnSubmit(newConstructionLogMachine);
db.SubmitChanges();
@@ -61,7 +61,7 @@ namespace BLL
public static List<Model.ZHGL_ConstructionLogManagement> GetConstructionLogManagementsByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
return (from x in db.ZHGL_ConstructionLogManagement where x.ConstructionLogId == ConstructionLogId select x).ToList();
return (from x in db.ZHGL_ConstructionLogManagement where x.ConstructionLogId == ConstructionLogId orderby x.UnitWorkId select x).ToList();
}
}
}
@@ -31,12 +31,8 @@ namespace BLL
newConstructionLogPerson.ConstructionLogPersonId = constructionLogPerson.ConstructionLogPersonId;
newConstructionLogPerson.ConstructionLogId = constructionLogPerson.ConstructionLogId;
newConstructionLogPerson.UnitWorkId = constructionLogPerson.UnitWorkId;
newConstructionLogPerson.WGNum = constructionLogPerson.WGNum;
newConstructionLogPerson.GJGNum = constructionLogPerson.GJGNum;
newConstructionLogPerson.MGNum = constructionLogPerson.MGNum;
newConstructionLogPerson.HNTGNum = constructionLogPerson.HNTGNum;
newConstructionLogPerson.HGNum = constructionLogPerson.HGNum;
newConstructionLogPerson.JZGNum = constructionLogPerson.JZGNum;
newConstructionLogPerson.WorkPostId = constructionLogPerson.WorkPostId;
newConstructionLogPerson.Num = constructionLogPerson.Num;
db.ZHGL_ConstructionLogPerson.InsertOnSubmit(newConstructionLogPerson);
db.SubmitChanges();
@@ -1,13 +1,68 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public class ConstructionLogProblemService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取施工日志需要协调解决的问题明细列表
/// </summary>
/// <param name="satartRowIndex"></param>
/// <param name="maximumRows"></param>
/// <returns></returns>
public static List<Model.ZHGL_ConstructionLogProblem> getListData(string ConstructionLogId)
{
return (from x in db.ZHGL_ConstructionLogProblem
where x.ConstructionLogId == ConstructionLogId
select x).ToList();
}
/// <summary>
/// 增加施工日志需要协调解决的问题明细
/// </summary>
/// <param name="managerRuleApprove">施工日志需要协调解决的问题明细实体</param>
public static void AddConstructionLogProblem(Model.ZHGL_ConstructionLogProblem constructionLogProblem)
{
Model.SGGLDB db = Funs.DB;
Model.ZHGL_ConstructionLogProblem newConstructionLogProblem = new Model.ZHGL_ConstructionLogProblem();
newConstructionLogProblem.ConstructionLogProblemId = constructionLogProblem.ConstructionLogProblemId;
newConstructionLogProblem.ConstructionLogId = constructionLogProblem.ConstructionLogId;
newConstructionLogProblem.UnitWorkId = constructionLogProblem.UnitWorkId;
newConstructionLogProblem.MainProblem = constructionLogProblem.MainProblem;
newConstructionLogProblem.HandlingMeasures = constructionLogProblem.HandlingMeasures;
newConstructionLogProblem.WorkPackageId = constructionLogProblem.WorkPackageId;
newConstructionLogProblem.ImportanceLevel = constructionLogProblem.ImportanceLevel;
db.ZHGL_ConstructionLogProblem.InsertOnSubmit(newConstructionLogProblem);
db.SubmitChanges();
}
/// <summary>
/// 根据月报id删除对应的所有施工日志需要协调解决的问题明细
/// </summary>
/// <param name="ConstructionLogId">施工日志需要协调解决的问题明细编号</param>
public static void DeleteConstructionLogProblemsByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.ZHGL_ConstructionLogProblem where x.ConstructionLogId == ConstructionLogId select x).ToList();
if (q.Count() > 0)
{
db.ZHGL_ConstructionLogProblem.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
/// <summary>
/// 根据月报id获取对应的所有施工日志需要协调解决的问题明细
/// </summary>
/// <param name="ConstructionLogId">施工日志需要协调解决的问题明细编号</param>
public static List<Model.ZHGL_ConstructionLogProblem> GetConstructionLogProblemsByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
return (from x in db.ZHGL_ConstructionLogProblem where x.ConstructionLogId == ConstructionLogId orderby x.UnitWorkId select x).ToList();
}
}
}
@@ -0,0 +1,65 @@
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
public class ConstructionLogRecordService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取施工日志施工经理相关记录明细列表
/// </summary>
/// <param name="satartRowIndex"></param>
/// <param name="maximumRows"></param>
/// <returns></returns>
public static List<Model.ZHGL_ConstructionLogRecord> getListData(string ConstructionLogId)
{
return (from x in db.ZHGL_ConstructionLogRecord
where x.ConstructionLogId == ConstructionLogId
select x).ToList();
}
/// <summary>
/// 增加施工日志作业人员明细
/// </summary>
/// <param name="managerRuleApprove">施工日志作业人员明细实体</param>
public static void AddConstructionLogRecord(Model.ZHGL_ConstructionLogRecord constructionLogRecord)
{
Model.SGGLDB db = Funs.DB;
Model.ZHGL_ConstructionLogRecord newConstructionLogRecord = new Model.ZHGL_ConstructionLogRecord();
newConstructionLogRecord.ConstructionLogRecordId = constructionLogRecord.ConstructionLogRecordId;
newConstructionLogRecord.ConstructionLogId = constructionLogRecord.ConstructionLogId;
newConstructionLogRecord.Record = constructionLogRecord.Record;
newConstructionLogRecord.Remark = constructionLogRecord.Remark;
db.ZHGL_ConstructionLogRecord.InsertOnSubmit(newConstructionLogRecord);
db.SubmitChanges();
}
/// <summary>
/// 根据月报id删除对应的所有施工日志作业人员明细
/// </summary>
/// <param name="ConstructionLogId">施工日志作业人员明细编号</param>
public static void DeleteConstructionLogRecordsByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.ZHGL_ConstructionLogRecord where x.ConstructionLogId == ConstructionLogId select x).ToList();
if (q.Count() > 0)
{
db.ZHGL_ConstructionLogRecord.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
/// <summary>
/// 根据月报id获取对应的所有施工日志作业人员明细
/// </summary>
/// <param name="ConstructionLogId">施工日志作业人员明细编号</param>
public static List<Model.ZHGL_ConstructionLogRecord> GetConstructionLogRecordsByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
return (from x in db.ZHGL_ConstructionLogRecord where x.ConstructionLogId == ConstructionLogId select x).ToList();
}
}
}
@@ -50,9 +50,9 @@ namespace BLL
Professional = ConstructionLog.Professional,
CompileMan = ConstructionLog.CompileMan,
CompileDate = ConstructionLog.CompileDate,
State= ConstructionLog.State,
Remark= ConstructionLog.Remark,
HSETodaySummary= ConstructionLog.HSETodaySummary,
State = ConstructionLog.State,
Remark = ConstructionLog.Remark,
HSETodaySummary = ConstructionLog.HSETodaySummary,
HSETodaySummaryRemark = ConstructionLog.HSETodaySummaryRemark,
HSETomorrowPlan = ConstructionLog.HSETomorrowPlan,
HSETomorrowPlanRemark = ConstructionLog.HSETomorrowPlanRemark,
@@ -60,6 +60,9 @@ namespace BLL
CQMSTodaySummaryRemark = ConstructionLog.CQMSTodaySummaryRemark,
CQMSTomorrowPlan = ConstructionLog.CQMSTomorrowPlan,
CQMSTomorrowPlanRemark = ConstructionLog.CQMSTomorrowPlanRemark,
FileCode = ConstructionLog.FileCode,
WorkPostId = ConstructionLog.WorkPostId,
MachineId = ConstructionLog.MachineId,
};
db.ZHGL_ConstructionLog.InsertOnSubmit(newConstructionLog);
db.SubmitChanges();
@@ -75,6 +78,7 @@ namespace BLL
Model.ZHGL_ConstructionLog newConstructionLog = db.ZHGL_ConstructionLog.FirstOrDefault(e => e.ConstructionLogId == ConstructionLog.ConstructionLogId);
if (newConstructionLog != null)
{
newConstructionLog.FileCode = ConstructionLog.FileCode;
newConstructionLog.Weather = ConstructionLog.Weather;
newConstructionLog.Temperature = ConstructionLog.Temperature;
newConstructionLog.ContractNo = ConstructionLog.ContractNo;
@@ -90,6 +94,8 @@ namespace BLL
newConstructionLog.CQMSTodaySummaryRemark = ConstructionLog.CQMSTodaySummaryRemark;
newConstructionLog.CQMSTomorrowPlan = ConstructionLog.CQMSTomorrowPlan;
newConstructionLog.CQMSTomorrowPlanRemark = ConstructionLog.CQMSTomorrowPlanRemark;
newConstructionLog.WorkPostId = ConstructionLog.WorkPostId;
newConstructionLog.MachineId = ConstructionLog.MachineId;
db.SubmitChanges();
}
}