gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260608 1

Browse Source
This commit is contained in:
毕文静
2026-06-08 09:39:29 +08:00
parent 561bcf31a0
commit 275081ee41
5 changed files with 259 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+3
View File
@@ -63,6 +63,9 @@
<Reference Include="Aspose.Words, Version=21.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL"> <Reference Include="Aspose.Words, Version=21.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\packages\Aspose.Words.21.8.0\lib\net461\Aspose.Words.dll</HintPath> <HintPath>..\packages\Aspose.Words.21.8.0\lib\net461\Aspose.Words.dll</HintPath>
</Reference> </Reference>
<Reference Include="Aspose.Words.Pdf2Word, Version=21.8.0.0, Culture=neutral, PublicKeyToken=716fcc553a201e56, processorArchitecture=MSIL">
<HintPath>..\packages\Aspose.Words.21.8.0\lib\net461\Aspose.Words.Pdf2Word.dll</HintPath>
</Reference>
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL"> <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath> <HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference> </Reference>
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
View File
@@ -2,7 +2,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />
<IISExpressAnonymousAuthentication /> <IISExpressAnonymousAuthentication />
HJGL_DS/FineUIPro.Web/JGZL/Cover.aspx.cs
+52 -45
View File
@@ -11,6 +11,7 @@ using System.Data.SqlClient;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Web.UI.DataVisualization.Charting; using System.Web.UI.DataVisualization.Charting;
using Aspose.Words.Loading;
namespace FineUIPro.Web.JGZL namespace FineUIPro.Web.JGZL
{ {
@@ -371,7 +372,6 @@ namespace FineUIPro.Web.JGZL
var PathB = Funs.RootPath + "FileUpload/" + projectId + "2.docx"; var PathB = Funs.RootPath + "FileUpload/" + projectId + "2.docx";
BLL.Common.FastReportService.ExportMergeReport(FastReportItemList2, PathB, this.drpPrintType.SelectedValue); BLL.Common.FastReportService.ExportMergeReport(FastReportItemList2, PathB, this.drpPrintType.SelectedValue);
Aspose.Words.Document doc2 = new Aspose.Words.Document(PathB); Aspose.Words.Document doc2 = new Aspose.Words.Document(PathB);
//合并 Word DOcx 文档 //合并 Word DOcx 文档
doc1.AppendDocument(doc2, Aspose.Words.ImportFormatMode.KeepSourceFormatting); doc1.AppendDocument(doc2, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
#endregion #endregion
@@ -392,7 +392,6 @@ namespace FineUIPro.Web.JGZL
var PathC = Funs.RootPath + "FileUpload/" + projectId + "3.docx"; var PathC = Funs.RootPath + "FileUpload/" + projectId + "3.docx";
BLL.Common.FastReportService.ExportMergeReport(FastReportItemList3, PathC, this.drpPrintType.SelectedValue); BLL.Common.FastReportService.ExportMergeReport(FastReportItemList3, PathC, this.drpPrintType.SelectedValue);
Aspose.Words.Document doc3 = new Aspose.Words.Document(PathC); Aspose.Words.Document doc3 = new Aspose.Words.Document(PathC);
//合并 Word DOcx 文档 //合并 Word DOcx 文档
doc1.AppendDocument(doc3, Aspose.Words.ImportFormatMode.KeepSourceFormatting); doc1.AppendDocument(doc3, Aspose.Words.ImportFormatMode.KeepSourceFormatting);
#endregion #endregion
@@ -638,6 +637,8 @@ namespace FineUIPro.Web.JGZL
dt.Columns.Add("FileName"); dt.Columns.Add("FileName");
dt.Columns.Add("Remark"); dt.Columns.Add("Remark");
if (tb.Rows.Count > 0)
{
DataRow[] rows = tb.DefaultView.ToTable().Select(); DataRow[] rows = tb.DefaultView.ToTable().Select();
int i = 0; int i = 0;
foreach (var row in rows) foreach (var row in rows)
@@ -651,6 +652,7 @@ namespace FineUIPro.Web.JGZL
i++; i++;
} }
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
}
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
@@ -766,9 +768,6 @@ namespace FineUIPro.Web.JGZL
} }
break; break;
case "4"://压力管道安装质量证明 case "4"://压力管道安装质量证明
{
var report = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateByProjectId(projectId);
if (report != null)
{ {
DataTable dt = new DataTable(); DataTable dt = new DataTable();
dt.TableName = "Data"; dt.TableName = "Data";
@@ -791,7 +790,9 @@ namespace FineUIPro.Web.JGZL
dt.Columns.Add("ConstructionUnit"); dt.Columns.Add("ConstructionUnit");
dt.Columns.Add("SpecialEquipmentProductionLicenseCode"); dt.Columns.Add("SpecialEquipmentProductionLicenseCode");
dt.Columns.Add("Remark"); dt.Columns.Add("Remark");
var report = BLL.IndustrialPipelineInstallationQualityCertificateService.GetIndustrialPipelineInstallationQualityCertificateByProjectId(projectId);
if (report != null)
{
var newRow = dt.NewRow(); var newRow = dt.NewRow();
newRow["CertificateCode"] = report.CertificateCode; newRow["CertificateCode"] = report.CertificateCode;
newRow["EngineeringName"] = BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName; newRow["EngineeringName"] = BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName;
@@ -817,7 +818,7 @@ namespace FineUIPro.Web.JGZL
dt.Rows.Add(newRow); dt.Rows.Add(newRow);
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
}
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
//keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); //keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
@@ -829,10 +830,10 @@ namespace FineUIPro.Web.JGZL
fastReportItem.ParameterValues = keyValuePairs; fastReportItem.ParameterValues = keyValuePairs;
fastReportItem.DataTables = dataTables; fastReportItem.DataTables = dataTables;
} }
}
break; break;
case "5"://压力管道安装汇总表 case "5"://压力管道安装汇总表
{ {
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
string strSql = @"SELECT * from JGZL_IndustrialPipelineInstallationSummary where ProjectId = @ProjectId "; string strSql = @"SELECT * from JGZL_IndustrialPipelineInstallationSummary where ProjectId = @ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", projectId)); listStr.Add(new SqlParameter("@ProjectId", projectId));
@@ -844,8 +845,7 @@ namespace FineUIPro.Web.JGZL
} }
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
if (tb.Rows.Count > 0)
{
DataTable dt = new DataTable(); DataTable dt = new DataTable();
dt.TableName = "Data"; dt.TableName = "Data";
dt.Columns.Add("Num"); dt.Columns.Add("Num");
@@ -873,7 +873,8 @@ namespace FineUIPro.Web.JGZL
dt.Columns.Add("PipelineStartPoint"); dt.Columns.Add("PipelineStartPoint");
dt.Columns.Add("PipelineEndPoint"); dt.Columns.Add("PipelineEndPoint");
dt.Columns.Add("Remark"); dt.Columns.Add("Remark");
if (tb.Rows.Count > 0)
{
DataRow[] rows = tb.DefaultView.ToTable().Select(); DataRow[] rows = tb.DefaultView.ToTable().Select();
int i = 0; int i = 0;
foreach (var row in rows) foreach (var row in rows)
@@ -910,7 +911,6 @@ namespace FineUIPro.Web.JGZL
i++; i++;
} }
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
string certificateCode = string.Empty; string certificateCode = string.Empty;
string deliveryUnit = string.Empty; string deliveryUnit = string.Empty;
string deliveryUnitCode = string.Empty; string deliveryUnitCode = string.Empty;
@@ -922,10 +922,10 @@ namespace FineUIPro.Web.JGZL
deliveryUnit = certificate.DeliveryUnit; deliveryUnit = certificate.DeliveryUnit;
deliveryUnitCode = certificate.DeliveryUnitCode; deliveryUnitCode = certificate.DeliveryUnitCode;
} }
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("CertificateCode", certificateCode); keyValuePairs.Add("CertificateCode", certificateCode);
keyValuePairs.Add("DeliveryUnit", deliveryUnit); keyValuePairs.Add("DeliveryUnit", deliveryUnit);
keyValuePairs.Add("DeliveryUnitCode", deliveryUnitCode); keyValuePairs.Add("DeliveryUnitCode", deliveryUnitCode);
}
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\压力管道安装汇总表.frx"; initTemplatePath = "File\\Fastreport\\JGZL\\压力管道安装汇总表.frx";
@@ -935,15 +935,14 @@ namespace FineUIPro.Web.JGZL
fastReportItem.ParameterValues = keyValuePairs; fastReportItem.ParameterValues = keyValuePairs;
fastReportItem.DataTables = dataTables; fastReportItem.DataTables = dataTables;
} }
}
break; break;
case "6"://工程施工开工报告 case "6"://工程施工开工报告
{ {
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
var report = BLL.CommencementReportService.GetCommencementReportByProjectId(projectId); var report = BLL.CommencementReportService.GetCommencementReportByProjectId(projectId);
if (report != null) if (report != null)
{ {
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("ContractNumber", report.ContractNumber); keyValuePairs.Add("ContractNumber", report.ContractNumber);
keyValuePairs.Add("DesignUnit", report.DesignUnit); keyValuePairs.Add("DesignUnit", report.DesignUnit);
keyValuePairs.Add("PlannedStartDate", report.PlannedStartDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.PlannedStartDate) : ""); keyValuePairs.Add("PlannedStartDate", report.PlannedStartDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.PlannedStartDate) : "");
@@ -952,8 +951,8 @@ namespace FineUIPro.Web.JGZL
keyValuePairs.Add("Conditions", report.Conditions); keyValuePairs.Add("Conditions", report.Conditions);
keyValuePairs.Add("ReviewOpinion", report.ReviewOpinion); keyValuePairs.Add("ReviewOpinion", report.ReviewOpinion);
keyValuePairs.Add("QualitySupervisionOpinion", report.QualitySupervisionOpinion); keyValuePairs.Add("QualitySupervisionOpinion", report.QualitySupervisionOpinion);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
} }
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\工程施工开工报告.frx"; initTemplatePath = "File\\Fastreport\\JGZL\\工程施工开工报告.frx";
List<DataTable> dataTables = new List<DataTable>(); List<DataTable> dataTables = new List<DataTable>();
@@ -966,18 +965,18 @@ namespace FineUIPro.Web.JGZL
case "7"://工程中间交接证书 case "7"://工程中间交接证书
{ {
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
var report = BLL.HandoverCertificateService.GetHandoverCertificateByProjectId(projectId); var report = BLL.HandoverCertificateService.GetHandoverCertificateByProjectId(projectId);
if (report != null) if (report != null)
{ {
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("ContractNumber", report.ContractNumber); keyValuePairs.Add("ContractNumber", report.ContractNumber);
keyValuePairs.Add("HandoverDate", report.HandoverDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.HandoverDate) : ""); keyValuePairs.Add("HandoverDate", report.HandoverDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.HandoverDate) : "");
keyValuePairs.Add("ProjectContent", report.ProjectContent); keyValuePairs.Add("ProjectContent", report.ProjectContent);
keyValuePairs.Add("ReceiveOpinions", report.ReceiveOpinions); keyValuePairs.Add("ReceiveOpinions", report.ReceiveOpinions);
keyValuePairs.Add("HeaderMan", report.HeaderMan); keyValuePairs.Add("HeaderMan", report.HeaderMan);
keyValuePairs.Add("SupervisionOpinion", report.SupervisionOpinion); keyValuePairs.Add("SupervisionOpinion", report.SupervisionOpinion);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
} }
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\工程中间交接证书.frx"; initTemplatePath = "File\\Fastreport\\JGZL\\工程中间交接证书.frx";
List<DataTable> dataTables = new List<DataTable>(); List<DataTable> dataTables = new List<DataTable>();
//dataTables.Add(dt); //dataTables.Add(dt);
@@ -989,10 +988,10 @@ namespace FineUIPro.Web.JGZL
case "8"://工程交工验收证书 case "8"://工程交工验收证书
{ {
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
var report = BLL.AcceptanceCertificateService.GetAcceptanceCertificateByProjectId(projectId); var report = BLL.AcceptanceCertificateService.GetAcceptanceCertificateByProjectId(projectId);
if (report != null) if (report != null)
{ {
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("ContractNumber", report.ContractNumber); keyValuePairs.Add("ContractNumber", report.ContractNumber);
keyValuePairs.Add("StartDate", report.StartDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.StartDate) : ""); keyValuePairs.Add("StartDate", report.StartDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.StartDate) : "");
keyValuePairs.Add("EndDate", report.EndDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.EndDate) : ""); keyValuePairs.Add("EndDate", report.EndDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.EndDate) : "");
@@ -1000,8 +999,8 @@ namespace FineUIPro.Web.JGZL
keyValuePairs.Add("AcceptanceOpinion", report.AcceptanceOpinion); keyValuePairs.Add("AcceptanceOpinion", report.AcceptanceOpinion);
keyValuePairs.Add("HeaderMan", report.HeaderMan); keyValuePairs.Add("HeaderMan", report.HeaderMan);
keyValuePairs.Add("SupervisoryOpinion", report.SupervisoryOpinion); keyValuePairs.Add("SupervisoryOpinion", report.SupervisoryOpinion);
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
} }
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\工程交工验收证书.frx"; initTemplatePath = "File\\Fastreport\\JGZL\\工程交工验收证书.frx";
List<DataTable> dataTables = new List<DataTable>(); List<DataTable> dataTables = new List<DataTable>();
//dataTables.Add(dt); //dataTables.Add(dt);
@@ -1013,10 +1012,10 @@ namespace FineUIPro.Web.JGZL
case "9"://工程联络单 case "9"://工程联络单
{ {
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
var report = BLL.ContactService.GetContactByProjectId(projectId, "1"); var report = BLL.ContactService.GetContactByProjectId(projectId, "1");
if (report != null) if (report != null)
{ {
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("ContractNumber", report.ContractNumber); keyValuePairs.Add("ContractNumber", report.ContractNumber);
keyValuePairs.Add("DeliveryUnit", report.DeliveryUnit); keyValuePairs.Add("DeliveryUnit", report.DeliveryUnit);
keyValuePairs.Add("SubjectMatter", report.SubjectMatter); keyValuePairs.Add("SubjectMatter", report.SubjectMatter);
@@ -1030,8 +1029,8 @@ namespace FineUIPro.Web.JGZL
keyValuePairs.Add("OpinionHandDate", report.OpinionHandDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.OpinionHandDate) : ""); keyValuePairs.Add("OpinionHandDate", report.OpinionHandDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.OpinionHandDate) : "");
keyValuePairs.Add("OpinionsReviewer", report.OpinionsReviewer); keyValuePairs.Add("OpinionsReviewer", report.OpinionsReviewer);
keyValuePairs.Add("OpinionsDate", report.OpinionsDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.OpinionsDate) : ""); keyValuePairs.Add("OpinionsDate", report.OpinionsDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.OpinionsDate) : "");
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
} }
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\工程联络单.frx"; initTemplatePath = "File\\Fastreport\\JGZL\\工程联络单.frx";
List<DataTable> dataTables = new List<DataTable>(); List<DataTable> dataTables = new List<DataTable>();
//dataTables.Add(dt); //dataTables.Add(dt);
@@ -1043,10 +1042,10 @@ namespace FineUIPro.Web.JGZL
case "10"://施工图核查记录 case "10"://施工图核查记录
{ {
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
var report = BLL.ConDrawingVerificationService.GetConDrawingVerificationByProjectId(projectId); var report = BLL.ConDrawingVerificationService.GetConDrawingVerificationByProjectId(projectId);
if (report != null) if (report != null)
{ {
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
keyValuePairs.Add("DesignUnit", report.DesignUnit); keyValuePairs.Add("DesignUnit", report.DesignUnit);
keyValuePairs.Add("Professional", report.Professional); keyValuePairs.Add("Professional", report.Professional);
keyValuePairs.Add("Host", report.Host); keyValuePairs.Add("Host", report.Host);
@@ -1059,9 +1058,8 @@ namespace FineUIPro.Web.JGZL
keyValuePairs.Add("RecordDate", report.RecordDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.RecordDate) : ""); keyValuePairs.Add("RecordDate", report.RecordDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.RecordDate) : "");
keyValuePairs.Add("Reviewer", report.Reviewer); keyValuePairs.Add("Reviewer", report.Reviewer);
keyValuePairs.Add("ReviewDate", report.ReviewDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.ReviewDate) : ""); keyValuePairs.Add("ReviewDate", report.ReviewDate.HasValue ? string.Format("{0:yyyy年MM月dd日}", report.ReviewDate) : "");
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
} }
BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
initTemplatePath = "File\\Fastreport\\JGZL\\施工图核查记录.frx"; initTemplatePath = "File\\Fastreport\\JGZL\\施工图核查记录.frx";
List<DataTable> dataTables = new List<DataTable>(); List<DataTable> dataTables = new List<DataTable>();
//dataTables.Add(dt); //dataTables.Add(dt);
@@ -1089,7 +1087,8 @@ namespace FineUIPro.Web.JGZL
dt.Columns.Add("CertificateNo"); dt.Columns.Add("CertificateNo");
dt.Columns.Add("QualifiedProjectCode"); dt.Columns.Add("QualifiedProjectCode");
dt.Columns.Add("LimitDate"); dt.Columns.Add("LimitDate");
if (tb.Rows.Count > 0)
{
tb.DefaultView.Sort = "Number asc"; tb.DefaultView.Sort = "Number asc";
DataRow[] rows = tb.DefaultView.ToTable().Select(); DataRow[] rows = tb.DefaultView.ToTable().Select();
foreach (var row in rows) foreach (var row in rows)
@@ -1104,6 +1103,7 @@ namespace FineUIPro.Web.JGZL
dt.Rows.Add(newRow); dt.Rows.Add(newRow);
} }
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
}
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
@@ -1193,6 +1193,8 @@ namespace FineUIPro.Web.JGZL
dt.Columns.Add("JOT_PrepareTemp"); dt.Columns.Add("JOT_PrepareTemp");
dt.Columns.Add("WeldDate"); dt.Columns.Add("WeldDate");
if (tb.Rows.Count > 0)
{
DataView dv = tb.DefaultView;//获取表视图 DataView dv = tb.DefaultView;//获取表视图
dv.Sort = "JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5 ASC";//按照ID排序 dv.Sort = "JOTY_Group,Sort1,Sort2,Sort3,Sort4,Sort5 ASC";//按照ID排序
tb = dv.ToTable();//转为表 tb = dv.ToTable();//转为表
@@ -1214,6 +1216,7 @@ namespace FineUIPro.Web.JGZL
dt.Rows.Add(newRow); dt.Rows.Add(newRow);
} }
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
}
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
@@ -1380,6 +1383,8 @@ namespace FineUIPro.Web.JGZL
dt.Columns.Add("SMAWWelder"); dt.Columns.Add("SMAWWelder");
dt.Columns.Add("VTInspector"); dt.Columns.Add("VTInspector");
if (tb.Rows.Count > 0)
{
DataView dv = tb.DefaultView;//获取表视图 DataView dv = tb.DefaultView;//获取表视图
dv.Sort = "PipelineNo,WeldingJointNo ASC";//按照ID倒序排序 dv.Sort = "PipelineNo,WeldingJointNo ASC";//按照ID倒序排序
tb = dv.ToTable();//转为表 tb = dv.ToTable();//转为表
@@ -1410,6 +1415,7 @@ namespace FineUIPro.Web.JGZL
i++; i++;
} }
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
}
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName);
@@ -2111,7 +2117,6 @@ namespace FineUIPro.Web.JGZL
break; break;
case "21"://管道吹扫、清洗检验记录 case "21"://管道吹扫、清洗检验记录
{ {
DataTable itemdt = new DataTable();
DataTable dt = new DataTable(); DataTable dt = new DataTable();
dt.TableName = "MainData"; dt.TableName = "MainData";
dt.Columns.Add("ProjectName"); dt.Columns.Add("ProjectName");
@@ -2124,6 +2129,14 @@ namespace FineUIPro.Web.JGZL
dt.Columns.Add("Results"); dt.Columns.Add("Results");
dt.Columns.Add("BlowingCleaningDate"); dt.Columns.Add("BlowingCleaningDate");
DataTable itemdt = new DataTable();
itemdt.TableName = "Data";
itemdt.Columns.Add("ISO_IsoNo");
itemdt.Columns.Add("STE_Code");
itemdt.Columns.Add("OperatingMedium");
itemdt.Columns.Add("ScrubbingMedium");
itemdt.Columns.Add("CleaningMedium");
var report = BLL.BlowingCleaningService.GetBlowingCleaningByProjectId(projectId); var report = BLL.BlowingCleaningService.GetBlowingCleaningByProjectId(projectId);
if (report != null) if (report != null)
{ {
@@ -2141,13 +2154,6 @@ namespace FineUIPro.Web.JGZL
dt.Rows.Add(newRow); dt.Rows.Add(newRow);
BLL.Common.FastReportService.AddFastreportTable(dt); BLL.Common.FastReportService.AddFastreportTable(dt);
itemdt.TableName = "Data";
itemdt.Columns.Add("ISO_IsoNo");
itemdt.Columns.Add("STE_Code");
itemdt.Columns.Add("OperatingMedium");
itemdt.Columns.Add("ScrubbingMedium");
itemdt.Columns.Add("CleaningMedium");
var blowingCleaningItems = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(report.BlowingCleaningId); var blowingCleaningItems = BLL.BlowingCleaningItemService.GetBlowingCleaningItemList(report.BlowingCleaningId);
if (blowingCleaningItems.Count > 0) if (blowingCleaningItems.Count > 0)
{ {
@@ -2315,6 +2321,13 @@ namespace FineUIPro.Web.JGZL
case "27"://防腐工程质量验收记录 case "27"://防腐工程质量验收记录
{ {
DataTable dt = new DataTable(); DataTable dt = new DataTable();
dt.TableName = "Data";
dt.Columns.Add("Part");
dt.Columns.Add("MaterialName");
dt.Columns.Add("Grade");
dt.Columns.Add("Manufacturer");
dt.Columns.Add("PlanFilmThickness");
dt.Columns.Add("ActualFilmThickness");
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>(); Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
var report = BLL.AnticorrosionEngineeringInspectionRecordService.GetAnticorrosionReportByProjectId(projectId); var report = BLL.AnticorrosionEngineeringInspectionRecordService.GetAnticorrosionReportByProjectId(projectId);
if (report != null) if (report != null)
@@ -2325,13 +2338,6 @@ namespace FineUIPro.Web.JGZL
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
dt.TableName = "Data";
dt.Columns.Add("Part");
dt.Columns.Add("MaterialName");
dt.Columns.Add("Grade");
dt.Columns.Add("Manufacturer");
dt.Columns.Add("PlanFilmThickness");
dt.Columns.Add("ActualFilmThickness");
if (tb.Rows.Count > 0) if (tb.Rows.Count > 0)
{ {
DataRow[] rows = tb.DefaultView.ToTable().Select(); DataRow[] rows = tb.DefaultView.ToTable().Select();
@@ -2383,10 +2389,6 @@ namespace FineUIPro.Web.JGZL
case "28"://隔热工程质量验收记录 case "28"://隔热工程质量验收记录
{ {
DataTable dt = new DataTable(); DataTable dt = new DataTable();
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
var report = BLL.InsulationAcceptanceRecordService.GetInsulationAcceptanceRecordByProjectId(projectId);
if (report != null)
{
dt.TableName = "MainData"; dt.TableName = "MainData";
dt.Columns.Add("ProjectName"); dt.Columns.Add("ProjectName");
dt.Columns.Add("HeatInsulationArea"); dt.Columns.Add("HeatInsulationArea");
@@ -2394,6 +2396,10 @@ namespace FineUIPro.Web.JGZL
dt.Columns.Add("AcceptanceConclusion"); dt.Columns.Add("AcceptanceConclusion");
dt.Columns.Add("CompileDate"); dt.Columns.Add("CompileDate");
Dictionary<string, string> keyValuePairs = new Dictionary<string, string>();
var report = BLL.InsulationAcceptanceRecordService.GetInsulationAcceptanceRecordByProjectId(projectId);
if (report != null)
{
var newRow = dt.NewRow(); var newRow = dt.NewRow();
newRow["ProjectName"] = BLL.Base_ProjectService.GetProjectByProjectId(report.ProjectId).ProjectName; newRow["ProjectName"] = BLL.Base_ProjectService.GetProjectByProjectId(report.ProjectId).ProjectName;
newRow["HeatInsulationArea"] = report.HeatInsulationArea; newRow["HeatInsulationArea"] = report.HeatInsulationArea;
@@ -3087,5 +3093,6 @@ namespace FineUIPro.Web.JGZL
return fastReportItem; return fastReportItem;
} }
#endregion #endregion
} }
} }
HJGL_DS/FineUIPro.Web/Web.config
+2 -2
View File
@@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
有关如何配置 ASP.NET 应用程序的详细消息，请访问 有关如何配置 ASP.NET 应用程序的详细消息，请访问
@@ -67,7 +67,7 @@
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false" /> <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false" />
<add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport" /> <add path="FastReport.Export.axd" verb="*" type="FastReport.Web.Handlers.WebExport" />
</httpHandlers> </httpHandlers>
<compilation debug="true" targetFramework="4.6.1"> <compilation debug="false" targetFramework="4.6.1">
<assemblies> <assemblies>
<add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> <add assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</assemblies> </assemblies>
HJGL_DS/WebAPI/WebAPI.csproj.user
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />