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:
毕文静
2024-05-08 21:51:51 +08:00
parent a433d38b6f 0db4b1fe58
commit 6935bffa76
48 changed files with 4393 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+1 -1
View File
@@ -402,7 +402,7 @@
</Items>
</f:Panel>
<f:Panel ID="Panel12" IsFluid="true" Title="3.3 质量控制点或检验试验计划（ITP）情况" runat="server" EnableCollapse="false"
<f:Panel ID="Panel12" IsFluid="true" Title="3.3 检验试验计划（ITP）发布情况统计" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form11" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+19 -10
View File
@@ -103,7 +103,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
CNProfessionals = (from x in db.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
//&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new ProfessionalsClass
{
@@ -1542,19 +1542,28 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// orderby y.UnitCode
// select new { x.UnitId, y.UnitName };
units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
select new
{
c.CheckDate,
c.ProjectId,
u.UnitId,
u.UnitName,
c.IsOnceQualified
};
foreach (var item in units)
{
var query = from c in db.View_CQMS_InspectionManagementDetail
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
var query = from x in cqmsDetail
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
select new
{
c.CheckDate,
c.ProjectId,
u.UnitId,
u.UnitName,
c.IsOnceQualified
x.CheckDate,
x.ProjectId,
x.UnitId,
x.UnitName,
x.IsOnceQualified
};
var AllList = query.ToList();
var monethCount = query
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
+1 -1
View File
@@ -401,7 +401,7 @@
</Items>
</f:Panel>
<f:Panel ID="Panel12" IsFluid="true" Title="3.3 质量控制点或检验试验计划（ITP）情况" runat="server" EnableCollapse="false"
<f:Panel ID="Panel12" IsFluid="true" Title="3.3 检验试验计划（ITP）发布情况统计" runat="server" EnableCollapse="false"
ShowHeader="true">
<Items>
<f:Form ID="Form11" runat="server" ShowBorder="true" BodyPadding="5px" ShowHeader="false" Title="表单">
SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+19 -10
View File
@@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
CNProfessionals = (from x in db.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
//&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex
select new ProfessionalsClass
{
@@ -1546,19 +1546,28 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
// orderby y.UnitCode
// select new { x.UnitId, y.UnitName };
units = units.Where(x => x.UnitType == BLL.Const.ProjectUnitType_2 || x.UnitType == BLL.Const.ProjectUnitType_1).ToList();
var cqmsDetail = from c in db.View_CQMS_InspectionManagementDetail
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
select new
{
c.CheckDate,
c.ProjectId,
u.UnitId,
u.UnitName,
c.IsOnceQualified
};
foreach (var item in units)
{
var query = from c in db.View_CQMS_InspectionManagementDetail
join u in db.Base_Unit on c.UnitId equals u.UnitId into unitJoin
from u in unitJoin.DefaultIfEmpty()
where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
var query = from x in cqmsDetail
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == item.UnitId
select new
{
c.CheckDate,
c.ProjectId,
u.UnitId,
u.UnitName,
c.IsOnceQualified
x.CheckDate,
x.ProjectId,
x.UnitId,
x.UnitName,
x.IsOnceQualified
};
var AllList = query.ToList();
var monethCount = query