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

提交代码

This commit is contained in:
高飞 2023-10-25 15:08:52 +08:00
parent fc70739b8b
commit ffbb79697d
2 changed files with 30 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
View File

@ -1107,17 +1107,11 @@ namespace BLL
} }
for (int i = 0; i < workPostIds.Count; i++) for (int i = 0; i < workPostIds.Count; i++)
{ {
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id); var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
if (workEfficiencyList.Count() > 0) if (workEfficiencyList.Count() > 0)
{ {
decimal d = 0; decimal d = 0;
foreach (var workEfficiency in workEfficiencyList) d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
if (d > 0) if (d > 0)
{ {
row[12 + i * 2] = decimal.Round(d, 2); row[12 + i * 2] = decimal.Round(d, 2);
@ -1130,17 +1124,11 @@ namespace BLL
} }
for (int i = 0; i < machineIds.Count; i++) for (int i = 0; i < machineIds.Count; i++)
{ {
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id); var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
if (workEfficiencyList.Count() > 0) if (workEfficiencyList.Count() > 0)
{ {
decimal d = 0; decimal d = 0;
foreach (var workEfficiency in workEfficiencyList) d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
if (d > 0) if (d > 0)
{ {
row[52 + i * 2] = decimal.Round(d, 2); row[52 + i * 2] = decimal.Round(d, 2);
@ -1192,17 +1180,11 @@ namespace BLL
} }
for (int i = 0; i < workPostIds.Count; i++) for (int i = 0; i < workPostIds.Count; i++)
{ {
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id); var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
if (workEfficiencyList.Count() > 0) if (workEfficiencyList.Count() > 0)
{ {
decimal d = 0; decimal d = 0;
foreach (var workEfficiency in workEfficiencyList) d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
if (d > 0) if (d > 0)
{ {
row[12 + i * 2] = decimal.Round(d, 2); row[12 + i * 2] = decimal.Round(d, 2);
@ -1215,17 +1197,11 @@ namespace BLL
} }
for (int i = 0; i < machineIds.Count; i++) for (int i = 0; i < machineIds.Count; i++)
{ {
var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id); var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
if (workEfficiencyList.Count() > 0) if (workEfficiencyList.Count() > 0)
{ {
decimal d = 0; decimal d = 0;
foreach (var workEfficiency in workEfficiencyList) d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
{
if (workEfficiency.ConsumeHours != null)
{
d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
}
}
if (d > 0) if (d > 0)
{ {
row[52 + i * 2] = decimal.Round(d, 2); row[52 + i * 2] = decimal.Round(d, 2);

40
SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
View File

@ -303,25 +303,29 @@ namespace FineUIPro.Web.PZHGL.InformationProject
{ {
foreach (var personLog in personLogs) foreach (var personLog in personLogs)
{ {
if (!string.IsNullOrEmpty(personLog.HSETodaySummary) || !string.IsNullOrEmpty(personLog.HSETodaySummaryRemark) || !string.IsNullOrEmpty(personLog.HSETomorrowPlan) || !string.IsNullOrEmpty(personLog.HSETomorrowPlanRemark)) var projectUser = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, personLog.CompileMan);
if (projectUser != null && projectUser.WorkPostId != BLL.Const.WorkPost_ConstructionManager)
{ {
Model.ConstructionLogHSE hse = new Model.ConstructionLogHSE(); if (!string.IsNullOrEmpty(personLog.HSETodaySummary) || !string.IsNullOrEmpty(personLog.HSETodaySummaryRemark) || !string.IsNullOrEmpty(personLog.HSETomorrowPlan) || !string.IsNullOrEmpty(personLog.HSETomorrowPlanRemark))
hse.ConstructionLogId = personLog.ConstructionLogId; {
hse.HSETodaySummary = personLog.HSETodaySummary; Model.ConstructionLogHSE hse = new Model.ConstructionLogHSE();
hse.HSETodaySummaryRemark = personLog.HSETodaySummaryRemark; hse.ConstructionLogId = personLog.ConstructionLogId;
hse.HSETomorrowPlan = personLog.HSETomorrowPlan; hse.HSETodaySummary = personLog.HSETodaySummary;
hse.HSETomorrowPlanRemark = personLog.HSETomorrowPlanRemark; hse.HSETodaySummaryRemark = personLog.HSETodaySummaryRemark;
hses.Add(hse); hse.HSETomorrowPlan = personLog.HSETomorrowPlan;
} hse.HSETomorrowPlanRemark = personLog.HSETomorrowPlanRemark;
if (!string.IsNullOrEmpty(personLog.CQMSTodaySummary) || !string.IsNullOrEmpty(personLog.CQMSTodaySummaryRemark) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlan) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlanRemark)) hses.Add(hse);
{ }
Model.ConstructionLogCQMS cqms = new Model.ConstructionLogCQMS(); if (!string.IsNullOrEmpty(personLog.CQMSTodaySummary) || !string.IsNullOrEmpty(personLog.CQMSTodaySummaryRemark) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlan) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlanRemark))
cqms.ConstructionLogId = personLog.ConstructionLogId; {
cqms.CQMSTodaySummary = personLog.CQMSTodaySummary; Model.ConstructionLogCQMS cqms = new Model.ConstructionLogCQMS();
cqms.CQMSTodaySummaryRemark = personLog.CQMSTodaySummaryRemark; cqms.ConstructionLogId = personLog.ConstructionLogId;
cqms.CQMSTomorrowPlan = personLog.CQMSTomorrowPlan; cqms.CQMSTodaySummary = personLog.CQMSTodaySummary;
cqms.CQMSTomorrowPlanRemark = personLog.CQMSTomorrowPlanRemark; cqms.CQMSTodaySummaryRemark = personLog.CQMSTodaySummaryRemark;
cqmss.Add(cqms); cqms.CQMSTomorrowPlan = personLog.CQMSTomorrowPlan;
cqms.CQMSTomorrowPlanRemark = personLog.CQMSTomorrowPlanRemark;
cqmss.Add(cqms);
}
} }
} }
this.GridHSETodaySummary.DataSource = hses; this.GridHSETodaySummary.DataSource = hses;