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

1质量人员报验总数取在场人数，合格人数取有效期内的在场人数；

This commit is contained in:
夏菊 2025-07-09 19:10:09 +08:00
parent c5a24de409
commit 9a5ffa4632
5 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SGGL/BLL/WebService/CNCECHSSEWebService.cs
View File

@ -3274,6 +3274,7 @@
RectifyName = item.RectifyName, RectifyName = item.RectifyName,
SupRectifyId = item.SupRectifyId, SupRectifyId = item.SupRectifyId,
IsEndLever = item.IsEndLever, IsEndLever = item.IsEndLever,
RectifyType = "0",//安全
IsBuild = true IsBuild = true
}; };
newLists.Add(newList); newLists.Add(newList);

2
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
View File

@ -3112,7 +3112,7 @@ namespace BLL
var result = (from x in Funs.DB.Bo_Sheng_Train var result = (from x in Funs.DB.Bo_Sheng_Train
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty() from p in pGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(p.ProjectId) && (x.TrainType == "入场（厂）培训" || x.TrainType == "入厂（场）级培训") where BeUnderConstructionList.Contains(p.ProjectId) && (x.TrainType.Contains("入场") || x.TrainType.Contains("入厂"))
&& (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime && (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime
select new Model.EduTrainOutput() select new Model.EduTrainOutput()
{ {

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
View File

@ -758,7 +758,7 @@ namespace BLL
var result = (from x in Funs.DB.Bo_Sheng_Train var result = (from x in Funs.DB.Bo_Sheng_Train
join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty() from p in pGroup.DefaultIfEmpty()
where x.ProjectId == projectid && (x.TrainType == "入场（厂）培训" || x.TrainType == "入厂（场）级培训") where x.ProjectId == projectid && (x.TrainType.Contains("入场") || x.TrainType.Contains("入厂"))
&& (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime && (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime
select x.PersonCount ?? 0).ToList().Sum(); select x.PersonCount ?? 0).ToList().Sum();
return result; return result;

19
SGGL/FineUIPro.Web/HSSE/Technique/Rectify.aspx.cs
View File

@ -557,5 +557,24 @@ namespace FineUIPro.Web.HSSE.Technique
} }
} }
#endregion #endregion
/// <summary>
/// 从集团获取
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnGet_Click(object sender, EventArgs e)
{
var returnValue = CNCECHSSEWebService.getTechnique_RectifyList();
if (returnValue.code == 1)
{
ShowNotify(returnValue.message, MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
}
}
} }
} }

16
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>07/02/2025 14:39:26</publishTime> <publishTime>07/09/2025 15:26:57</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>07/02/2025 14:39:26</publishTime> <publishTime>07/09/2025 15:26:57</publishTime>
</File> </File>
<File Include="bin/Aspose.Words.dll"> <File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime> <publishTime>12/06/2024 20:13:58</publishTime>
</File> </File>
<File Include="bin/BLL.dll"> <File Include="bin/BLL.dll">
<publishTime>07/02/2025 14:39:06</publishTime> <publishTime>07/09/2025 15:26:37</publishTime>
</File> </File>
<File Include="bin/BLL.dll.config"> <File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime> <publishTime>12/26/2024 09:46:52</publishTime>
</File> </File>
<File Include="bin/BLL.pdb"> <File Include="bin/BLL.pdb">
<publishTime>07/02/2025 14:39:06</publishTime> <publishTime>07/09/2025 15:26:37</publishTime>
</File> </File>
<File Include="bin/BouncyCastle.Crypto.dll"> <File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime> <publishTime>12/18/2020 05:32:28</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime> <publishTime>02/09/2013 00:42:28</publishTime>
</File> </File>
<File Include="bin/WebAPI.dll"> <File Include="bin/WebAPI.dll">
<publishTime>07/02/2025 14:39:09</publishTime> <publishTime>07/09/2025 15:26:40</publishTime>
</File> </File>
<File Include="bin/WebAPI.pdb"> <File Include="bin/WebAPI.pdb">
<publishTime>07/02/2025 14:39:09</publishTime> <publishTime>07/09/2025 15:26:40</publishTime>
</File> </File>
<File Include="bin/WebAPI.xml"> <File Include="bin/WebAPI.xml">
<publishTime>07/02/2025 14:39:09</publishTime> <publishTime>07/09/2025 15:26:40</publishTime>
</File> </File>
<File Include="bin/WebGrease.dll"> <File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime> <publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>07/02/2025 14:39:10</publishTime> <publishTime>07/09/2025 15:26:42</publishTime>
</File> </File>
<File Include="Scripts/bootstrap.js"> <File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime> <publishTime>10/28/2024 14:02:50</publishTime>