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

20240604 修改各项目巡查汇总

Browse Source
This commit is contained in:
毕文静
2024-06-04 15:52:03 +08:00
parent 864ba2551b
commit d340e503ac
19 changed files with 1832 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
+46 -3
View File
@@ -329,7 +329,7 @@ namespace BLL
}
public static List<Model.View_CQMS_InspectionManagementDetail> getInspectionManagementDetailListByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
{
List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail select x).ToList();
List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail select x).ToList();
if (!string.IsNullOrEmpty(projectId))
{
@@ -397,9 +397,9 @@ namespace BLL
}
}
public static List<Model.View_CQMS_InspectionManagementDetail> getInspectionManagementDetailListByDate(string projectId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementDetailListByDate(string projectId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
{
List<Model.View_CQMS_InspectionManagementDetail> InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.ProjectId == projectId select x).ToList();
List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList();
if (isOnceQualified == true)
{
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList();
@@ -410,5 +410,48 @@ namespace BLL
}
return InspectionMangementList;
}
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
{
List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement select x).ToList();
if (!string.IsNullOrEmpty(projectId))
{
InspectionMangementList = (from x in InspectionMangementList where x.ProjectId == projectId select x).ToList();
}
if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0")
{
InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList();
}
if (isOnceQualified == true)
{
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList();
}
if (startDate != null && SoptDate != null)
{
InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
}
return InspectionMangementList;
}
public static List<Model.ProcessControl_InspectionManagement> getInspectionManagementByUnitIdAndDate(string projectId, string unitId, DateTime startDate, DateTime SoptDate, bool isOnceQualified)
{
List<Model.ProcessControl_InspectionManagement> InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList();
if (!string.IsNullOrEmpty(unitId) && unitId != "0")
{
InspectionMangementList = (from x in InspectionMangementList where x.UnitId == unitId select x).ToList();
}
if (isOnceQualified == true)
{
InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList();
}
if (startDate != null && SoptDate != null)
{
InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList();
}
return InspectionMangementList;
}
}
}
SGGL/BLL/Common/AttachFileService.cs
+3 -1
View File
@@ -1,4 +1,5 @@
using System;
using FineUIPro;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Drawing;
@@ -87,6 +88,7 @@ namespace BLL
{
string url = file.AttachUrl.Replace('\\', '/');
fileUrl = BLL.UploadAttachmentService.ShowAttachment2("../../", url);
}
}
return fileUrl;
SGGL/BLL/Common/Const.cs
+10
View File
@@ -3241,6 +3241,16 @@ namespace BLL
/// </summary>
public const string TestRun_TrainRecordsUrl = "File\\Word\\TestRun\\生产人员培训执行情况报告.doc";
/// <summary>
/// 总包质量管理组织机构图
/// </summary>
public const string CQMS_OrganizationalUrl = "File\\Word\\CQMS\\总包质量管理组织机构图.doc";
/// <summary>
/// 分包质量管理组织机构图
/// </summary>
public const string CQMS_SubOrganizationalUrl = "File\\Word\\CQMS\\分包质量管理组织机构图.doc";
/// <summary>
/// 签到表
/// </summary>
SGGL/BLL/Common/UploadAttachmentService.cs
+2 -1
View File
@@ -1,4 +1,5 @@
using System;
using NPOI.SS.UserModel;
using System;
using System.IO;
using System.Linq;
using System.Web.UI.WebControls;
SGGL/BLL/SysManage/UserService.cs
+4 -4
View File
@@ -1611,10 +1611,10 @@ namespace BLL
}
}
public static List<string> GetUserNameListsByWorkPostName(string projectId, string workPostName)
{
return (from x in Funs.DB.View_ProjectUserWorkPost where x.ProjectId == projectId && x.WorkPostName == workPostName select x.UserName).ToList();
}
//public static List<string> GetUserNameListsByWorkPostName(string projectId, string workPostName)
//{
// return (from x in Funs.DB.View_ProjectUserWorkPost where x.ProjectId == projectId && x.WorkPostName == workPostName select x.UserName).ToList();
//}
public static List<string> GetUserNameListsByUnitIdWorkPostName(string projectId,string unitId, string workPostName)
{