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

20240508 共检通知单复制功能

Browse Source
This commit is contained in:
毕文静
2024-05-08 21:51:39 +08:00
parent 3243a2ee9e
commit a433d38b6f
59 changed files with 328 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BaseInfo/CNProfessionalService.cs
+36 -1
View File
@@ -81,6 +81,19 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName);
}
}
public static void InitCNProfessionalDocDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
{
dropName.DataValueField = "Value";
dropName.DataTextField = "Text";
dropName.DataSource = GetCNProfessionalDocItem();
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 专业下拉框
/// </summary>
@@ -104,7 +117,29 @@ namespace BLL
/// <returns></returns>
public static ListItem[] GetCNProfessionalItem()
{
var q = (from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId orderby x.SortIndex select x).ToList();
var q = (from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
orderby x.SortIndex
select x).ToList();
ListItem[] list = new ListItem[q.Count()];
for (int i = 0; i < q.Count(); i++)
{
list[i] = new ListItem(q[i].ProfessionalName ?? "", q[i].CNProfessionalId);
}
return list;
}
/// <summary>
/// 资料收发文专用
/// </summary>
/// <returns></returns>
public static ListItem[] GetCNProfessionalDocItem()
{
var q = (from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
orderby x.SortIndex
select x).ToList();
ListItem[] list = new ListItem[q.Count()];
for (int i = 0; i < q.Count(); i++)
{
SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs
+20 -6
View File
@@ -339,10 +339,10 @@ namespace BLL
{
InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId==cNProfessionalId select x).ToList();
}
if (isOnceQualified == true)
{
//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();
@@ -357,10 +357,10 @@ namespace BLL
{
InspectionMangementList = (from x in InspectionMangementList where x.UnitId == unitId select x).ToList();
}
if (isOnceQualified == true)
{
//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();
@@ -369,6 +369,20 @@ namespace BLL
return InspectionMangementList;
}
public static List<Model.View_CQMS_InspectionManagementDetail> 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();
//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;
}
/// <summary>
/// 根据主键获取视图信息
/// </summary>
SGGL/BLL/Common/Const.cs
+5
View File
@@ -3891,6 +3891,11 @@ namespace BLL
/// </summary>
public const string CNProfessionalConstructId = "96EE9000-CAB3-46F0-9392-74BC6AD5D57B";
/// <summary>
/// 安全专业ID
/// </summary>
public const string CNProfessionalHSEId = "BD344C54-66CC-4547-89AF-04C297D60CD7";
/// <summary>
/// 设备材料报验
/// </summary>
SGGL/BLL/SysManage/UserService.cs
+13
View File
@@ -1293,6 +1293,19 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName);
}
}
public static void InitUserNameProjectIdUnitTypeDropDownList(FineUIPro.DropDownList dropName, string projectId, string unitType, bool isShowPlease)
{
dropName.DataValueField = "UserName";
dropName.DataTextField = "UserName";
dropName.DataSource = BLL.UserService.GetUserListByProjectIdAndUnitType(projectId, unitType);
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 根据项目号和单位类型获取用户下拉选项
/// </summary>