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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2023-09-14 15:07:41 +08:00
parent 19feba1767 1cacd53725
commit 578bb8bfa7
11 changed files with 2347 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+4
View File
@@ -642,6 +642,10 @@
<Compile Include="ProjectData\Project_SysSetService.cs" />
<Compile Include="ProjectData\TeamGroupService.cs" />
<Compile Include="ProjectData\UnitWorkService.cs" />
<Compile Include="PZHGL\InformationProject\ConstructionLogMachineService.cs" />
<Compile Include="PZHGL\InformationProject\ConstructionLogManagementService.cs" />
<Compile Include="PZHGL\InformationProject\ConstructionLogPersonService.cs" />
<Compile Include="PZHGL\InformationProject\ConstructionLogProblemService.cs" />
<Compile Include="PZHGL\InformationProject\ConstructionLogService.cs" />
<Compile Include="PZHGL\InformationProject\ConstructionPlanApproveService.cs" />
<Compile Include="PZHGL\InformationProject\ConstructionPlanService.cs" />
SGGL/BLL/PZHGL/InformationProject/ConstructionLogMachineService.cs
+70
View File
@@ -0,0 +1,70 @@
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
public class ConstructionLogMachineService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取施工日志机械明细列表
/// </summary>
/// <param name="satartRowIndex"></param>
/// <param name="maximumRows"></param>
/// <returns></returns>
public static List<Model.ZHGL_ConstructionLogMachine> getListData(string ConstructionLogId)
{
return (from x in db.ZHGL_ConstructionLogMachine
where x.ConstructionLogId == ConstructionLogId
select x).ToList();
}
/// <summary>
/// 增加施工日志机械明细
/// </summary>
/// <param name="managerRuleApprove">施工日志机械明细实体</param>
public static void AddConstructionLogMachine(Model.ZHGL_ConstructionLogMachine constructionLogMachine)
{
Model.SGGLDB db = Funs.DB;
Model.ZHGL_ConstructionLogMachine newConstructionLogMachine = new Model.ZHGL_ConstructionLogMachine();
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;
db.ZHGL_ConstructionLogMachine.InsertOnSubmit(newConstructionLogMachine);
db.SubmitChanges();
}
/// <summary>
/// 根据月报id删除对应的所有施工日志机械明细
/// </summary>
/// <param name="ConstructionLogId">施工日志机械明细编号</param>
public static void DeleteConstructionLogMachinesByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.ZHGL_ConstructionLogMachine where x.ConstructionLogId == ConstructionLogId select x).ToList();
if (q.Count() > 0)
{
db.ZHGL_ConstructionLogMachine.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
/// <summary>
/// 根据月报id获取对应的所有施工日志机械明细
/// </summary>
/// <param name="ConstructionLogId">施工日志机械明细编号</param>
public static List<Model.ZHGL_ConstructionLogMachine> GetConstructionLogMachinesByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
return (from x in db.ZHGL_ConstructionLogMachine where x.ConstructionLogId == ConstructionLogId select x).ToList();
}
}
}
SGGL/BLL/PZHGL/InformationProject/ConstructionLogManagementService.cs
+67
View File
@@ -0,0 +1,67 @@
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
public class ConstructionLogManagementService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取施工日志专业管理明细列表
/// </summary>
/// <param name="satartRowIndex"></param>
/// <param name="maximumRows"></param>
/// <returns></returns>
public static List<Model.ZHGL_ConstructionLogManagement> getListData(string ConstructionLogId)
{
return (from x in db.ZHGL_ConstructionLogManagement
where x.ConstructionLogId == ConstructionLogId
select x).ToList();
}
/// <summary>
/// 增加施工日志专业管理明细
/// </summary>
/// <param name="managerRuleApprove">施工日志专业管理明细实体</param>
public static void AddConstructionLogManagement(Model.ZHGL_ConstructionLogManagement constructionLogManagement)
{
Model.SGGLDB db = Funs.DB;
Model.ZHGL_ConstructionLogManagement newConstructionLogManagement = new Model.ZHGL_ConstructionLogManagement();
newConstructionLogManagement.ConstructionLogManagementId = constructionLogManagement.ConstructionLogManagementId;
newConstructionLogManagement.ConstructionLogId = constructionLogManagement.ConstructionLogId;
newConstructionLogManagement.UnitWorkId = constructionLogManagement.UnitWorkId;
newConstructionLogManagement.TodayWork = constructionLogManagement.TodayWork;
newConstructionLogManagement.TomorrowWork = constructionLogManagement.TomorrowWork;
newConstructionLogManagement.Remark = constructionLogManagement.Remark;
db.ZHGL_ConstructionLogManagement.InsertOnSubmit(newConstructionLogManagement);
db.SubmitChanges();
}
/// <summary>
/// 根据月报id删除对应的所有施工日志专业管理明细
/// </summary>
/// <param name="ConstructionLogId">施工日志专业管理明细编号</param>
public static void DeleteConstructionLogManagementsByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.ZHGL_ConstructionLogManagement where x.ConstructionLogId == ConstructionLogId select x).ToList();
if (q.Count() > 0)
{
db.ZHGL_ConstructionLogManagement.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
/// <summary>
/// 根据月报id获取对应的所有施工日志专业管理明细
/// </summary>
/// <param name="ConstructionLogId">施工日志专业管理明细编号</param>
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();
}
}
}
SGGL/BLL/PZHGL/InformationProject/ConstructionLogPersonService.cs
+70
View File
@@ -0,0 +1,70 @@
using System.Collections.Generic;
using System.Linq;
namespace BLL
{
public class ConstructionLogPersonService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取施工日志作业人员明细列表
/// </summary>
/// <param name="satartRowIndex"></param>
/// <param name="maximumRows"></param>
/// <returns></returns>
public static List<Model.ZHGL_ConstructionLogPerson> getListData(string ConstructionLogId)
{
return (from x in db.ZHGL_ConstructionLogPerson
where x.ConstructionLogId == ConstructionLogId
select x).ToList();
}
/// <summary>
/// 增加施工日志作业人员明细
/// </summary>
/// <param name="managerRuleApprove">施工日志作业人员明细实体</param>
public static void AddConstructionLogPerson(Model.ZHGL_ConstructionLogPerson constructionLogPerson)
{
Model.SGGLDB db = Funs.DB;
Model.ZHGL_ConstructionLogPerson newConstructionLogPerson = new Model.ZHGL_ConstructionLogPerson();
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;
db.ZHGL_ConstructionLogPerson.InsertOnSubmit(newConstructionLogPerson);
db.SubmitChanges();
}
/// <summary>
/// 根据月报id删除对应的所有施工日志作业人员明细
/// </summary>
/// <param name="ConstructionLogId">施工日志作业人员明细编号</param>
public static void DeleteConstructionLogPersonsByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.ZHGL_ConstructionLogPerson where x.ConstructionLogId == ConstructionLogId select x).ToList();
if (q.Count() > 0)
{
db.ZHGL_ConstructionLogPerson.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
/// <summary>
/// 根据月报id获取对应的所有施工日志作业人员明细
/// </summary>
/// <param name="ConstructionLogId">施工日志作业人员明细编号</param>
public static List<Model.ZHGL_ConstructionLogPerson> GetConstructionLogPersonsByConstructionLogId(string ConstructionLogId)
{
Model.SGGLDB db = Funs.DB;
return (from x in db.ZHGL_ConstructionLogPerson where x.ConstructionLogId == ConstructionLogId select x).ToList();
}
}
}
SGGL/BLL/PZHGL/InformationProject/ConstructionLogProblemService.cs
+13
View File
@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
public class ConstructionLogProblemService
{
}
}
SGGL/BLL/PZHGL/InformationProject/ConstructionLogService.cs
+27 -9
View File
@@ -44,13 +44,22 @@ namespace BLL
ConstructionLogId = ConstructionLog.ConstructionLogId,
ProjectId = ConstructionLog.ProjectId,
Weather = ConstructionLog.Weather,
TemperatureMax = ConstructionLog.TemperatureMax,
TemperatureMin = ConstructionLog.TemperatureMin,
MainWork = ConstructionLog.MainWork,
MainProblems = ConstructionLog.MainProblems,
Remark = ConstructionLog.Remark,
Temperature = ConstructionLog.Temperature,
ContractNo = ConstructionLog.ContractNo,
UnitWorks = ConstructionLog.UnitWorks,
Professional = ConstructionLog.Professional,
CompileMan = ConstructionLog.CompileMan,
CompileDate = ConstructionLog.CompileDate,
State= ConstructionLog.State,
Remark= ConstructionLog.Remark,
HSETodaySummary= ConstructionLog.HSETodaySummary,
HSETodaySummaryRemark = ConstructionLog.HSETodaySummaryRemark,
HSETomorrowPlan = ConstructionLog.HSETomorrowPlan,
HSETomorrowPlanRemark = ConstructionLog.HSETomorrowPlanRemark,
CQMSTodaySummary = ConstructionLog.CQMSTodaySummary,
CQMSTodaySummaryRemark = ConstructionLog.CQMSTodaySummaryRemark,
CQMSTomorrowPlan = ConstructionLog.CQMSTomorrowPlan,
CQMSTomorrowPlanRemark = ConstructionLog.CQMSTomorrowPlanRemark,
};
db.ZHGL_ConstructionLog.InsertOnSubmit(newConstructionLog);
db.SubmitChanges();
@@ -67,11 +76,20 @@ namespace BLL
if (newConstructionLog != null)
{
newConstructionLog.Weather = ConstructionLog.Weather;
newConstructionLog.TemperatureMax = ConstructionLog.TemperatureMax;
newConstructionLog.TemperatureMin = ConstructionLog.TemperatureMin;
newConstructionLog.MainWork = ConstructionLog.MainWork;
newConstructionLog.MainProblems = ConstructionLog.MainProblems;
newConstructionLog.Temperature = ConstructionLog.Temperature;
newConstructionLog.ContractNo = ConstructionLog.ContractNo;
newConstructionLog.UnitWorks = ConstructionLog.UnitWorks;
newConstructionLog.Professional = ConstructionLog.Professional;
newConstructionLog.State = ConstructionLog.State;
newConstructionLog.Remark = ConstructionLog.Remark;
newConstructionLog.HSETodaySummary = ConstructionLog.HSETodaySummary;
newConstructionLog.HSETodaySummaryRemark = ConstructionLog.HSETodaySummaryRemark;
newConstructionLog.HSETomorrowPlan = ConstructionLog.HSETomorrowPlan;
newConstructionLog.HSETomorrowPlanRemark = ConstructionLog.HSETomorrowPlanRemark;
newConstructionLog.CQMSTodaySummary = ConstructionLog.CQMSTodaySummary;
newConstructionLog.CQMSTodaySummaryRemark = ConstructionLog.CQMSTodaySummaryRemark;
newConstructionLog.CQMSTomorrowPlan = ConstructionLog.CQMSTomorrowPlan;
newConstructionLog.CQMSTomorrowPlanRemark = ConstructionLog.CQMSTomorrowPlanRemark;
db.SubmitChanges();
}
}
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogEdit.aspx.cs
+14 -14
View File
@@ -53,20 +53,20 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{
this.drpWeather.SelectedValue = constructionLog.Weather;
}
if (constructionLog.TemperatureMin != null)
{
this.txtTemperatureMin.Text = constructionLog.TemperatureMin.ToString();
}
if (constructionLog.TemperatureMax != null)
{
this.txtTemperatureMax.Text = constructionLog.TemperatureMax.ToString();
}
//if (constructionLog.TemperatureMin != null)
//{
// this.txtTemperatureMin.Text = constructionLog.TemperatureMin.ToString();
//}
//if (constructionLog.TemperatureMax != null)
//{
// this.txtTemperatureMax.Text = constructionLog.TemperatureMax.ToString();
//}
if (constructionLog.CompileDate != null)
{
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", constructionLog.CompileDate);
}
this.txtMainWork.Text = constructionLog.MainWork;
this.txtMainProblems.Text = constructionLog.MainProblems;
//this.txtMainWork.Text = constructionLog.MainWork;
//this.txtMainProblems.Text = constructionLog.MainProblems;
this.txtRemark.Text = constructionLog.Remark;
}
@@ -152,11 +152,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject
Model.ZHGL_ConstructionLog constructionLog = new Model.ZHGL_ConstructionLog();
constructionLog.Weather = drpWeather.SelectedValue;
constructionLog.ProjectId = CurrUser.LoginProjectId;
constructionLog.TemperatureMin = Funs.GetNewInt(this.txtTemperatureMin.Text.Trim());
constructionLog.TemperatureMax = Funs.GetNewInt(this.txtTemperatureMax.Text.Trim());
//constructionLog.TemperatureMin = Funs.GetNewInt(this.txtTemperatureMin.Text.Trim());
//constructionLog.TemperatureMax = Funs.GetNewInt(this.txtTemperatureMax.Text.Trim());
constructionLog.CompileDate = Funs.GetNewDateTime(this.txtCompileDate.Text.Trim());
constructionLog.MainWork = this.txtMainWork.Text;
constructionLog.MainProblems = this.txtMainProblems.Text;
//constructionLog.MainWork = this.txtMainWork.Text;
//constructionLog.MainProblems = this.txtMainProblems.Text;
constructionLog.Remark = this.txtRemark.Text;
if (!string.IsNullOrEmpty(ConstructionLogId) && ConstructionLogService.GetConstructionLogById(Request.Params["ConstructionLogId"]) != null)
{
SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogView.aspx.cs
+10 -10
View File
@@ -48,20 +48,20 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{
this.txtWeather.Text = constructionLog.Weather;
}
if (constructionLog.TemperatureMin != null)
{
this.txtTemperatureMin.Text = constructionLog.TemperatureMin.ToString();
}
if (constructionLog.TemperatureMax != null)
{
this.txtTemperatureMax.Text = constructionLog.TemperatureMax.ToString();
}
//if (constructionLog.TemperatureMin != null)
//{
// this.txtTemperatureMin.Text = constructionLog.TemperatureMin.ToString();
//}
//if (constructionLog.TemperatureMax != null)
//{
// this.txtTemperatureMax.Text = constructionLog.TemperatureMax.ToString();
//}
if (constructionLog.CompileDate != null)
{
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", constructionLog.CompileDate);
}
this.txtMainWork.Text = constructionLog.MainWork;
this.txtMainProblems.Text = constructionLog.MainProblems;
//this.txtMainWork.Text = constructionLog.MainWork;
//this.txtMainProblems.Text = constructionLog.MainProblems;
this.txtRemark.Text = constructionLog.Remark;
}
else
SGGL/FineUIPro.Web/indexProject.aspx.cs
+7
View File
@@ -326,6 +326,13 @@ namespace FineUIPro.Web
if (!string.IsNullOrEmpty(Request.Params["projectId"]))
{
Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(Request.Params["projectId"]);
if (!projectlist.Contains(project))
{
projectlist.Add(project);
this.drpProject.DataSource = projectlist;
this.drpProject.DataBind();
}
this.drpProject.SelectedValue = Request.Params["projectId"];
}
SGGL/Model/Model.cs
+1717 -140
View File
File diff suppressed because it is too large Load Diff