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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

Browse Source
This commit is contained in:
李超
2025-06-13 21:20:05 +08:00
parent 8c1756587d 9ad9790677
commit f62c6618a1
46 changed files with 4723 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/.vs/FineUIPro.Web.csproj.dtbcache.json
+1 -1
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx
+5 -2
View File
@@ -49,8 +49,11 @@
<f:ListItem Value="1" Text="关键工序验收" />
<f:ListItem Value="2" Text="特殊过程验收" />
<f:ListItem Value="3" Text="隐蔽工程验收" />
<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />
<f:ListItem Value="4" Text="单位工程验收" />
<f:ListItem Value="5" Text="分部工程验收" />
<f:ListItem Value="6" Text="分项工程验收" />
<%--<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />--%>
</f:DropDownList>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx
+5 -2
View File
@@ -49,8 +49,11 @@
<f:ListItem Value="1" Text="关键工序验收" />
<f:ListItem Value="2" Text="特殊过程验收" />
<f:ListItem Value="3" Text="隐蔽工程验收" />
<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />
<f:ListItem Value="4" Text="单位工程验收" />
<f:ListItem Value="5" Text="分部工程验收" />
<f:ListItem Value="6" Text="分项工程验收" />
<%--<f:ListItem Value="4" Text="单位工程一次验收" />
<f:ListItem Value="5" Text="材料进场复验" />--%>
</f:DropDownList>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx
+8 -2
View File
@@ -32,6 +32,12 @@
Width="200px" LabelWidth="70px"
LabelAlign="right">
</f:TextBox>
<f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
<f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged"></f:Button>
@@ -51,10 +57,10 @@
<f:CheckBox runat="server" ID="chManager" Label="管理人员" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
<f:CheckBox runat="server" ID="chIsHsse" Label="安管人员" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
<f:CheckBox runat="server" ID="chIsCQMS" Label="质量管理" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.cs
+1 -1
View File
@@ -77,7 +77,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
var getData = PersonService.getListData(this.ProjectId, unitId, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(),
"", Funs.GetStringByArray(this.drpPost.SelectedValueArray), this.ckTrain.Checked, this.rblPost.SelectedValue, this.ckJT.Checked,
false, this.chManager.Checked, Grid1, true);
false, this.chManager.Checked, this.chIsHsse.Checked, this.chIsCQMS.Checked, Grid1, true);
Grid1.RecordCount = PersonService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
SGGL/FineUIPro.Web/HSSE/SitePerson/BlackPersonList.aspx.designer.cs
Generated
+22 -4
View File
@@ -86,6 +86,24 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.TextBox txtIdentityCard;
/// <summary>
/// ckJT 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckJT;
/// <summary>
/// ckTrain 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckTrain;
/// <summary>
/// btSearch 控件。
/// </summary>
@@ -123,22 +141,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
protected global::FineUIPro.CheckBox chManager;
/// <summary>
/// ckJT 控件。
/// chIsHsse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckJT;
protected global::FineUIPro.CheckBox chIsHsse;
/// <summary>
/// ckTrain 控件。
/// chIsCQMS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckTrain;
protected global::FineUIPro.CheckBox chIsCQMS;
/// <summary>
/// ToolbarFill1 控件。
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx
+11 -5
View File
@@ -65,6 +65,15 @@
Width="200px" LabelWidth="70px"
LabelAlign="right">
</f:TextBox>
<f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckIdCardInfoNotOK" Label="信息不全" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:ToolbarFill runat="server">
</f:ToolbarFill>
<f:Button ID="btSearch" Text="查询" Icon="SystemSearch" runat="server" OnClick="TextBox_TextChanged"></f:Button>
@@ -85,13 +94,10 @@
<f:CheckBox runat="server" ID="chManager" Label="管理人员" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckJT" Label="未同步" LabelAlign="right" LabelWidth="70px"
<f:CheckBox runat="server" ID="chIsHsse" Label="安管人员" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckTrain" Label="未培训" LabelAlign="right" LabelWidth="70px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:CheckBox runat="server" ID="ckIdCardInfoNotOK" Label="信息不全" LabelAlign="right" LabelWidth="80px"
<f:CheckBox runat="server" ID="chIsCQMS" Label="质量管理" LabelAlign="right" LabelWidth="80px"
AutoPostBack="true" OnCheckedChanged="TextBox_TextChanged">
</f:CheckBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs
+1 -1
View File
@@ -182,7 +182,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
var getData = PersonService.getListData(this.ProjectId, unitId, this.txtPersonName.Text.Trim(), this.txtIdentityCard.Text.Trim(),
this.drpTreamGroup.SelectedValue, Funs.GetStringByArray(this.drpPost.SelectedValueArray), this.ckTrain.Checked, this.rblPost.SelectedValue, this.ckJT.Checked,
this.ckIdCardInfoNotOK.Checked, this.chManager.Checked, Grid1);
this.ckIdCardInfoNotOK.Checked, this.chManager.Checked, this.chIsHsse.Checked, this.chIsCQMS.Checked, Grid1);
Grid1.RecordCount = PersonService.count;
Grid1.DataSource = getData;
Grid1.DataBind();
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.designer.cs
Generated
+31 -13
View File
@@ -140,6 +140,33 @@ namespace FineUIPro.Web.HSSE.SitePerson
/// </remarks>
protected global::FineUIPro.TextBox txtIdentityCard;
/// <summary>
/// ckJT 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckJT;
/// <summary>
/// ckTrain 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckTrain;
/// <summary>
/// ckIdCardInfoNotOK 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIdCardInfoNotOK;
/// <summary>
/// btSearch 控件。
/// </summary>
@@ -186,31 +213,22 @@ namespace FineUIPro.Web.HSSE.SitePerson
protected global::FineUIPro.CheckBox chManager;
/// <summary>
/// ckJT 控件。
/// chIsHsse 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckJT;
protected global::FineUIPro.CheckBox chIsHsse;
/// <summary>
/// ckTrain 控件。
/// chIsCQMS 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckTrain;
/// <summary>
/// ckIdCardInfoNotOK 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckIdCardInfoNotOK;
protected global::FineUIPro.CheckBox chIsCQMS;
/// <summary>
/// ToolbarFill1 控件。
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx
+3 -1
View File
@@ -82,7 +82,9 @@
</f:FormRow>
<f:FormRow runat="server">
<items>
<f:CheckBox runat="server" Label="是否督查人员" LabelAlign="Right" ID="cbIsInspectionBrigade" />
<f:DropDownList ID="drpCertificate" runat="server" Label="特岗证书" LabelAlign="Right" LabelWidth="90px" EnableEdit="true" EnableCheckBoxSelect="True" EnableMultiSelect="True" EmptyText="--请选择--" AutoSelectFirstItem="false" >
</f:DropDownList>
<f:CheckBox runat="server" Label="是否督查人员" LabelAlign="Right" ID="cbIsInspectionBrigade" LabelWidth="100px" />
</items>
</f:FormRow>
</Rows>
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.cs
+16
View File
@@ -78,6 +78,7 @@ namespace FineUIPro.Web.SysManage
DepartService.InitDepartDropDownList(this.drpDepart, true);
CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true);
CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true);
CertificateService.InitCertificateDropDownList(this.drpCertificate, false);
if (!string.IsNullOrEmpty(this.UnitId))
{
this.drpIsOffice.SelectedValue = "False";
@@ -126,6 +127,7 @@ namespace FineUIPro.Web.SysManage
this.Image2.ImageUrl = "~/" + this.SignatureUrl;
}
this.drpDepart.SelectedValue = user.DepartId;
this.drpCertificate.SelectedValueArray = PersonQualityService.GetListPersonQualityByUserId(this.UserId)?.Select(x => x.CertificateId).ToArray();
if (!string.IsNullOrEmpty(user.MainCNProfessionalId))
{
this.drpMainCNProfessional.SelectedValue = user.MainCNProfessionalId;
@@ -222,6 +224,7 @@ namespace FineUIPro.Web.SysManage
newUser.SignatureUrl = this.SignatureUrl;
newUser.IsPost = Convert.ToBoolean(this.drpIsPost.SelectedValue);
newUser.IsOffice = Convert.ToBoolean(this.drpIsOffice.SelectedValue);
newUser.CertificateId = drpCertificate.SelectedValue;
if (this.drpMainCNProfessional.SelectedValue != Const._Null)
{
newUser.MainCNProfessionalId = this.drpMainCNProfessional.SelectedValue;
@@ -258,6 +261,19 @@ namespace FineUIPro.Web.SysManage
UserService.UpdateUser(newUser);
LogService.AddSys_Log(this.CurrUser, newUser.UserCode, newUser.UserId, BLL.Const.UserMenuId, BLL.Const.BtnModify);
}
PersonQualityService.DeleteUserQuality(this.UserId);
foreach (var item in this.drpCertificate.SelectedValueArray)
{
Model.QualityAudit_PersonQuality newPersonQuality = new Model.QualityAudit_PersonQuality
{
PersonQualityId = SQLHelper.GetNewID(typeof(Model.QualityAudit_PersonQuality)),
UserId = this.UserId,
CompileMan = this.CurrUser.UserId,
CompileDate = DateTime.Now
};
newPersonQuality.CertificateId = item;
BLL.PersonQualityService.AddPersonQuality(newPersonQuality);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
SGGL/FineUIPro.Web/SysManage/UserListEdit.aspx.designer.cs
Generated
+9
View File
@@ -194,6 +194,15 @@ namespace FineUIPro.Web.SysManage
/// </remarks>
protected global::FineUIPro.RadioButtonList rblHomePageType;
/// <summary>
/// drpCertificate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCertificate;
/// <summary>
/// cbIsInspectionBrigade 控件。
/// </summary>
SGGL/FineUIPro.Web/common/main_new.aspx.cs
+1 -1
View File
@@ -184,7 +184,7 @@ namespace FineUIPro.Web.common
// 质量管理人员（合并公司+项目级查询）
var qualityQuery = db.Base_WorkPost
.Where(x => x.IsCQMS == true)
.GroupJoin(db.SitePerson_Person.Where(x => x.IsUsed == true),
.GroupJoin(db.SitePerson_Person.Where(x => x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)),
post => post.WorkPostId,
person => person.WorkPostId,
(post, persons) => new { post, persons })
SGGL/FineUIPro.Web/common/main_new1.aspx
+43 -17
View File
@@ -428,8 +428,8 @@
let opt = {
grid: {
top: fontSize(60),
bottom: fontSize(30)
top: fontSize(40),
bottom: fontSize(20)
},
legend: {
top: fontSize(10),
@@ -440,7 +440,6 @@
type: 'category',
data: label,
axisLabel: {
color: '#3FB0FF'
},
axisLine: {
@@ -449,23 +448,47 @@
color: '#84D7FE'
}
},
axisTick: {
show: false
}
//axisTick: {
// show: false
//}
},
yAxis: {
type: 'value',
axisLabel: {
color: '#3FB0FF'
yAxis: [
{
type: 'value',
name: '数量',
position: 'left',
splitNumber: 5,
alignTicks: true,
axisLabel: {
color: '#3FB0FF'
},
splitLine: {
lineStyle: {
color: '#1B538B', // 设置Y轴线颜色为白色
type: 'dashed'
}
},
},
splitLine: {
show: true,
lineStyle: {
color: '#1B538B',
type: 'dashed'
{
type: 'value',
name: '百分比',
position: 'right',
splitNumber: 5,
interval: 25,
max: 100,
min: 0,
alignTicks: true,
axisLabel: {
color: '#3FB0FF'
},
splitLine: {
lineStyle: {
color: '#1B538B', // 设置Y轴线颜色为白色
type: 'dashed'
}
}
}
},
],
series: [
{
name: '<%=total%>',
@@ -475,6 +498,7 @@
itemStyle: {
color: '#20AFFF'
},
yAxisIndex: 0,
label: {
// 柱图头部显示值
show: true,
@@ -483,7 +507,7 @@
fontSize: fontSize(10),
formatter: (params) => {
let str = params.value;
console.log(params.name)
//console.log(params.name)
if (params.name == '<%=RectificationRate%>') {
str = str + '%'
}
@@ -499,6 +523,7 @@
itemStyle: {
color: '#12CDA2'
},
yAxisIndex: 0,
label: {
// 柱图头部显示值
show: true,
@@ -522,6 +547,7 @@
itemStyle: {
color: '#FFA602'
},
yAxisIndex: 1,
showSymbol: false,
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
SGGL/FineUIPro.Web/common/main_new1.aspx.cs
+54 -30
View File
@@ -1,5 +1,6 @@
using BLL;
using FineUIPro.Web.BaseInfo;
using FineUIPro.Web.DataShow;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -148,14 +149,15 @@ namespace FineUIPro.Web.common
{
int result = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where y.IsCQMS == true && x.IsUsed == true
where y.IsCQMS == true && x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
select x).Count();
return result;
}
else {
else
{
int result = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where y.IsCQMS == true && x.IsUsed == true && pids.Contains(x.ProjectId)
where y.IsCQMS == true && x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now) && pids.Contains(x.ProjectId)
select x).Count();
return result;
}
@@ -175,7 +177,8 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.IsOnSite == true && x.InspectionType.Contains("计量") && pids.Contains(x.ProjectId)
select x).Count();
@@ -196,7 +199,8 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
int result = (from x in Funs.DB.Comprehensive_InspectionMachine
where x.IsOnSite == true && x.InspectionType.Contains("计量") && x.IsCheckOK == true && pids.Contains(x.ProjectId)
select x).Count();
@@ -223,7 +227,8 @@ namespace FineUIPro.Web.common
result = num2;
return result;
}
else {
else
{
int result = 0;
//过期提醒记录数
var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now
@@ -247,7 +252,8 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
int result = (from x in Funs.DB.Comprehensive_InspectionPerson
where x.IsTrain == true && pids.Contains(x.ProjectId)
select x).Count();
@@ -268,7 +274,8 @@ namespace FineUIPro.Web.common
var q = Funs.GetNewIntOrZero(result.ToString());
return q;
}
else {
else
{
var result = (from x in Funs.DB.Comprehensive_DesignDetails
where pids.Contains(x.ProjectId)
select x.JoinPersonNum ?? 0).ToList().Sum();
@@ -285,19 +292,30 @@ namespace FineUIPro.Web.common
if (pids == null)
{
int allCount = 0;
var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true
var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality
join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
join z in Funs.DB.Base_WorkPost on y.WorkPostId equals z.WorkPostId
where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.OutTime == null && z.PostType == Const.PostType_2
select x;
//var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
// where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true
// select x;
//// 预警人数
allCount = getPersonQualitys.Count();
this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
}
else {
else
{
int allCount = 0;
var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true && pids.Contains(x.ProjectId)
var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality
join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
join z in Funs.DB.Base_WorkPost on y.WorkPostId equals z.WorkPostId
where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.OutTime == null && z.PostType == Const.PostType_2 && pids.Contains(y.ProjectId)
select x;
//var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
// where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true && pids.Contains(x.ProjectId)
// select x;
//// 预警人数
allCount = getPersonQualitys.Count();
this.spanQualityChartAnalysis.InnerHtml = allCount.ToString();
@@ -326,7 +344,8 @@ namespace FineUIPro.Web.common
// select x).Count();
return result;
}
else {
else
{
int result = 0;
var num1 = (from x in Funs.DB.ProcessControl_InspectionManagement
where pids.Contains(x.ProjectId)
@@ -337,7 +356,7 @@ namespace FineUIPro.Web.common
}
}
/// <summary>
/// 次合格数量
/// 一次合格数量
/// </summary>
/// <returns></returns>
public int getIsOnceInspectionManagement()
@@ -350,7 +369,7 @@ namespace FineUIPro.Web.common
// BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(
// null, null, DateTime.Parse("2001-01-01"), DateTime.Now, true);
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == true
where (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).Count();
result = num2;
@@ -359,11 +378,12 @@ namespace FineUIPro.Web.common
// select x).Count();
return result;
}
else {
else
{
int result = 0;
var num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.IsOnceQualified == true && pids.Contains(x.ProjectId)
where (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
select x).Count();
result = num2;
@@ -398,7 +418,8 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
int result = (from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.State == "7" && pids.Contains(x.ProjectId)
select x).Count();
@@ -418,7 +439,8 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
int result = (from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && x.State != "7" && pids.Contains(x.ProjectId)
select x).Count();
@@ -463,7 +485,8 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
int result = (from x in Funs.DB.Check_CheckControl
where x.CheckDate <= DateTime.Now && pids.Contains(x.ProjectId)
select x).Count();
@@ -583,7 +606,8 @@ namespace FineUIPro.Web.common
}
return result;
}
else {
else
{
int result = 0;
var getD1 = from x in Funs.DB.HJGL_FL_TotalQuantity
@@ -708,7 +732,7 @@ namespace FineUIPro.Web.common
private void getInspectionManagementInfo()
{
if (this.CurrUser.UserId == BLL.Const.hfnbdId)
if (this.CurrUser.UserId == BLL.Const.hfnbdId && 1 == 2)
{
//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();
var q = (from x in Funs.DB.Control_PointCropping where x.ParentId == null || x.ParentId == "" orderby x.OperateTime select x).ToList();
@@ -731,7 +755,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.ControlId
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true
where x.CNProfessionalId == item.ControlId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).Count();
}
else
@@ -740,7 +764,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.ControlId && pids.Contains(x.ProjectId)
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.ControlId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
where x.CNProfessionalId == item.ControlId && (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
select x).Count();
}
@@ -767,7 +791,7 @@ namespace FineUIPro.Web.common
else
{
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();
foreach (var item in q)
{
//获取专业
@@ -785,7 +809,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.CNProfessionalId
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true
where x.CNProfessionalId == item.CNProfessionalId && (x.IsOnceQualified == null || x.IsOnceQualified == true)
select x).Count();
}
else
@@ -794,7 +818,7 @@ namespace FineUIPro.Web.common
where x.CNProfessionalId == item.CNProfessionalId && pids.Contains(x.ProjectId)
select x).Count();
num2 = (from x in Funs.DB.ProcessControl_InspectionManagement
where x.CNProfessionalId == item.CNProfessionalId && x.IsOnceQualified == true && pids.Contains(x.ProjectId)
where x.CNProfessionalId == item.CNProfessionalId && (x.IsOnceQualified == null || x.IsOnceQualified == true) && pids.Contains(x.ProjectId)
select x).Count();
}
@@ -839,7 +863,7 @@ namespace FineUIPro.Web.common
protected string ncrCount;
private void getNcrInfo()
{
if (pids==null)
if (pids == null)
{
//闭环项 有完成日期的
//var num1 = Funs.DB.Comprehensive_NCRManagement.Where(x => x.CompleteDate != null).Count();
@@ -888,7 +912,7 @@ namespace FineUIPro.Web.common
ncrZy = ncrZy.TrimEnd(',');
ncrCount = ncrCount.TrimEnd(',');
}
}
#endregion