diff --git a/.gitignore b/.gitignore
index 31c821ec..8fdd554d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
/SGGL/FineUIPro.Web/FileUpload/Solution/2024-02
/SGGL/FineUIPro.Web/FileUpload/Solution/2024-03
/SGGL/FineUIPro.Web/FileUpload/TestRun/TestRunMonthSummary/2024-03
+/SGGL/FineUIPro.Web/FileUpload/TestRun/TestRunMonthSummary/2024-04
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-04-17-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-04-17-bwj.sql
new file mode 100644
index 00000000..d9f7c2f4
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-04-17-bwj.sql
@@ -0,0 +1,76 @@
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('CFD19410-DF80-494A-A2DD-D23A03438742','ѵ¼','CQMS/Comprehensive/TrainingRecords.aspx',105,'4a0e62cb-ee50-4a14-80b7-377602e9902c','Menu_CQMS',0,1,1)
+go
+ insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ values('5FE760BC-6496-42C2-8091-F9704DF0CCD2','CFD19410-DF80-494A-A2DD-D23A03438742','',1)
+ insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ values('93B46D7D-AAE0-4D27-A7D6-0A3DE875DAC3','CFD19410-DF80-494A-A2DD-D23A03438742','',2)
+ insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ values('7FC2CA0A-9D93-45BE-8A17-0FB17A644496','CFD19410-DF80-494A-A2DD-D23A03438742','ɾ',3)
+ insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ values('7F3CF7C1-9916-4F12-BBB6-CA892EDDD351','CFD19410-DF80-494A-A2DD-D23A03438742','',4)
+ go
+
+CREATE TABLE [dbo].[Comprehensive_TrainingRecords](
+ [TrainingRecordsId] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [TrainingContents] [nvarchar](100) NULL,
+ [CNProfessionalId] [nvarchar](50) NULL,
+ [TrainingObject] [nvarchar](50) NULL,
+ [TrainingAddress] [nvarchar](50) NULL,
+ [Hours] [decimal](18, 1) NULL,
+ [KeynoteSpeaker] [nvarchar](50) NULL,
+ [Remark] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Comprehensive_TrainingRecords] PRIMARY KEY CLUSTERED
+(
+ [TrainingRecordsId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+GO
+
+ALTER TABLE [dbo].[Comprehensive_TrainingRecords] WITH CHECK ADD CONSTRAINT [FK_Comprehensive_TrainingRecords_Base_CNProfessional] FOREIGN KEY([CNProfessionalId])
+REFERENCES [dbo].[Base_CNProfessional] ([CNProfessionalId])
+GO
+
+ALTER TABLE [dbo].[Comprehensive_TrainingRecords] CHECK CONSTRAINT [FK_Comprehensive_TrainingRecords_Base_CNProfessional]
+GO
+
+ALTER TABLE [dbo].[Comprehensive_TrainingRecords] WITH CHECK ADD CONSTRAINT [FK_Comprehensive_TrainingRecords_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[Comprehensive_TrainingRecords] CHECK CONSTRAINT [FK_Comprehensive_TrainingRecords_Base_Project]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords', @level2type=N'COLUMN',@level2name=N'TrainingRecordsId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords', @level2type=N'COLUMN',@level2name=N'TrainingContents'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords', @level2type=N'COLUMN',@level2name=N'CNProfessionalId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords', @level2type=N'COLUMN',@level2name=N'TrainingObject'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵַ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords', @level2type=N'COLUMN',@level2name=N'TrainingAddress'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords', @level2type=N'COLUMN',@level2name=N'Hours'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords', @level2type=N'COLUMN',@level2name=N'KeynoteSpeaker'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords', @level2type=N'COLUMN',@level2name=N'Remark'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Comprehensive_TrainingRecords'
+GO
+
+
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index a2279f0b..a0b53214 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -246,6 +246,7 @@
+
diff --git a/SGGL/BLL/CQMS/Comprehensive/TrainingRecordsService.cs b/SGGL/BLL/CQMS/Comprehensive/TrainingRecordsService.cs
new file mode 100644
index 00000000..5131de34
--- /dev/null
+++ b/SGGL/BLL/CQMS/Comprehensive/TrainingRecordsService.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ ///
+ /// 培训记录
+ ///
+ public class TrainingRecordsService
+ {
+ ///
+ /// 根据主键获取培训记录
+ ///
+ ///
+ ///
+ public static Model.Comprehensive_TrainingRecords GetTrainingRecordsById(string trainingRecordsId)
+ {
+ return Funs.DB.Comprehensive_TrainingRecords.FirstOrDefault(e => e.TrainingRecordsId == trainingRecordsId);
+ }
+
+ ///
+ /// 根据培训内容、专业获取培训记录
+ ///
+ ///
+ ///
+ ///
+ public static Model.Comprehensive_TrainingRecords GetTrainingRecordsByName(string trainingContents, string cNProfessionalId)
+ {
+ return Funs.DB.Comprehensive_TrainingRecords.FirstOrDefault(e => e.TrainingContents == trainingContents && e.CNProfessionalId == cNProfessionalId);
+ }
+
+ ///
+ /// 添加培训记录
+ ///
+ ///
+ public static void AddTrainingRecords(Model.Comprehensive_TrainingRecords trainingRecords)
+ {
+ Model.Comprehensive_TrainingRecords newTraining = new Model.Comprehensive_TrainingRecords
+ {
+ TrainingRecordsId = trainingRecords.TrainingRecordsId,
+ ProjectId = trainingRecords.ProjectId,
+ TrainingContents = trainingRecords.TrainingContents,
+ CNProfessionalId = trainingRecords.CNProfessionalId,
+ TrainingObject = trainingRecords.TrainingObject,
+ TrainingAddress = trainingRecords.TrainingAddress,
+ Hours = trainingRecords.Hours,
+ KeynoteSpeaker = trainingRecords.KeynoteSpeaker,
+ Remark = trainingRecords.Remark
+ };
+ Funs.DB.Comprehensive_TrainingRecords.InsertOnSubmit(newTraining);
+ Funs.DB.SubmitChanges();
+ }
+
+ ///
+ /// 修改培训记录
+ ///
+ ///
+ public static void UpdateTrainingRecords(Model.Comprehensive_TrainingRecords trainingRecords)
+ {
+ Model.Comprehensive_TrainingRecords newTraining = Funs.DB.Comprehensive_TrainingRecords.FirstOrDefault(e => e.TrainingRecordsId == trainingRecords.TrainingRecordsId);
+ if (newTraining != null)
+ {
+ newTraining.TrainingContents = trainingRecords.TrainingContents;
+ newTraining.CNProfessionalId = trainingRecords.CNProfessionalId;
+ newTraining.TrainingObject = trainingRecords.TrainingObject;
+ newTraining.TrainingAddress = trainingRecords.TrainingAddress;
+ newTraining.Hours = trainingRecords.Hours;
+ newTraining.KeynoteSpeaker = trainingRecords.KeynoteSpeaker;
+ newTraining.Remark = trainingRecords.Remark;
+ Funs.DB.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 根据主键删除培训记录
+ ///
+ ///
+ public static void DeleteTrainingRecordsById(string trainingRecordsId)
+ {
+ Model.Comprehensive_TrainingRecords training = Funs.DB.Comprehensive_TrainingRecords.FirstOrDefault(e => e.TrainingRecordsId == trainingRecordsId);
+ if (training != null)
+ {
+ Funs.DB.Comprehensive_TrainingRecords.DeleteOnSubmit(training);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 6d133b12..ff6456f1 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -3245,6 +3245,11 @@ namespace BLL
/// 资料收发文登记记录导入模板原始虚拟路径
///
public const string CQMS_DataReceivingDocTempUrl = "File\\Excel\\DataIn\\资料收发文登记记录导入模板.xlsx";
+
+ ///
+ /// 培训记录导入模板原始虚拟路径
+ ///
+ public const string CQMS_TrainingRecordsTemplateUrl= "File\\Excel\\DataIn\\培训记录导入模板.xlsx";
#endregion
#region 绩效考核模板文件路径
@@ -3844,6 +3849,11 @@ namespace BLL
///
public const string DesignDrawingsMenuId = "d8de4143-b680-44cf-9a78-acd3d49a8d00";
+ ///
+ /// 培训记录
+ ///
+ public const string TrainingRecordsMenuId = "CFD19410-DF80-494A-A2DD-D23A03438742";
+
///
/// 图纸会审管理
///
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx
new file mode 100644
index 00000000..4b7d336d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx
@@ -0,0 +1,109 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TrainingRecords.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.TrainingRecords" %>
+
+
+
+
+
+
+ 培训记录
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs
new file mode 100644
index 00000000..27eeb729
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.cs
@@ -0,0 +1,246 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+ public partial class TrainingRecords : PageBase
+ {
+ #region 加载
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ GetButtonPower();
+ BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
+ BindGrid();
+ }
+ }
+
+ ///
+ /// 数据绑定
+ ///
+ public void BindGrid()
+ {
+ string strSql = @"SELECT C.TrainingRecordsId,
+ C.ProjectId,
+ C.TrainingContents,
+ C.CNProfessionalId,
+ C.TrainingObject,
+ C.TrainingAddress,
+ C.Hours,
+ C.KeynoteSpeaker,
+ C.Remark,
+ CN.ProfessionalName"
+ + @" FROM Comprehensive_TrainingRecords C "
+ + @" LEFT JOIN Base_CNProfessional CN ON C.CNProfessionalId=CN.CNProfessionalId"
+ + @" WHERE C.ProjectId = @ProjectId";
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+ if (drpCNProfessionalId.SelectedValue != BLL.Const._Null)
+ {
+ strSql += " AND C.CNProfessionalId=@CNProfessionalId";
+ listStr.Add(new SqlParameter("@CNProfessionalId", drpCNProfessionalId.SelectedValue));
+ }
+ if (!string.IsNullOrEmpty(this.txtTrainingContents.Text.Trim()))
+ {
+ strSql += " AND C.TrainingContents LIKE @TrainingContents";
+ listStr.Add(new SqlParameter("@TrainingContents", "%" + this.txtTrainingContents.Text.Trim() + "%"));
+ }
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+ Grid1.RecordCount = tb.Rows.Count;
+ //tb = GetFilteredTable(Grid1.FilteredData, tb);
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+ }
+ #endregion
+
+ #region 查询
+ ///
+ /// 查询
+ ///
+ ///
+ ///
+ protected void btnSearch_Click(object sender, EventArgs e)
+ {
+ BindGrid();
+ }
+ #endregion
+
+ #region 分页、排序
+ ///
+ /// 分页下拉
+ ///
+ ///
+ ///
+ protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+ BindGrid();
+ }
+
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, GridSortEventArgs e)
+ {
+ Grid1.SortDirection = e.SortDirection;
+ Grid1.SortField = e.SortField;
+ BindGrid();
+ }
+
+ ///
+ /// 分页
+ ///
+ ///
+ ///
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ BindGrid();
+ }
+ #endregion
+
+ #region 新增
+ ///
+ /// 新增按钮事件
+ ///
+ ///
+ ///
+ protected void btnNew_Click(object sender, EventArgs e)
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TrainingRecordsEdit.aspx", "编辑 - ")));
+ }
+ #endregion
+
+ #region 编辑
+ ///
+ /// 右键修改
+ ///
+ ///
+ ///
+ protected void btnMenuModify_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+ return;
+ }
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TrainingRecordsEdit.aspx?id={0}", Grid1.SelectedRowID, "编辑 - ")));
+ }
+
+ ///
+ /// Grid行双击事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+ {
+ this.btnMenuModify_Click(sender, e);
+ }
+ #endregion
+
+ #region 删除
+ ///
+ /// 右键删除
+ ///
+ ///
+ ///
+ protected void btnMenuDel_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length > 0)
+ {
+ foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+ {
+ string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+ var trainingRecords = BLL.TrainingRecordsService.GetTrainingRecordsById(rowID);
+ if (trainingRecords != null)
+ {
+ BLL.TrainingRecordsService.DeleteTrainingRecordsById(rowID);
+ }
+ }
+ BindGrid();
+ ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+ }
+ }
+ #endregion
+
+ #region 关闭弹出窗口
+ ///
+ /// 关闭弹出窗口
+ ///
+ ///
+ ///
+ protected void Window1_Close(object sender, WindowCloseEventArgs e)
+ {
+ BindGrid();
+ }
+ #endregion
+
+ #region 导入
+ ///
+ /// 导入按钮
+ ///
+ ///
+ ///
+ protected void btnImport_Click(object sender, EventArgs e)
+ {
+ PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("TrainingRecordsDataIn.aspx", "导入 - ")));
+ }
+ #endregion
+
+ #region 获取按钮权限
+ ///
+ /// 获取按钮权限
+ ///
+ ///
+ ///
+ private void GetButtonPower()
+ {
+ if (Request.Params["value"] == BLL.Const._Null)
+ {
+ return;
+ }
+ var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.TrainingRecordsMenuId);
+ if (buttonList.Count() > 0)
+ {
+ if (buttonList.Contains(BLL.Const.BtnAdd))
+ {
+ this.btnNew.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnModify))
+ {
+ this.btnMenuModify.Hidden = false;
+ this.Grid1.EnableRowDoubleClickEvent = true;
+ }
+ else
+ {
+ this.Grid1.EnableRowDoubleClickEvent = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnDelete))
+ {
+ this.btnMenuDel.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnSave))
+ {
+ this.btnImport.Hidden = false;
+ }
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.designer.cs
new file mode 100644
index 00000000..52402bab
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.designer.cs
@@ -0,0 +1,177 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive {
+
+
+ public partial class TrainingRecords {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// ToolSearch 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar ToolSearch;
+
+ ///
+ /// drpCNProfessionalId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpCNProfessionalId;
+
+ ///
+ /// txtTrainingContents 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtTrainingContents;
+
+ ///
+ /// btnSearch 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSearch;
+
+ ///
+ /// btnNew 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnNew;
+
+ ///
+ /// btnImport 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnImport;
+
+ ///
+ /// lblPageIndex 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+ ///
+ /// ToolbarText1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText1;
+
+ ///
+ /// ddlPageSize 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize;
+
+ ///
+ /// Window1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window1;
+
+ ///
+ /// Window2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window2;
+
+ ///
+ /// Menu1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Menu Menu1;
+
+ ///
+ /// btnMenuModify 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuModify;
+
+ ///
+ /// btnMenuDel 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuDel;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx
new file mode 100644
index 00000000..b83bf5de
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx
@@ -0,0 +1,167 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TrainingRecordsDataIn.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.TrainingRecordsDataIn" %>
+
+
+
+
+
+
+ 导入培训记录
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.cs
new file mode 100644
index 00000000..eb107868
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.cs
@@ -0,0 +1,521 @@
+using BLL;
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Linq;
+using System.Threading;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+ public partial class TrainingRecordsDataIn : PageBase
+ {
+ #region 定义项
+ ///
+ /// 上传预设的虚拟路径
+ ///
+ private string initPath = Const.ExcelUrl;
+
+ ///
+ /// 错误集合
+ ///
+ public static string errorInfos = string.Empty;
+
+ #endregion
+
+ #region 加载
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ if (percent == null)
+ {
+ percent = new Dictionary();
+ }
+ this.id.Text = this.CurrUser.UserId;
+ this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+ // 绑定表格
+ this.BindGrid();
+ }
+ else if (GetRequestEventArgument() == "reloadGrid")
+ {
+ BindGrid();
+ }
+ }
+ #endregion
+
+ #region 绑定数据
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid()
+ {
+ string strSql = @"SELECT TempId,ProjectId,UserId,Time,RowNo,ToopValue,Value1,Value2,Value3,Value4,Value5,Value6,Value7,Value8,Value9,Value10"
+ + @" ,Value11,Value12,Value13,Value14,Value15,Value16,Value17,Value18,Value19,Value20,Value21,Value22,Value23,Value24,Value25,Value26,Value27,Value28,Value29,Value30"
+ + @" ,Value31,Value32,Value33,Value34,Value35,Value36,Value37,Value38,Value39,Value40,Value41,Value42,Value43,Value44,Value45,Value46,Value47,Value48,Value49,Value50,ToopValue,Type"
+ + @" FROM Sys_DataInTemp "
+ + @" WHERE ProjectId=@ProjectId AND UserId=@UserId AND Type=@Type";
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+ listStr.Add(new SqlParameter("@UserId", this.CurrUser.UserId));
+ listStr.Add(new SqlParameter("@Type", "TrainingRecords"));//培训记录
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+ Grid1.RecordCount = tb.Rows.Count;
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+
+ var dataInTempAll = from x in Funs.DB.Sys_DataInTemp
+ where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId && x.Type == "TrainingRecords"
+ select x;
+ for (int i = 0; i < Grid1.Rows.Count; i++)
+ {
+ var dataInTemp = dataInTempAll.FirstOrDefault(x => x.TempId == Grid1.Rows[i].DataKeys[0].ToString());
+ if (dataInTemp != null)
+ {
+ if (!string.IsNullOrEmpty(dataInTemp.ToopValue))
+ {
+ Grid1.Rows[i].RowCssClass = "red";
+ }
+ }
+ }
+ var errData = from x in dataInTempAll where x.ToopValue != null select x;
+ this.lbDataCout.Text = errData.Count().ToString();
+ }
+ #endregion
+
+ #region 双击事件
+ ///
+ /// Grid行双击事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+ if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TrainingRecordsMenuId, Const.BtnSave))
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TrainingRecordsDataInEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
+ }
+ else
+ {
+ ShowNotify("您没有这个权限,请与管理员联系!", MessageBoxIcon.Warning);
+ }
+ }
+ #endregion
+
+ #region 导入信息 维护
+ ///
+ /// 导入信息编辑
+ ///
+ ///
+ ///
+ protected void btnMenuEdit_Click(object sender, EventArgs e)
+ {
+ if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.TrainingRecordsMenuId, BLL.Const.BtnSave))
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TrainingRecordsDataInEdit.aspx?TempId={0}", Grid1.SelectedRowID, "维护 - ")));
+ }
+ else
+ {
+ ShowNotify("您没有这个权限,请与管理员联系!", MessageBoxIcon.Warning);
+ }
+ }
+
+ ///
+ /// 删除按钮
+ ///
+ ///
+ ///
+ protected void btnMenuDelete_Click(object sender, EventArgs e)
+ {
+ if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TrainingRecordsMenuId, Const.BtnSave))
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+ foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+ {
+ string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+ BLL.Sys_DataTempService.DeleteDataInTempByDataInTempID(rowID);
+ }
+ ShowNotify("删除成功!", MessageBoxIcon.Success);
+ this.BindGrid();
+ }
+ else
+ {
+ Alert.ShowInTop("您没有这个权限,请与管理员联系!", MessageBoxIcon.Warning);
+ return;
+ }
+ }
+ #endregion
+
+ #region 分页 排序
+ ///
+ /// 分页
+ ///
+ ///
+ ///
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ BindGrid();
+ }
+
+ ///
+ /// 分页显示条数下拉框
+ ///
+ ///
+ ///
+ protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+ BindGrid();
+ }
+
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+ {
+ BindGrid();
+ }
+ #endregion
+
+ #region 删除所有数据事件
+ ///
+ /// 删除所有数据事件
+ ///
+ ///
+ ///
+ protected void btnAllDelete_Click(object sender, EventArgs e)
+ {
+ if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TrainingRecordsMenuId, Const.BtnSave))
+ {
+ //先删除临时表中 该人员以前导入的数据
+ BLL.Sys_DataTempService.DeleteDataInTempByProjectIdUserId(this.CurrUser.LoginProjectId, this.CurrUser.UserId, "TrainingRecords");
+ this.BindGrid();
+ ShowNotify("删除成功!", MessageBoxIcon.Success);
+ this.lbDataCout.Text = string.Empty;
+ }
+ else
+ {
+ Alert.ShowInTop("您没有这个权限,请与管理员联系!", MessageBoxIcon.Warning);
+ return;
+ }
+ }
+ #endregion
+
+ #region 下载模板
+ ///
+ /// 下载模板
+ ///
+ ///
+ ///
+ protected void imgbtnUpload_Click(object sender, EventArgs e)
+ {
+ this.TemplateUpload(BLL.Const.CQMS_TrainingRecordsTemplateUrl);
+ }
+
+ protected void TemplateUpload(string initTemplatePath)
+ {
+ string rootPath = Server.MapPath("~/");
+ string uploadfilepath = rootPath + initTemplatePath;
+ string filePath = Const.CQMS_TrainingRecordsTemplateUrl;
+ string fileName = Path.GetFileName(filePath);
+ FileInfo info = new FileInfo(uploadfilepath);
+ long fileSize = info.Length;
+ Response.ClearContent();
+ Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+ Response.ContentType = "excel/plain";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+ Response.TransmitFile(uploadfilepath, 0, fileSize);
+ Response.End();
+ }
+
+ ///
+ /// 导入说明
+ ///
+ ///
+ ///
+ //protected void lkAchievements_Click(object sender, EventArgs e)
+ //{
+ // this.TemplateUpload(Const.CQMS_DataReceivingDocTempUrl);
+ //}
+ #endregion
+
+ #region 进度条
+ public static Dictionary percent { get; set; }
+ public static Dictionary url { get; set; }
+
+ [System.Web.Services.WebMethod]
+ public static int getPercent(string id)
+ {
+ return percent[id];
+ }
+ #endregion
+
+ #region 文件上传
+ ///
+ /// 文件上传
+ ///
+ ///
+ ///
+ protected void imgbtnImport_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ if (this.FileExcel.HasFile == false)
+ {
+ ShowNotify("请选择Excel文件!", MessageBoxIcon.Warning);
+ return;
+ }
+ string IsXls = Path.GetExtension(this.FileExcel.FileName).ToString().Trim().ToLower();
+ if (IsXls != ".xls" && IsXls != ".xlsx")
+ {
+ ShowNotify("只能选择Excel文件!", MessageBoxIcon.Warning);
+ return;
+ }
+ string rootPath = Server.MapPath("~/");
+ string initFullPath = rootPath + initPath;
+ if (!Directory.Exists(initFullPath))
+ {
+ Directory.CreateDirectory(initFullPath);
+ }
+ //指定上传文件名称
+ this.hdfileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+ //上传文件路径
+ string filePath = initFullPath + this.hdfileName.Text;
+ //文件上传服务器
+ this.FileExcel.PostedFile.SaveAs(filePath);
+ //文件上传服务器后的名称
+ string fileName = rootPath + initPath + this.hdfileName.Text;
+ //读取Excel
+ DataSet ds = NPOIHelper.ExcelToDataSet(fileName, out errorInfos, true);
+ //验证Excel读取是否有误
+ if (!string.IsNullOrEmpty(errorInfos))
+ {
+ ShowNotify(errorInfos, MessageBoxIcon.Warning);
+ return;
+ }
+
+ if (ds.Tables.Count > 0)
+ {
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ Sys_DataInTemp newDataInTemp = new Sys_DataInTemp();
+ newDataInTemp.TempId = SQLHelper.GetNewID(typeof(Model.Sys_DataInTemp));
+ newDataInTemp.ProjectId = this.CurrUser.LoginProjectId;
+ newDataInTemp.UserId = this.CurrUser.UserId;
+ newDataInTemp.Time = System.DateTime.Now;
+ newDataInTemp.Type = "TrainingRecords";
+ newDataInTemp.RowNo = i + 2;
+ newDataInTemp.Value1 = ds.Tables[0].Rows[i]["培训内容"].ToString().Trim();
+ newDataInTemp.Value2 = ds.Tables[0].Rows[i]["专业"].ToString().Trim();
+ newDataInTemp.Value3 = ds.Tables[0].Rows[i]["培训对象"].ToString().Trim();
+ newDataInTemp.Value4 = ds.Tables[0].Rows[i]["培训地点"].ToString().Trim();
+ newDataInTemp.Value5 = ds.Tables[0].Rows[i]["课时(小时)"].ToString().Trim();
+ newDataInTemp.Value6 = ds.Tables[0].Rows[i]["主讲人"].ToString().Trim();
+ newDataInTemp.Value7 = ds.Tables[0].Rows[i]["备注"].ToString().Trim();
+
+ BLL.Sys_DataTempService.AddDataInTemp(newDataInTemp);
+ }
+ this.BindGrid();
+ ShowNotify("数据已导入临时表!", MessageBoxIcon.Success);
+ }
+ else
+ {
+ ShowNotify("无数据!", MessageBoxIcon.Warning);
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ Alert.ShowInTop("'" + ex.Message + "'", MessageBoxIcon.Warning);
+ }
+ }
+ #endregion
+
+ #region 保存审核事件
+ ///
+ /// 保存审核事件
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ Thread t = new Thread(new ThreadStart(() => { btnSaveMethod(this.CurrUser.LoginProjectId, this.CurrUser.UserId); }));
+ t.Start();
+ if (percent.ContainsKey(this.CurrUser.UserId))
+ {
+ percent[CurrUser.UserId] = 0;
+ }
+ else
+ {
+ percent.Add(CurrUser.UserId, 0);
+ }
+ PageContext.RegisterStartupScript("printX()");
+ }
+ protected void btnRefresh_Click(object sender, EventArgs e)
+ {
+ this.BindGrid();
+ }
+
+ protected void btnSaveMethod(string LoginProjectId, string UserId)
+ {
+ var cNProfessionals = from x in Funs.DB.Base_CNProfessional select x;//专业
+
+ var dataInTemp = from x in Funs.DB.Sys_DataInTemp
+ where x.ProjectId == LoginProjectId && x.UserId == UserId && x.Type == "TrainingRecords"
+ select x;
+ int okCount = 0;
+ int i = 0;
+ int ir = dataInTemp.Count();
+ string erreMessage = "";
+ foreach (var tempData in dataInTemp)
+ {
+ if (tempData != null)
+ {
+ i++;
+ percent[UserId] = (int)(100 * i / ir);
+ string errInfo = string.Empty;
+ var isExitValue = Funs.DB.Comprehensive_TrainingRecords.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.TrainingContents == tempData.Value1
+ && x.CNProfessionalId == tempData.Value2);
+ if (isExitValue == null || this.ckUpdate.Checked)
+ {
+ Model.Comprehensive_TrainingRecords newData = new Model.Comprehensive_TrainingRecords();
+ if (!string.IsNullOrEmpty(tempData.Value1.Trim()))
+ {
+ newData.TrainingContents = tempData.Value1.Trim();
+ }
+ else
+ {
+ errInfo += "培训内容为必填项;";
+ }
+
+ if (!string.IsNullOrEmpty(tempData.Value2.Trim()))
+ {
+ var professional = cNProfessionals.FirstOrDefault(e => e.ProfessionalName == tempData.Value2.Trim());
+ if (professional != null)
+ {
+ newData.CNProfessionalId = professional.CNProfessionalId;
+ }
+ else
+ {
+ errInfo += "专业不存在;";
+ }
+ }
+ else
+ {
+ errInfo += "专业为必填项;";
+ }
+ if (!string.IsNullOrEmpty(tempData.Value3.Trim()))
+ {
+ newData.TrainingObject = tempData.Value3.Trim();
+ }
+ else
+ {
+ errInfo += "培训对象为必填项;";
+ }
+ if (!string.IsNullOrEmpty(tempData.Value4.Trim()))
+ {
+ newData.TrainingAddress = tempData.Value4.Trim();
+ }
+ else
+ {
+ errInfo += "培训地点为必填项;";
+ }
+ if (!string.IsNullOrEmpty(tempData.Value5.Trim()))
+ {
+ try
+ {
+ newData.Hours = Funs.GetNewDecimal(tempData.Value5.Trim());
+ }
+ catch (Exception)
+ {
+ errInfo += "课时(小时)格式错误;";
+ }
+ }
+ if (!string.IsNullOrEmpty(tempData.Value6.Trim()))
+ {
+ newData.KeynoteSpeaker = tempData.Value6.Trim();
+ }
+ if (!string.IsNullOrEmpty(tempData.Value7.Trim()))
+ {
+ newData.Remark = tempData.Value7.Trim();
+ }
+ if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 这插入管线焊口
+ {
+ newData.ProjectId = this.CurrUser.LoginProjectId;
+
+ var data = BLL.TrainingRecordsService.GetTrainingRecordsByName(newData.TrainingContents, newData.CNProfessionalId);
+ if (data == null)
+ {
+ newData.TrainingRecordsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_TrainingRecords));
+ BLL.TrainingRecordsService.AddTrainingRecords(newData);
+ }
+ else
+ {
+ newData.TrainingRecordsId = data.TrainingRecordsId;
+ BLL.TrainingRecordsService.UpdateTrainingRecords(newData);
+ }
+
+ BLL.Sys_DataTempService.DeleteDataInTempByDataInTempID(tempData.TempId);
+ okCount++;
+ }
+ }
+ else
+ {
+ errInfo = "该条记录已存在于培训记录表中。";
+ }
+
+ if (!string.IsNullOrEmpty(errInfo))
+ {
+ tempData.ToopValue = errInfo;
+ BLL.Sys_DataTempService.UpdateDataInTemp(tempData);
+ erreMessage += errInfo + ";";
+ }
+ }
+ }
+ }
+ #endregion
+
+ #region 导出按钮
+ /// 导出按钮
+ ///
+ ///
+ ///
+ protected void btnOut_Click(object sender, EventArgs e)
+ {
+ Response.ClearContent();
+ string filename = Funs.GetNewFileName();
+ Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("培训记录导入模板" + filename, System.Text.Encoding.UTF8) + ".xlsx");
+ Response.ContentType = "application/excel";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ Response.Write(GetGridTableHtml(Grid1));
+ Response.End();
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.designer.cs
new file mode 100644
index 00000000..e30ff7cd
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataIn.aspx.designer.cs
@@ -0,0 +1,267 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive {
+
+
+ public partial class TrainingRecordsDataIn {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// id 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.HiddenField id;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// hdfileName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.HiddenField hdfileName;
+
+ ///
+ /// FileExcel 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.FileUpload FileExcel;
+
+ ///
+ /// imgbtnImport 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button imgbtnImport;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// ckUpdate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox ckUpdate;
+
+ ///
+ /// btnSave 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSave;
+
+ ///
+ /// btnRefresh 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnRefresh;
+
+ ///
+ /// btnAllDelete 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnAllDelete;
+
+ ///
+ /// btnOut 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnOut;
+
+ ///
+ /// imgbtnUpload 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button imgbtnUpload;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// lblPageIndex 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
+ ///
+ /// ToolbarSeparator1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+ ///
+ /// ToolbarText1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText1;
+
+ ///
+ /// ddlPageSize 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize;
+
+ ///
+ /// lbDataCout 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label lbDataCout;
+
+ ///
+ /// Window1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window1;
+
+ ///
+ /// Window2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window2;
+
+ ///
+ /// ContentPanel3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ContentPanel ContentPanel3;
+
+ ///
+ /// Menu1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Menu Menu1;
+
+ ///
+ /// btnMenuEdit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuEdit;
+
+ ///
+ /// btnMenuDelete 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuDelete;
+
+ ///
+ /// ScriptManager2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.ScriptManager ScriptManager2;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx
new file mode 100644
index 00000000..544fd18f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx
@@ -0,0 +1,66 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TrainingRecordsDataInEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.TrainingRecordsDataInEdit" %>
+
+
+
+
+
+
+ 编辑培训记录导入
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.cs
new file mode 100644
index 00000000..bcbfbac4
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.cs
@@ -0,0 +1,175 @@
+using BLL;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+ public partial class TrainingRecordsDataInEdit : PageBase
+ {
+ #region 定义项
+ ///
+ /// 临时表主键
+ ///
+ public string TempId
+ {
+ get
+ {
+ return (string)ViewState["TempId"];
+ }
+ set
+ {
+ ViewState["TempId"] = value;
+ }
+ }
+ #endregion
+
+ #region 加载页面
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ this.TempId = Request.Params["TempId"];
+ this.txtValue1.Focus();
+ var dataInTemp = BLL.Sys_DataTempService.GetDataInTempByTempId(this.TempId);
+ if (dataInTemp != null)
+ {
+ this.txtValue1.Text = dataInTemp.Value1;
+ this.txtValue2.Text = dataInTemp.Value2;
+ this.txtValue3.Text = dataInTemp.Value3;
+ this.txtValue4.Text = dataInTemp.Value4;
+ this.txtValue5.Text = dataInTemp.Value5;
+ this.txtValue6.Text = dataInTemp.Value6;
+ this.txtValue7.Text = dataInTemp.Value7;
+
+ this.lbErrCout.Text = dataInTemp.ToopValue;
+ }
+ }
+ }
+ #endregion
+
+ #region 保存按钮
+ ///
+ /// 保存按钮
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ var dataInTemp = BLL.Sys_DataTempService.GetDataInTempByTempId(this.TempId);
+ if (this.ckAll.Checked)
+ {
+ var allDataInTemp = from x in Funs.DB.Sys_DataInTemp where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId select x;
+ if (dataInTemp.Value1 != this.txtValue1.Text.Trim())
+ {
+ var tempValue1 = allDataInTemp.Where(x => x.Value1 == dataInTemp.Value1 || (x.Value1 == null && dataInTemp.Value1 == null));
+ if (tempValue1 != null)
+ {
+ foreach (var item in tempValue1)
+ {
+ item.Value1 = this.txtValue1.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value2 != this.txtValue2.Text.Trim())
+ {
+ var tempValue2 = allDataInTemp.Where(x => x.Value2 == dataInTemp.Value2 || (x.Value2 == null && dataInTemp.Value2 == null));
+ if (tempValue2 != null)
+ {
+ foreach (var item in tempValue2)
+ {
+ item.Value2 = this.txtValue2.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value3 != this.txtValue3.Text.Trim())
+ {
+ var tempValue3 = allDataInTemp.Where(x => x.Value3 == dataInTemp.Value3 || (x.Value3 == null && dataInTemp.Value3 == null));
+ if (tempValue3 != null)
+ {
+ foreach (var item in tempValue3)
+ {
+ item.Value3 = this.txtValue3.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value5 != this.txtValue5.Text.Trim())
+ {
+ var tempValue5 = allDataInTemp.Where(x => x.Value5 == dataInTemp.Value5 || (x.Value5 == null && dataInTemp.Value5 == null));
+ if (tempValue5 != null)
+ {
+ foreach (var item in tempValue5)
+ {
+ item.Value5 = this.txtValue5.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value6 != this.txtValue6.Text.Trim())
+ {
+ var tempValue6 = allDataInTemp.Where(x => x.Value6 == dataInTemp.Value6 || (x.Value6 == null && dataInTemp.Value6 == null));
+ if (tempValue6 != null)
+ {
+ foreach (var item in tempValue6)
+ {
+ item.Value6 = this.txtValue6.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ if (dataInTemp.Value7 != this.txtValue7.Text.Trim())
+ {
+ var tempValue7 = allDataInTemp.Where(x => x.Value7 == dataInTemp.Value7 || (x.Value7 == null && dataInTemp.Value7 == null));
+ if (tempValue7 != null)
+ {
+ foreach (var item in tempValue7)
+ {
+ item.Value7 = this.txtValue7.Text.Trim();
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ var toopValue = allDataInTemp.Where(x => x.ToopValue == dataInTemp.ToopValue);
+ if (toopValue != null)
+ {
+ foreach (var item in toopValue)
+ {
+ item.ToopValue = null;
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ else
+ {
+ Model.Sys_DataInTemp newDataInTemp = new Model.Sys_DataInTemp();
+ newDataInTemp.ProjectId = this.CurrUser.LoginProjectId;
+ newDataInTemp.UserId = this.CurrUser.UserId;
+ newDataInTemp.Time = System.DateTime.Now;
+ newDataInTemp.Type = dataInTemp.Type;
+ newDataInTemp.Value1 = this.txtValue1.Text.Trim();
+ newDataInTemp.Value2 = this.txtValue2.Text.Trim();
+ newDataInTemp.Value3 = this.txtValue3.Text.Trim();
+ newDataInTemp.Value4 = this.txtValue4.Text.Trim();
+ newDataInTemp.Value5 = this.txtValue5.Text.Trim();
+ newDataInTemp.Value6 = this.txtValue6.Text.Trim();
+ newDataInTemp.Value7 = this.txtValue7.Text.Trim();
+ if (!string.IsNullOrEmpty(this.TempId))
+ {
+ newDataInTemp.TempId = this.TempId;
+ newDataInTemp.ToopValue = null;
+ BLL.Sys_DataTempService.UpdateDataInTemp(newDataInTemp);
+ }
+ }
+ ShowNotify("信息修改完成!", MessageBoxIcon.Success);
+ PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.designer.cs
new file mode 100644
index 00000000..61b04fe6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsDataInEdit.aspx.designer.cs
@@ -0,0 +1,150 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive {
+
+
+ public partial class TrainingRecordsDataInEdit {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// SimpleForm1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form SimpleForm1;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// btnSave 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSave;
+
+ ///
+ /// txtValue1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue1;
+
+ ///
+ /// txtValue2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue2;
+
+ ///
+ /// txtValue3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue3;
+
+ ///
+ /// txtValue4 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue4;
+
+ ///
+ /// txtValue5 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue5;
+
+ ///
+ /// txtValue6 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue6;
+
+ ///
+ /// txtValue7 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtValue7;
+
+ ///
+ /// ckAll 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox ckAll;
+
+ ///
+ /// lbErrCout 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea lbErrCout;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx
new file mode 100644
index 00000000..8218aa47
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx
@@ -0,0 +1,62 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TrainingRecordsEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Comprehensive.TrainingRecordsEdit" %>
+
+
+
+
+
+
+ 编辑培训记录
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.cs
new file mode 100644
index 00000000..ca55ca85
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.cs
@@ -0,0 +1,118 @@
+using BLL;
+using System;
+using System.Linq;
+
+namespace FineUIPro.Web.CQMS.Comprehensive
+{
+ public partial class TrainingRecordsEdit : PageBase
+ {
+ #region 定义变量
+ ///
+ /// 主键
+ ///
+ public string TrainingRecordsId
+ {
+ get
+ {
+ return (string)ViewState["TrainingRecordsId"];
+ }
+ set
+ {
+ ViewState["TrainingRecordsId"] = value;
+ }
+ }
+ #endregion
+
+ #region 加载
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ GetButtonPower();
+ BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
+ this.TrainingRecordsId = Request.Params["id"];
+ Model.Comprehensive_TrainingRecords trainingRecords = BLL.TrainingRecordsService.GetTrainingRecordsById(this.TrainingRecordsId);
+ if (trainingRecords != null)
+ {
+ this.TrainingRecordsId = trainingRecords.TrainingRecordsId;
+ this.txtTrainingContents.Text = trainingRecords.TrainingContents;
+ if (!string.IsNullOrEmpty(trainingRecords.CNProfessionalId))
+ {
+ this.drpCNProfessionalId.SelectedValue = trainingRecords.CNProfessionalId;
+ }
+ this.txtTrainingObject.Text = trainingRecords.TrainingObject;
+ this.txtTrainingAddress.Text = trainingRecords.TrainingAddress;
+ this.txtHours.Text = trainingRecords.Hours.HasValue ? trainingRecords.Hours.ToString() : "";
+ this.txtKeynoteSpeaker.Text = trainingRecords.KeynoteSpeaker;
+ this.txtRemark.Text = trainingRecords.Remark;
+ }
+ }
+ }
+ #endregion
+
+ #region 保存
+ ///
+ /// 保存按钮
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ if (drpCNProfessionalId.SelectedValue == BLL.Const._Null)
+ {
+ Alert.ShowInTop("请选择专业!", MessageBoxIcon.Warning);
+ return;
+ }
+ Model.Comprehensive_TrainingRecords trainingRecords = new Model.Comprehensive_TrainingRecords();
+ trainingRecords.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
+ trainingRecords.TrainingContents = this.txtTrainingContents.Text.Trim();
+ trainingRecords.TrainingObject = this.txtTrainingObject.Text.Trim();
+ trainingRecords.TrainingAddress = this.txtTrainingAddress.Text.Trim();
+ trainingRecords.Hours = Funs.GetNewDecimal(this.txtHours.Text.Trim());
+ trainingRecords.KeynoteSpeaker = this.txtKeynoteSpeaker.Text.Trim();
+ trainingRecords.Remark = this.txtRemark.Text.Trim();
+ if (!string.IsNullOrEmpty(this.TrainingRecordsId))
+ {
+ trainingRecords.TrainingRecordsId = this.TrainingRecordsId;
+ BLL.TrainingRecordsService.UpdateTrainingRecords(trainingRecords);
+ }
+ else
+ {
+ trainingRecords.TrainingRecordsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_TrainingRecords));
+ trainingRecords.ProjectId = this.CurrUser.LoginProjectId;
+ BLL.TrainingRecordsService.AddTrainingRecords(trainingRecords);
+ }
+ ShowNotify("保存成功!", MessageBoxIcon.Success);
+ PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+ }
+ #endregion
+
+ #region 获取按钮权限
+ ///
+ /// 获取按钮权限
+ ///
+ ///
+ ///
+ private void GetButtonPower()
+ {
+ if (Request.Params["value"] == "0")
+ {
+ return;
+ }
+ var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.TrainingRecordsMenuId);
+ if (buttonList.Count() > 0)
+ {
+ if (buttonList.Contains(BLL.Const.BtnSave))
+ {
+ this.btnSave.Hidden = false;
+ }
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.designer.cs
new file mode 100644
index 00000000..0ea812a2
--- /dev/null
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.designer.cs
@@ -0,0 +1,123 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Comprehensive {
+
+
+ public partial class TrainingRecordsEdit {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// SimpleForm1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form SimpleForm1;
+
+ ///
+ /// txtTrainingContents 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtTrainingContents;
+
+ ///
+ /// drpCNProfessionalId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpCNProfessionalId;
+
+ ///
+ /// txtTrainingObject 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtTrainingObject;
+
+ ///
+ /// txtTrainingAddress 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtTrainingAddress;
+
+ ///
+ /// txtHours 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtHours;
+
+ ///
+ /// txtKeynoteSpeaker 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtKeynoteSpeaker;
+
+ ///
+ /// txtRemark 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea txtRemark;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// btnSave 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSave;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
index 791b6249..5bae9b6e 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
@@ -1344,7 +1344,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-1 土建
var TJInspection = reportItem.Where(x => x.ReType == "10-1").ToList();
- if (TJInspection.Count > 0)
+ if (TJInspection != null || TJInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1472,7 +1472,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-2 设备
var SBInspection = reportItem.Where(x => x.ReType == "10-2").ToList();
- if (SBInspection.Count > 0)
+ if (SBInspection != null || SBInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1600,7 +1600,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-3 管道
var GDInspection = reportItem.Where(x => x.ReType == "10-3").ToList();
- if (GDInspection.Count > 0)
+ if (GDInspection != null || GDInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1728,7 +1728,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-4 电气
var DQInspection = reportItem.Where(x => x.ReType == "10-4").ToList();
- if (DQInspection.Count > 0)
+ if (DQInspection != null || DQInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1856,7 +1856,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-5.仪表
var YBInspection = reportItem.Where(x => x.ReType == "10-5").ToList();
- if (YBInspection.Count > 0)
+ if (YBInspection != null || YBInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -1984,7 +1984,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-6.防腐
var FFInspection = reportItem.Where(x => x.ReType == "10-6").ToList();
- if (FFInspection.Count > 0)
+ if (FFInspection != null || FFInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -2112,7 +2112,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10-7.消防
var XFInspection = reportItem.Where(x => x.ReType == "10-7").ToList();
- if (XFInspection.Count > 0)
+ if (XFInspection != null || XFInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -2240,7 +2240,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 10.总数
var InspectionDataInspection = reportItem.Where(x => x.ReType == "10").ToList();
- if (InspectionDataInspection.Count > 0)
+ if (InspectionDataInspection != null || InspectionDataInspection.Count > 0)
{
isYm = true;
//whileIndex += 1;
@@ -2260,48 +2260,67 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
numberIndex = 1;
- decimal? num1 = 0, num2 = 0;
- decimal MonthsCountstring = 0, ProjectCountstring = 0;
+ //decimal? num1 = 0, num2 = 0;
+ //decimal MonthsCountstring = 0, ProjectCountstring = 0;
+ int CheckNum = 0, OKNum = 0, TotalCheckNum = 0, TotalOKNum = 0;
+ string QuantitySum1 = String.Empty;//本月检查合格点数/本月检查点数
+ string QuantitySum2 = String.Empty;//累计检查合格点数/累计检查点数
foreach (var item in InspectionDataInspection)
{
- if (!string.IsNullOrEmpty(item.RectificationRate))
+ if (string.IsNullOrEmpty(item.RectificationRate))
{
- MonthsCountstring = Convert.ToDecimal(item.RectificationRate.Replace("%", ""));
- }
- else {
item.RectificationRate = "0%";
- MonthsCountstring= Convert.ToDecimal(item.RectificationRate.Replace("%", ""));
}
- if (!string.IsNullOrEmpty(item.TotationRate))
+ if (string.IsNullOrEmpty(item.TotationRate))
{
- ProjectCountstring = Convert.ToDecimal(item.TotationRate.Replace("%", ""));
- }
- else {
item.TotationRate = "0%";
- ProjectCountstring = Convert.ToDecimal(item.TotationRate.Replace("%", ""));
}
//创建行
Row row = new Row(doc);
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
row.Cells.Add(CreateCell(item.ContentName, doc, table.FirstRow.Cells[1].CellFormat.Width));
- row.Cells.Add(CreateCell(item.RectificationRate.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
- row.Cells.Add(CreateCell(item.TotationRate.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
+ row.Cells.Add(CreateCell(Convert.ToString(item.RectificationRate), doc, table.FirstRow.Cells[2].CellFormat.Width));
+ row.Cells.Add(CreateCell(Convert.ToString(item.TotationRate), doc, table.FirstRow.Cells[3].CellFormat.Width));
row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[4].CellFormat.Width));
table.Rows.Insert(numberIndex, row);
- num1 += MonthsCountstring;
- num2 += ProjectCountstring;
+ //num1 += MonthsCountstring;
+ //num2 += ProjectCountstring;
+ CheckNum += Convert.ToInt32(item.MonthsCount);
+ OKNum += Convert.ToInt32(item.ProjectCount);
+ TotalCheckNum += Convert.ToInt32(item.MonthsBackCount);
+ TotalOKNum += Convert.ToInt32(item.TotalNoBackCount);
+
numberIndex += 1;
}
//自动设置表格样式
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
+
+ if (CheckNum != 0)//被除数不能为零
+ {
+ QuantitySum1 = Math.Round((decimal)OKNum / (decimal)CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
+ }
+ else
+ {
+ QuantitySum1 = "0%";
+ }
+ if (TotalCheckNum != 0)//被除数不能为零
+ {
+ QuantitySum2 = Math.Round((decimal)TotalOKNum / (decimal)TotalCheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
+ }
+ else
+ {
+ QuantitySum2 = "0%";
+ }
+
+
//创建合计
Row rowhj = new Row(doc);
rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[0].CellFormat.Width));
rowhj.Cells.Add(CreateCell("合计", doc, table.FirstRow.Cells[1].CellFormat.Width));
- rowhj.Cells.Add(CreateCell(num1.ToString() + "%", doc, table.FirstRow.Cells[2].CellFormat.Width));
- rowhj.Cells.Add(CreateCell(num2.ToString() + "%", doc, table.FirstRow.Cells[3].CellFormat.Width));
+ rowhj.Cells.Add(CreateCell(QuantitySum1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
+ rowhj.Cells.Add(CreateCell(QuantitySum2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[4].CellFormat.Width));
table.Rows.Insert(numberIndex, rowhj);
@@ -2473,7 +2492,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
rowhj.Cells.Add(CreateCell(num3.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
rowhj.Cells.Add(CreateCell(num1.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
rowhj.Cells.Add(CreateCell(num2.ToString(), doc, table.FirstRow.Cells[4].CellFormat.Width));
- rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[4].CellFormat.Width));
+ rowhj.Cells.Add(CreateCell("", doc, table.FirstRow.Cells[5].CellFormat.Width));
table.Rows.Insert(numberIndex, rowhj);
//自动设置表格样式
@@ -3026,8 +3045,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 设置页眉上的数据
whileIndex = 1;
table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, 1, true);
- //业主名称
- table.Rows[0].Cells[2].FirstParagraph.Runs[0].Text = unitsYz.UnitName;
+ if (unitsYz != null)
+ {
+ //业主名称
+ table.Rows[0].Cells[2].FirstParagraph.Runs[0].Text = unitsYz.UnitName;
+ }
//项目号
table.Rows[0].Cells[4].FirstParagraph.Runs[0].Text = pModel.ProjectCode;
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
index 7c94fc41..7b4bbc32 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
@@ -1318,6 +1318,18 @@
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index 4dabc220..7f406d21 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -2781,6 +2781,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//保存9.计量器具报验管理情况
saveMeasuringInspection();
//保存10.现场质量共检数据
+ saveTjInspection();
+ saveSbInspection();
+ saveGDInspection();
+ saveDQInspection();
+ saveYBInspection();
+ saveFFInspection();
+ saveXFInspection();
saveInspectionDataInspection();
//保存11.压力管道监检情况
savePressureInspection();
@@ -3457,10 +3464,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ReportId = ReportId,
ReType = "10",
ContentName = values.Value("WorkName"),
- RectificationRate = values.Value("OneOKRate"),
- TotationRate = values.Value("TotalOneOKRate"),
+ MonthsCount = values.Value("CheckNum"), //当前检查点数
+ MonthsBackCount = values.Value("TotalCheckNum"),//累计点数
- Remarks = values.Value("Remarks"),
+ ProjectCount = values.Value("OKNum"),//当前合格点数
+ TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数
+
+ RectificationRate = values.Value("OneOKRate"),//本月合格点数
+ TotationRate = values.Value("TotalOneOKRate"),
+ Remarks = values.Value("Remarks"),//本月累计合格点数
+
};
if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0)
{
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
index 9e1de78c..b57f6565 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
@@ -311,6 +311,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//保存9.计量器具报验管理情况
saveMeasuringInspection();
//保存10.现场质量共检数据
+ saveTjInspection();
+ saveSbInspection();
+ saveGDInspection();
+ saveDQInspection();
+ saveYBInspection();
+ saveFFInspection();
+ saveXFInspection();
saveInspectionDataInspection();
//保存11.压力管道监检情况
savePressureInspection();
@@ -450,7 +457,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载13.特种设备监检情况
loadSpecialInspection(objType);
////加载14.NCR管理情况
- loadNcrManagementInspection();
+ loadNcrManagementInspection(objType);
//加载15.质量巡检情况
loadQualityInspection(objType);
@@ -1083,7 +1090,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
///
/// NCR管理情况
///
- void loadNcrManagementInspection()
+ void loadNcrManagementInspection(string objType)
{
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
@@ -1121,7 +1128,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
u.UnitId,
u.UnitName,
c.IssuedDate,
- c.Status
+ c.Status,
+ c.ImplementationFrontState,
};
var AllList = query.ToList();
@@ -1131,9 +1139,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Model.NCRReportStatisc NCRStatisc = new Model.NCRReportStatisc();
NCRStatisc.Id = Guid.NewGuid().ToString();
NCRStatisc.WorkName = item.UnitName;
- NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
- NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
+ //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
+ //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
+ NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+ NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+
NCRStatisc.CheckNum = AllList.Count();
+
if (NCRStatisc.CheckNum != 0)//被除数不能为零
{
NCRStatisc.OKRate = Math.Round((double)NCRStatisc.OKNum / (double)NCRStatisc.CheckNum * 100, 2) + "%";//保留两位小数、后四舍五入
@@ -1142,11 +1154,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
NCRStatisc.OKRate = "0%";
}
+
StatisticsList.Add(NCRStatisc);
CurrentPeriodOkNumSum += NCRStatisc.CurrentPeriodOkNum;
OKNumSum += NCRStatisc.OKNum;
- CheckNumSum += NCRStatisc.CheckNum;
+ CheckNumSum += NCRStatisc.CheckNum;
i++;
}
@@ -1171,8 +1184,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
summary.Add("OKRate", OKRateSum.ToString());
gvNcrManagementInspection.SummaryData = summary;
- }
- #endregion
+ }
+ #endregion
#region 15.质量巡检情况 gvQualityInspection方法
///
@@ -1590,6 +1603,246 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
#region 10.现场质量共检数据
+ void saveTjInspection() //检验批统计:土建
+ {
+ List detailLists = new List();
+ JArray teamGroupData = gvTj.GetMergedData();
+ foreach (JObject teamGroupRow in teamGroupData)
+ {
+ JObject values = teamGroupRow.Value("values");
+ int rowIndex = teamGroupRow.Value("index");
+ Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+ {
+ ReportId = ReportId,
+ ReType = "10-1",
+ ContentName = values.Value("WorkName"),
+
+ MonthsCount = values.Value("CheckNum"), //当前检查点数
+ MonthsBackCount = values.Value("TotalCheckNum"),//累计点数
+
+ ProjectCount = values.Value("OKNum"),//当前合格点数
+ TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数
+
+ RectificationRate = values.Value("OneOKRate"),//本月合格点数
+ Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
+ };
+ if (gvTj.Rows[rowIndex].DataKeys.Length > 0)
+ {
+ newDetail.Id = gvTj.Rows[rowIndex].DataKeys[0].ToString();
+ }
+ detailLists.Add(newDetail);
+ }
+ if (detailLists.Count > 0)
+ {
+ Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ void saveSbInspection() //检验批统计:设备
+ {
+ List detailLists = new List();
+ JArray teamGroupData = GvSb.GetMergedData();
+ foreach (JObject teamGroupRow in teamGroupData)
+ {
+ JObject values = teamGroupRow.Value("values");
+ int rowIndex = teamGroupRow.Value("index");
+ Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+ {
+ ReportId = ReportId,
+ ReType = "10-2",
+ ContentName = values.Value("WorkName"),
+ MonthsCount = values.Value("CheckNum"), //当前检查点数
+ MonthsBackCount = values.Value("TotalCheckNum"),//累计点数
+
+ ProjectCount = values.Value("OKNum"),//当前合格点数
+ TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数
+
+ RectificationRate = values.Value("OneOKRate"),//本月合格点数
+ Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
+ };
+ if (GvSb.Rows[rowIndex].DataKeys.Length > 0)
+ {
+ newDetail.Id = GvSb.Rows[rowIndex].DataKeys[0].ToString();
+ }
+ detailLists.Add(newDetail);
+ }
+ if (detailLists.Count > 0)
+ {
+ Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ void saveGDInspection() //检验批统计:管道
+ {
+ List detailLists = new List();
+ JArray teamGroupData = GvGD.GetMergedData();
+ foreach (JObject teamGroupRow in teamGroupData)
+ {
+ JObject values = teamGroupRow.Value("values");
+ int rowIndex = teamGroupRow.Value("index");
+ Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+ {
+ ReportId = ReportId,
+ ReType = "10-3",
+ ContentName = values.Value("WorkName"),
+ MonthsCount = values.Value("CheckNum"), //当前检查点数
+ MonthsBackCount = values.Value("TotalCheckNum"),//累计点数
+
+ ProjectCount = values.Value("OKNum"),//当前合格点数
+ TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数
+
+ RectificationRate = values.Value("OneOKRate"),//本月合格点数
+ Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
+ };
+ if (GvGD.Rows[rowIndex].DataKeys.Length > 0)
+ {
+ newDetail.Id = GvGD.Rows[rowIndex].DataKeys[0].ToString();
+ }
+ detailLists.Add(newDetail);
+ }
+ if (detailLists.Count > 0)
+ {
+ Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
+ Funs.DB.SubmitChanges();
+ }
+ }
+
+ void saveDQInspection() //检验批统计:电气
+ {
+ List detailLists = new List();
+ JArray teamGroupData = GvDq.GetMergedData();
+ foreach (JObject teamGroupRow in teamGroupData)
+ {
+ JObject values = teamGroupRow.Value("values");
+ int rowIndex = teamGroupRow.Value("index");
+ Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+ {
+ ReportId = ReportId,
+ ReType = "10-4",
+ ContentName = values.Value("WorkName"),
+ MonthsCount = values.Value("CheckNum"), //当前检查点数
+ MonthsBackCount = values.Value("TotalCheckNum"),//累计点数
+
+ ProjectCount = values.Value("OKNum"),//当前合格点数
+ TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数
+
+ RectificationRate = values.Value("OneOKRate"),//本月合格点数
+ Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
+ };
+ if (GvDq.Rows[rowIndex].DataKeys.Length > 0)
+ {
+ newDetail.Id = GvDq.Rows[rowIndex].DataKeys[0].ToString();
+ }
+ detailLists.Add(newDetail);
+ }
+ if (detailLists.Count > 0)
+ {
+ Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ void saveYBInspection() //检验批统计:仪表
+ {
+ List detailLists = new List();
+ JArray teamGroupData = GvYb.GetMergedData();
+ foreach (JObject teamGroupRow in teamGroupData)
+ {
+ JObject values = teamGroupRow.Value("values");
+ int rowIndex = teamGroupRow.Value("index");
+ Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+ {
+ ReportId = ReportId,
+ ReType = "10-5",
+ ContentName = values.Value("WorkName"),
+ MonthsCount = values.Value("CheckNum"), //当前检查点数
+ MonthsBackCount = values.Value("TotalCheckNum"),//累计点数
+
+ ProjectCount = values.Value("OKNum"),//当前合格点数
+ TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数
+
+ RectificationRate = values.Value("OneOKRate"),//本月合格点数
+ Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
+ };
+ if (GvYb.Rows[rowIndex].DataKeys.Length > 0)
+ {
+ newDetail.Id = GvYb.Rows[rowIndex].DataKeys[0].ToString();
+ }
+ detailLists.Add(newDetail);
+ }
+ if (detailLists.Count > 0)
+ {
+ Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ void saveFFInspection() //检验批统计:防腐
+ {
+ List detailLists = new List();
+ JArray teamGroupData = GvFf.GetMergedData();
+ foreach (JObject teamGroupRow in teamGroupData)
+ {
+ JObject values = teamGroupRow.Value("values");
+ int rowIndex = teamGroupRow.Value("index");
+ Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+ {
+ ReportId = ReportId,
+ ReType = "10-6",
+ ContentName = values.Value("WorkName"),
+ MonthsCount = values.Value("CheckNum"), //当前检查点数
+ MonthsBackCount = values.Value("TotalCheckNum"),//累计点数
+
+ ProjectCount = values.Value("OKNum"),//当前合格点数
+ TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数
+
+ RectificationRate = values.Value("OneOKRate"),//本月合格点数
+ Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
+ };
+ if (GvFf.Rows[rowIndex].DataKeys.Length > 0)
+ {
+ newDetail.Id = GvFf.Rows[rowIndex].DataKeys[0].ToString();
+ }
+ detailLists.Add(newDetail);
+ }
+ if (detailLists.Count > 0)
+ {
+ Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ void saveXFInspection() //检验批统计:消防
+ {
+ List detailLists = new List();
+ JArray teamGroupData = GvXf.GetMergedData();
+ foreach (JObject teamGroupRow in teamGroupData)
+ {
+ JObject values = teamGroupRow.Value("values");
+ int rowIndex = teamGroupRow.Value("index");
+ Model.Report_CQMS_MonthReportItem newDetail = new Model.Report_CQMS_MonthReportItem
+ {
+ ReportId = ReportId,
+ ReType = "10-7",
+ ContentName = values.Value("WorkName"),
+ MonthsCount = values.Value("CheckNum"), //当前检查点数
+ MonthsBackCount = values.Value("TotalCheckNum"),//累计点数
+
+ ProjectCount = values.Value("OKNum"),//当前合格点数
+ TotalNoBackCount = values.Value("TotalOKNum"),//累计合格点数
+
+ RectificationRate = values.Value("OneOKRate"),//本月合格点数
+ Remarks = values.Value("TotalOneOKRate"),//本月累计合格点数
+ };
+ if (GvXf.Rows[rowIndex].DataKeys.Length > 0)
+ {
+ newDetail.Id = GvXf.Rows[rowIndex].DataKeys[0].ToString();
+ }
+ detailLists.Add(newDetail);
+ }
+ if (detailLists.Count > 0)
+ {
+ Funs.DB.Report_CQMS_MonthReportItem.InsertAllOnSubmit(detailLists);
+ Funs.DB.SubmitChanges();
+ }
+ }
void saveInspectionDataInspection()
{
List detailLists = new List();
@@ -1602,11 +1855,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
ReportId = ReportId,
ReType = "10",
- ContentName = values.Value("ContentName"),
- MonthsCount = values.Value("MonthsCount"),
- ProjectCount = values.Value("ProjectCount"),
- //RectificationRate = values.Value("RectificationRate"),
- Remarks = values.Value("Remarks")
+ ContentName = values.Value("WorkName"),
+ RectificationRate = values.Value("OneOKRate"),
+ TotationRate = values.Value("TotalOneOKRate"),
+
+ Remarks = values.Value("Remarks"),
};
if (gvInspectionDataInspection.Rows[rowIndex].DataKeys.Length > 0)
{
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/培训记录导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/培训记录导入模板.xlsx
new file mode 100644
index 00000000..ed68bb54
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/Excel/DataIn/培训记录导入模板.xlsx differ
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 220a1a5c..ebc933f7 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -479,6 +479,10 @@
+
+
+
+
@@ -7721,6 +7725,34 @@
SpecialEquipmentEdit.aspx
+
+ TrainingRecords.aspx
+ ASPXCodeBehind
+
+
+ TrainingRecords.aspx
+
+
+ TrainingRecordsDataIn.aspx
+ ASPXCodeBehind
+
+
+ TrainingRecordsDataIn.aspx
+
+
+ TrainingRecordsDataInEdit.aspx
+ ASPXCodeBehind
+
+
+ TrainingRecordsDataInEdit.aspx
+
+
+ TrainingRecordsEdit.aspx
+ ASPXCodeBehind
+
+
+ TrainingRecordsEdit.aspx
+
ConstructionStandardList.aspx
ASPXCodeBehind
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index eafda425..9fc55c34 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -77,7 +77,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index e1f50392..d66d477e 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -19,6 +19,7 @@
+
@@ -42,7 +43,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
index 72096856..b1a26ee1 100644
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@@ -97,8 +97,8 @@
-
-
+
+
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 98e0f115..0f1863ef 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -614,6 +614,9 @@ namespace Model
partial void InsertComprehensive_SpecialEquipmentApprove(Comprehensive_SpecialEquipmentApprove instance);
partial void UpdateComprehensive_SpecialEquipmentApprove(Comprehensive_SpecialEquipmentApprove instance);
partial void DeleteComprehensive_SpecialEquipmentApprove(Comprehensive_SpecialEquipmentApprove instance);
+ partial void InsertComprehensive_TrainingRecords(Comprehensive_TrainingRecords instance);
+ partial void UpdateComprehensive_TrainingRecords(Comprehensive_TrainingRecords instance);
+ partial void DeleteComprehensive_TrainingRecords(Comprehensive_TrainingRecords instance);
partial void InsertCostGoods_CostManage(CostGoods_CostManage instance);
partial void UpdateCostGoods_CostManage(CostGoods_CostManage instance);
partial void DeleteCostGoods_CostManage(CostGoods_CostManage instance);
@@ -1454,9 +1457,6 @@ namespace Model
partial void InsertManager_Month_CheckC(Manager_Month_CheckC instance);
partial void UpdateManager_Month_CheckC(Manager_Month_CheckC instance);
partial void DeleteManager_Month_CheckC(Manager_Month_CheckC instance);
- partial void InsertManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance);
- partial void UpdateManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance);
- partial void DeleteManager_Month_ComplianceObligations(Manager_Month_ComplianceObligations instance);
partial void InsertManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance);
partial void UpdateManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance);
partial void DeleteManager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC instance);
@@ -2015,9 +2015,6 @@ namespace Model
partial void InsertReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance);
partial void UpdateReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance);
partial void DeleteReport_CQMS_MonthReportItem(Report_CQMS_MonthReportItem instance);
- partial void InsertReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance);
- partial void UpdateReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance);
- partial void DeleteReport_CQMS_ProblemHandle(Report_CQMS_ProblemHandle instance);
partial void InsertReport_CqmsTarget(Report_CqmsTarget instance);
partial void UpdateReport_CqmsTarget(Report_CqmsTarget instance);
partial void DeleteReport_CqmsTarget(Report_CqmsTarget instance);
@@ -4240,6 +4237,14 @@ namespace Model
}
}
+ public System.Data.Linq.Table Comprehensive_TrainingRecords
+ {
+ get
+ {
+ return this.GetTable();
+ }
+ }
+
public System.Data.Linq.Table CostGoods_CostManage
{
get
@@ -6488,14 +6493,6 @@ namespace Model
}
}
- public System.Data.Linq.Table Manager_Month_ComplianceObligations
- {
- get
- {
- return this.GetTable();
- }
- }
-
public System.Data.Linq.Table Manager_Month_ComplianceObligationsC
{
get
@@ -7984,14 +7981,6 @@ namespace Model
}
}
- public System.Data.Linq.Table Report_CQMS_ProblemHandle
- {
- get
- {
- return this.GetTable();
- }
- }
-
public System.Data.Linq.Table Report_CqmsTarget
{
get
@@ -18719,6 +18708,8 @@ namespace Model
private EntitySet _Comprehensive_SiteVisaManagement;
+ private EntitySet _Comprehensive_TrainingRecords;
+
private EntitySet _CQMS_DataBase_InspectionLot;
private EntitySet _DataBase_StartWorkReport;
@@ -18757,6 +18748,7 @@ namespace Model
this._Comprehensive_MajorPlanApproval = new EntitySet(new Action(this.attach_Comprehensive_MajorPlanApproval), new Action(this.detach_Comprehensive_MajorPlanApproval));
this._Comprehensive_NCRManagement = new EntitySet(new Action(this.attach_Comprehensive_NCRManagement), new Action(this.detach_Comprehensive_NCRManagement));
this._Comprehensive_SiteVisaManagement = new EntitySet(new Action(this.attach_Comprehensive_SiteVisaManagement), new Action(this.detach_Comprehensive_SiteVisaManagement));
+ this._Comprehensive_TrainingRecords = new EntitySet(new Action(this.attach_Comprehensive_TrainingRecords), new Action(this.detach_Comprehensive_TrainingRecords));
this._CQMS_DataBase_InspectionLot = new EntitySet(new Action(this.attach_CQMS_DataBase_InspectionLot), new Action(this.detach_CQMS_DataBase_InspectionLot));
this._DataBase_StartWorkReport = new EntitySet(new Action(this.attach_DataBase_StartWorkReport), new Action(this.detach_DataBase_StartWorkReport));
this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage));
@@ -18976,6 +18968,19 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_TrainingRecords_Base_CNProfessional", Storage="_Comprehensive_TrainingRecords", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")]
+ public EntitySet Comprehensive_TrainingRecords
+ {
+ get
+ {
+ return this._Comprehensive_TrainingRecords;
+ }
+ set
+ {
+ this._Comprehensive_TrainingRecords.Assign(value);
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CQMS_DataBase_InspectionLot_Base_CNProfessional", Storage="_CQMS_DataBase_InspectionLot", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", DeleteRule="NO ACTION")]
public EntitySet CQMS_DataBase_InspectionLot
{
@@ -19194,6 +19199,18 @@ namespace Model
entity.Base_CNProfessional = null;
}
+ private void attach_Comprehensive_TrainingRecords(Comprehensive_TrainingRecords entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_CNProfessional = this;
+ }
+
+ private void detach_Comprehensive_TrainingRecords(Comprehensive_TrainingRecords entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_CNProfessional = null;
+ }
+
private void attach_CQMS_DataBase_InspectionLot(CQMS_DataBase_InspectionLot entity)
{
this.SendPropertyChanging();
@@ -21513,6 +21530,8 @@ namespace Model
private string _CodeRule;
+ private EntitySet _Doc_DocManage;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21529,6 +21548,7 @@ namespace Model
public Base_DocType()
{
+ this._Doc_DocManage = new EntitySet(new Action(this.attach_Doc_DocManage), new Action(this.detach_Doc_DocManage));
OnCreated();
}
@@ -21612,6 +21632,19 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Doc_DocManage", ThisKey="DocTypeId", OtherKey="DocTypeId", DeleteRule="NO ACTION")]
+ public EntitySet Doc_DocManage
+ {
+ get
+ {
+ return this._Doc_DocManage;
+ }
+ set
+ {
+ this._Doc_DocManage.Assign(value);
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -21631,6 +21664,18 @@ namespace Model
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
+
+ private void attach_Doc_DocManage(Doc_DocManage entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_DocType = this;
+ }
+
+ private void detach_Doc_DocManage(Doc_DocManage entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_DocType = null;
+ }
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_EmergencyType")]
@@ -26048,6 +26093,8 @@ namespace Model
private EntitySet _Comprehensive_SpecialEquipment;
+ private EntitySet _Comprehensive_TrainingRecords;
+
private EntitySet _CostGoods_CostManage;
private EntitySet _CostGoods_CostSmallDetail;
@@ -26671,6 +26718,7 @@ namespace Model
this._Comprehensive_QualityAccident = new EntitySet(new Action(this.attach_Comprehensive_QualityAccident), new Action(this.detach_Comprehensive_QualityAccident));
this._Comprehensive_SiteVisaManagement = new EntitySet(new Action(this.attach_Comprehensive_SiteVisaManagement), new Action(this.detach_Comprehensive_SiteVisaManagement));
this._Comprehensive_SpecialEquipment = new EntitySet(new Action(this.attach_Comprehensive_SpecialEquipment), new Action(this.detach_Comprehensive_SpecialEquipment));
+ this._Comprehensive_TrainingRecords = new EntitySet(new Action(this.attach_Comprehensive_TrainingRecords), new Action(this.detach_Comprehensive_TrainingRecords));
this._CostGoods_CostManage = new EntitySet(new Action(this.attach_CostGoods_CostManage), new Action(this.detach_CostGoods_CostManage));
this._CostGoods_CostSmallDetail = new EntitySet(new Action(this.attach_CostGoods_CostSmallDetail), new Action(this.detach_CostGoods_CostSmallDetail));
this._CostGoods_Expense = new EntitySet(new Action(this.attach_CostGoods_Expense), new Action(this.detach_CostGoods_Expense));
@@ -28579,6 +28627,19 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_TrainingRecords_Base_Project", Storage="_Comprehensive_TrainingRecords", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+ public EntitySet Comprehensive_TrainingRecords
+ {
+ get
+ {
+ return this._Comprehensive_TrainingRecords;
+ }
+ set
+ {
+ this._Comprehensive_TrainingRecords.Assign(value);
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_CostGoods_CostManage_Base_Project", Storage="_CostGoods_CostManage", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet CostGoods_CostManage
{
@@ -32399,6 +32460,18 @@ namespace Model
entity.Base_Project = null;
}
+ private void attach_Comprehensive_TrainingRecords(Comprehensive_TrainingRecords entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = this;
+ }
+
+ private void detach_Comprehensive_TrainingRecords(Comprehensive_TrainingRecords entity)
+ {
+ this.SendPropertyChanging();
+ entity.Base_Project = null;
+ }
+
private void attach_CostGoods_CostManage(CostGoods_CostManage entity)
{
this.SendPropertyChanging();
@@ -97363,10 +97436,10 @@ namespace Model
private string _AuditMan;
- private string _Measure;
-
private string _Problem;
+ private string _Measure;
+
private EntityRef _Sys_User;
private EntityRef _Base_CNProfessional;
@@ -97413,10 +97486,10 @@ namespace Model
partial void OnStatusChanged();
partial void OnAuditManChanging(string value);
partial void OnAuditManChanged();
- partial void OnMeasureChanging(string value);
- partial void OnMeasureChanged();
partial void OnProblemChanging(string value);
partial void OnProblemChanged();
+ partial void OnMeasureChanging(string value);
+ partial void OnMeasureChanged();
#endregion
public Comprehensive_NCRManagement()
@@ -97784,27 +97857,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(500)")]
- public string Measure
- {
- get
- {
- return this._Measure;
- }
- set
- {
- if ((this._Measure != value))
- {
- this.OnMeasureChanging(value);
- this.SendPropertyChanging();
- this._Measure = value;
- this.SendPropertyChanged("Measure");
- this.OnMeasureChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(100)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Problem", DbType="VarChar(50)")]
public string Problem
{
get
@@ -97824,6 +97877,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measure", DbType="VarChar(100)")]
+ public string Measure
+ {
+ get
+ {
+ return this._Measure;
+ }
+ set
+ {
+ if ((this._Measure != value))
+ {
+ this.OnMeasureChanging(value);
+ this.SendPropertyChanging();
+ this._Measure = value;
+ this.SendPropertyChanged("Measure");
+ this.OnMeasureChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Comprehensive_NCRManagement_Sys_User", Storage="_Sys_User", ThisKey="CompileMan", OtherKey="UserId", IsForeignKey=true)]
public Sys_User Sys_User
{
@@ -101743,6 +101816,342 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Comprehensive_TrainingRecords")]
+ public partial class Comprehensive_TrainingRecords : INotifyPropertyChanging, INotifyPropertyChanged
+ {
+
+ private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+
+ private string _TrainingRecordsId;
+
+ private string _ProjectId;
+
+ private string _TrainingContents;
+
+ private string _CNProfessionalId;
+
+ private string _TrainingObject;
+
+ private string _TrainingAddress;
+
+ private System.Nullable _Hours;
+
+ private string _KeynoteSpeaker;
+
+ private string _Remark;
+
+ private EntityRef _Base_CNProfessional;
+
+ private EntityRef _Base_Project;
+
+ #region 可扩展性方法定义
+ partial void OnLoaded();
+ partial void OnValidate(System.Data.Linq.ChangeAction action);
+ partial void OnCreated();
+ partial void OnTrainingRecordsIdChanging(string value);
+ partial void OnTrainingRecordsIdChanged();
+ partial void OnProjectIdChanging(string value);
+ partial void OnProjectIdChanged();
+ partial void OnTrainingContentsChanging(string value);
+ partial void OnTrainingContentsChanged();
+ partial void OnCNProfessionalIdChanging(string value);
+ partial void OnCNProfessionalIdChanged();
+ partial void OnTrainingObjectChanging(string value);
+ partial void OnTrainingObjectChanged();
+ partial void OnTrainingAddressChanging(string value);
+ partial void OnTrainingAddressChanged();
+ partial void OnHoursChanging(System.Nullable value);
+ partial void OnHoursChanged();
+ partial void OnKeynoteSpeakerChanging(string value);
+ partial void OnKeynoteSpeakerChanged();
+ partial void OnRemarkChanging(string value);
+ partial void OnRemarkChanged();
+ #endregion
+
+ public Comprehensive_TrainingRecords()
+ {
+ this._Base_CNProfessional = default(EntityRef);
+ this._Base_Project = default(EntityRef);
+ OnCreated();
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainingRecordsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+ public string TrainingRecordsId
+ {
+ get
+ {
+ return this._TrainingRecordsId;
+ }
+ set
+ {
+ if ((this._TrainingRecordsId != value))
+ {
+ this.OnTrainingRecordsIdChanging(value);
+ this.SendPropertyChanging();
+ this._TrainingRecordsId = value;
+ this.SendPropertyChanged("TrainingRecordsId");
+ this.OnTrainingRecordsIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+ public string ProjectId
+ {
+ get
+ {
+ return this._ProjectId;
+ }
+ set
+ {
+ if ((this._ProjectId != value))
+ {
+ if (this._Base_Project.HasLoadedOrAssignedValue)
+ {
+ throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+ }
+ this.OnProjectIdChanging(value);
+ this.SendPropertyChanging();
+ this._ProjectId = value;
+ this.SendPropertyChanged("ProjectId");
+ this.OnProjectIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainingContents", DbType="NVarChar(100)")]
+ public string TrainingContents
+ {
+ get
+ {
+ return this._TrainingContents;
+ }
+ set
+ {
+ if ((this._TrainingContents != value))
+ {
+ this.OnTrainingContentsChanging(value);
+ this.SendPropertyChanging();
+ this._TrainingContents = value;
+ this.SendPropertyChanged("TrainingContents");
+ this.OnTrainingContentsChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CNProfessionalId", DbType="NVarChar(50)")]
+ public string CNProfessionalId
+ {
+ get
+ {
+ return this._CNProfessionalId;
+ }
+ set
+ {
+ if ((this._CNProfessionalId != value))
+ {
+ if (this._Base_CNProfessional.HasLoadedOrAssignedValue)
+ {
+ throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+ }
+ this.OnCNProfessionalIdChanging(value);
+ this.SendPropertyChanging();
+ this._CNProfessionalId = value;
+ this.SendPropertyChanged("CNProfessionalId");
+ this.OnCNProfessionalIdChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainingObject", DbType="NVarChar(50)")]
+ public string TrainingObject
+ {
+ get
+ {
+ return this._TrainingObject;
+ }
+ set
+ {
+ if ((this._TrainingObject != value))
+ {
+ this.OnTrainingObjectChanging(value);
+ this.SendPropertyChanging();
+ this._TrainingObject = value;
+ this.SendPropertyChanged("TrainingObject");
+ this.OnTrainingObjectChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainingAddress", DbType="NVarChar(50)")]
+ public string TrainingAddress
+ {
+ get
+ {
+ return this._TrainingAddress;
+ }
+ set
+ {
+ if ((this._TrainingAddress != value))
+ {
+ this.OnTrainingAddressChanging(value);
+ this.SendPropertyChanging();
+ this._TrainingAddress = value;
+ this.SendPropertyChanged("TrainingAddress");
+ this.OnTrainingAddressChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Hours", DbType="Decimal(18,1)")]
+ public System.Nullable Hours
+ {
+ get
+ {
+ return this._Hours;
+ }
+ set
+ {
+ if ((this._Hours != value))
+ {
+ this.OnHoursChanging(value);
+ this.SendPropertyChanging();
+ this._Hours = value;
+ this.SendPropertyChanged("Hours");
+ this.OnHoursChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeynoteSpeaker", DbType="NVarChar(50)")]
+ public string KeynoteSpeaker
+ {
+ get
+ {
+ return this._KeynoteSpeaker;
+ }
+ set
+ {
+ if ((this._KeynoteSpeaker != value))
+ {
+ this.OnKeynoteSpeakerChanging(value);
+ this.SendPropertyChanging();
+ this._KeynoteSpeaker = value;
+ this.SendPropertyChanged("KeynoteSpeaker");
+ this.OnKeynoteSpeakerChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(50)")]
+ public string Remark
+ {
+ get
+ {
+ return this._Remark;
+ }
+ set
+ {
+ if ((this._Remark != value))
+ {
+ this.OnRemarkChanging(value);
+ this.SendPropertyChanging();
+ this._Remark = value;
+ this.SendPropertyChanged("Remark");
+ this.OnRemarkChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_TrainingRecords_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
+ public Base_CNProfessional Base_CNProfessional
+ {
+ get
+ {
+ return this._Base_CNProfessional.Entity;
+ }
+ set
+ {
+ Base_CNProfessional previousValue = this._Base_CNProfessional.Entity;
+ if (((previousValue != value)
+ || (this._Base_CNProfessional.HasLoadedOrAssignedValue == false)))
+ {
+ this.SendPropertyChanging();
+ if ((previousValue != null))
+ {
+ this._Base_CNProfessional.Entity = null;
+ previousValue.Comprehensive_TrainingRecords.Remove(this);
+ }
+ this._Base_CNProfessional.Entity = value;
+ if ((value != null))
+ {
+ value.Comprehensive_TrainingRecords.Add(this);
+ this._CNProfessionalId = value.CNProfessionalId;
+ }
+ else
+ {
+ this._CNProfessionalId = default(string);
+ }
+ this.SendPropertyChanged("Base_CNProfessional");
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_TrainingRecords_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
+ public Base_Project Base_Project
+ {
+ get
+ {
+ return this._Base_Project.Entity;
+ }
+ set
+ {
+ Base_Project previousValue = this._Base_Project.Entity;
+ if (((previousValue != value)
+ || (this._Base_Project.HasLoadedOrAssignedValue == false)))
+ {
+ this.SendPropertyChanging();
+ if ((previousValue != null))
+ {
+ this._Base_Project.Entity = null;
+ previousValue.Comprehensive_TrainingRecords.Remove(this);
+ }
+ this._Base_Project.Entity = value;
+ if ((value != null))
+ {
+ value.Comprehensive_TrainingRecords.Add(this);
+ this._ProjectId = value.ProjectId;
+ }
+ else
+ {
+ this._ProjectId = default(string);
+ }
+ this.SendPropertyChanged("Base_Project");
+ }
+ }
+ }
+
+ public event PropertyChangingEventHandler PropertyChanging;
+
+ public event PropertyChangedEventHandler PropertyChanged;
+
+ protected virtual void SendPropertyChanging()
+ {
+ if ((this.PropertyChanging != null))
+ {
+ this.PropertyChanging(this, emptyChangingEventArgs);
+ }
+ }
+
+ protected virtual void SendPropertyChanged(String propertyName)
+ {
+ if ((this.PropertyChanged != null))
+ {
+ this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.CostGoods_CostManage")]
public partial class CostGoods_CostManage : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -119658,6 +120067,8 @@ namespace Model
private EntityRef _Base_CNProfessional;
+ private EntityRef _Base_DocType;
+
private EntityRef _Base_Project;
private EntityRef _Base_Unit;
@@ -119709,6 +120120,7 @@ namespace Model
public Doc_DocManage()
{
this._Base_CNProfessional = default(EntityRef);
+ this._Base_DocType = default(EntityRef);
this._Base_Project = default(EntityRef);
this._Base_Unit = default(EntityRef);
this._Sys_User = default(EntityRef);
@@ -119787,6 +120199,10 @@ namespace Model
{
if ((this._DocTypeId != value))
{
+ if (this._Base_DocType.HasLoadedOrAssignedValue)
+ {
+ throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+ }
this.OnDocTypeIdChanging(value);
this.SendPropertyChanging();
this._DocTypeId = value;
@@ -120106,6 +120522,40 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_DocType", Storage="_Base_DocType", ThisKey="DocTypeId", OtherKey="DocTypeId", IsForeignKey=true)]
+ public Base_DocType Base_DocType
+ {
+ get
+ {
+ return this._Base_DocType.Entity;
+ }
+ set
+ {
+ Base_DocType previousValue = this._Base_DocType.Entity;
+ if (((previousValue != value)
+ || (this._Base_DocType.HasLoadedOrAssignedValue == false)))
+ {
+ this.SendPropertyChanging();
+ if ((previousValue != null))
+ {
+ this._Base_DocType.Entity = null;
+ previousValue.Doc_DocManage.Remove(this);
+ }
+ this._Base_DocType.Entity = value;
+ if ((value != null))
+ {
+ value.Doc_DocManage.Add(this);
+ this._DocTypeId = value.DocTypeId;
+ }
+ else
+ {
+ this._DocTypeId = default(string);
+ }
+ this.SendPropertyChanged("Base_DocType");
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManage_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
public Base_Project Base_Project
{
@@ -120276,6 +120726,8 @@ namespace Model
private EntityRef _Doc_DocManage;
+ private EntityRef _Sys_User;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -120299,6 +120751,7 @@ namespace Model
public Doc_DocManageApprove()
{
this._Doc_DocManage = default(EntityRef);
+ this._Sys_User = default(EntityRef);
OnCreated();
}
@@ -120346,7 +120799,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(500)")]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveMan", DbType="NVarChar(50)")]
public string ApproveMan
{
get
@@ -120357,6 +120810,10 @@ namespace Model
{
if ((this._ApproveMan != value))
{
+ if (this._Sys_User.HasLoadedOrAssignedValue)
+ {
+ throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+ }
this.OnApproveManChanging(value);
this.SendPropertyChanging();
this._ApproveMan = value;
@@ -120480,6 +120937,40 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Doc_DocManageApprove_Sys_User", Storage="_Sys_User", ThisKey="ApproveMan", OtherKey="UserId", IsForeignKey=true)]
+ public Sys_User Sys_User
+ {
+ get
+ {
+ return this._Sys_User.Entity;
+ }
+ set
+ {
+ Sys_User previousValue = this._Sys_User.Entity;
+ if (((previousValue != value)
+ || (this._Sys_User.HasLoadedOrAssignedValue == false)))
+ {
+ this.SendPropertyChanging();
+ if ((previousValue != null))
+ {
+ this._Sys_User.Entity = null;
+ previousValue.Doc_DocManageApprove.Remove(this);
+ }
+ this._Sys_User.Entity = value;
+ if ((value != null))
+ {
+ value.Doc_DocManageApprove.Add(this);
+ this._ApproveMan = value.UserId;
+ }
+ else
+ {
+ this._ApproveMan = default(string);
+ }
+ this.SendPropertyChanged("Sys_User");
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -234243,229 +234734,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligations")]
- public partial class Manager_Month_ComplianceObligations : INotifyPropertyChanging, INotifyPropertyChanged
- {
-
- private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
-
- private string _ComplianceObligationsId;
-
- private string _MonthReportId;
-
- private string _InformationContent;
-
- private string _ResponseMeasures;
-
- private string _ImplementationStatus;
-
- private string _EvaluationConclusion;
-
- private EntityRef _Manager_MonthReportC;
-
- #region 可扩展性方法定义
- partial void OnLoaded();
- partial void OnValidate(System.Data.Linq.ChangeAction action);
- partial void OnCreated();
- partial void OnComplianceObligationsIdChanging(string value);
- partial void OnComplianceObligationsIdChanged();
- partial void OnMonthReportIdChanging(string value);
- partial void OnMonthReportIdChanged();
- partial void OnInformationContentChanging(string value);
- partial void OnInformationContentChanged();
- partial void OnResponseMeasuresChanging(string value);
- partial void OnResponseMeasuresChanged();
- partial void OnImplementationStatusChanging(string value);
- partial void OnImplementationStatusChanged();
- partial void OnEvaluationConclusionChanging(string value);
- partial void OnEvaluationConclusionChanged();
- #endregion
-
- public Manager_Month_ComplianceObligations()
- {
- this._Manager_MonthReportC = default(EntityRef);
- OnCreated();
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ComplianceObligationsId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
- public string ComplianceObligationsId
- {
- get
- {
- return this._ComplianceObligationsId;
- }
- set
- {
- if ((this._ComplianceObligationsId != value))
- {
- this.OnComplianceObligationsIdChanging(value);
- this.SendPropertyChanging();
- this._ComplianceObligationsId = value;
- this.SendPropertyChanged("ComplianceObligationsId");
- this.OnComplianceObligationsIdChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MonthReportId", DbType="NVarChar(50)")]
- public string MonthReportId
- {
- get
- {
- return this._MonthReportId;
- }
- set
- {
- if ((this._MonthReportId != value))
- {
- if (this._Manager_MonthReportC.HasLoadedOrAssignedValue)
- {
- throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
- }
- this.OnMonthReportIdChanging(value);
- this.SendPropertyChanging();
- this._MonthReportId = value;
- this.SendPropertyChanged("MonthReportId");
- this.OnMonthReportIdChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InformationContent", DbType="NVarChar(500)")]
- public string InformationContent
- {
- get
- {
- return this._InformationContent;
- }
- set
- {
- if ((this._InformationContent != value))
- {
- this.OnInformationContentChanging(value);
- this.SendPropertyChanging();
- this._InformationContent = value;
- this.SendPropertyChanged("InformationContent");
- this.OnInformationContentChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponseMeasures", DbType="NVarChar(500)")]
- public string ResponseMeasures
- {
- get
- {
- return this._ResponseMeasures;
- }
- set
- {
- if ((this._ResponseMeasures != value))
- {
- this.OnResponseMeasuresChanging(value);
- this.SendPropertyChanging();
- this._ResponseMeasures = value;
- this.SendPropertyChanged("ResponseMeasures");
- this.OnResponseMeasuresChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ImplementationStatus", DbType="NVarChar(500)")]
- public string ImplementationStatus
- {
- get
- {
- return this._ImplementationStatus;
- }
- set
- {
- if ((this._ImplementationStatus != value))
- {
- this.OnImplementationStatusChanging(value);
- this.SendPropertyChanging();
- this._ImplementationStatus = value;
- this.SendPropertyChanged("ImplementationStatus");
- this.OnImplementationStatusChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluationConclusion", DbType="NVarChar(50)")]
- public string EvaluationConclusion
- {
- get
- {
- return this._EvaluationConclusion;
- }
- set
- {
- if ((this._EvaluationConclusion != value))
- {
- this.OnEvaluationConclusionChanging(value);
- this.SendPropertyChanging();
- this._EvaluationConclusion = value;
- this.SendPropertyChanged("EvaluationConclusion");
- this.OnEvaluationConclusionChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_MonthReportC", ThisKey="MonthReportId", OtherKey="MonthReportId", IsForeignKey=true)]
- public Manager_MonthReportC Manager_MonthReportC
- {
- get
- {
- return this._Manager_MonthReportC.Entity;
- }
- set
- {
- Manager_MonthReportC previousValue = this._Manager_MonthReportC.Entity;
- if (((previousValue != value)
- || (this._Manager_MonthReportC.HasLoadedOrAssignedValue == false)))
- {
- this.SendPropertyChanging();
- if ((previousValue != null))
- {
- this._Manager_MonthReportC.Entity = null;
- previousValue.Manager_Month_ComplianceObligations.Remove(this);
- }
- this._Manager_MonthReportC.Entity = value;
- if ((value != null))
- {
- value.Manager_Month_ComplianceObligations.Add(this);
- this._MonthReportId = value.MonthReportId;
- }
- else
- {
- this._MonthReportId = default(string);
- }
- this.SendPropertyChanged("Manager_MonthReportC");
- }
- }
- }
-
- public event PropertyChangingEventHandler PropertyChanging;
-
- public event PropertyChangedEventHandler PropertyChanged;
-
- protected virtual void SendPropertyChanging()
- {
- if ((this.PropertyChanging != null))
- {
- this.PropertyChanging(this, emptyChangingEventArgs);
- }
- }
-
- protected virtual void SendPropertyChanged(String propertyName)
- {
- if ((this.PropertyChanged != null))
- {
- this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
- }
- }
- }
-
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Manager_Month_ComplianceObligationsC")]
public partial class Manager_Month_ComplianceObligationsC : INotifyPropertyChanging, INotifyPropertyChanged
{
@@ -240665,8 +240933,6 @@ namespace Model
private EntitySet _Manager_Month_CheckC;
- private EntitySet _Manager_Month_ComplianceObligations;
-
private EntitySet _Manager_Month_ComplianceObligationsC;
private EntitySet _Manager_Month_CostInvestmentPlanC;
@@ -240939,7 +241205,6 @@ namespace Model
this._Manager_Month_ActivitiesC = new EntitySet(new Action(this.attach_Manager_Month_ActivitiesC), new Action(this.detach_Manager_Month_ActivitiesC));
this._Manager_Month_ActivityDesC = new EntitySet(new Action(this.attach_Manager_Month_ActivityDesC), new Action(this.detach_Manager_Month_ActivityDesC));
this._Manager_Month_CheckC = new EntitySet(new Action(this.attach_Manager_Month_CheckC), new Action(this.detach_Manager_Month_CheckC));
- this._Manager_Month_ComplianceObligations = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligations), new Action(this.detach_Manager_Month_ComplianceObligations));
this._Manager_Month_ComplianceObligationsC = new EntitySet(new Action(this.attach_Manager_Month_ComplianceObligationsC), new Action(this.detach_Manager_Month_ComplianceObligationsC));
this._Manager_Month_CostInvestmentPlanC = new EntitySet(new Action(this.attach_Manager_Month_CostInvestmentPlanC), new Action(this.detach_Manager_Month_CostInvestmentPlanC));
this._Manager_Month_EmergencyExercisesC = new EntitySet(new Action(this.attach_Manager_Month_EmergencyExercisesC), new Action(this.detach_Manager_Month_EmergencyExercisesC));
@@ -243120,19 +243385,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligations_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligations", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")]
- public EntitySet Manager_Month_ComplianceObligations
- {
- get
- {
- return this._Manager_Month_ComplianceObligations;
- }
- set
- {
- this._Manager_Month_ComplianceObligations.Assign(value);
- }
- }
-
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Manager_Month_ComplianceObligationsC_Manager_MonthReportC", Storage="_Manager_Month_ComplianceObligationsC", ThisKey="MonthReportId", OtherKey="MonthReportId", DeleteRule="NO ACTION")]
public EntitySet Manager_Month_ComplianceObligationsC
{
@@ -243714,18 +243966,6 @@ namespace Model
entity.Manager_MonthReportC = null;
}
- private void attach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity)
- {
- this.SendPropertyChanging();
- entity.Manager_MonthReportC = this;
- }
-
- private void detach_Manager_Month_ComplianceObligations(Manager_Month_ComplianceObligations entity)
- {
- this.SendPropertyChanging();
- entity.Manager_MonthReportC = null;
- }
-
private void attach_Manager_Month_ComplianceObligationsC(Manager_Month_ComplianceObligationsC entity)
{
this.SendPropertyChanging();
@@ -272070,7 +272310,7 @@ namespace Model
private System.Nullable _ProblemType;
- private string _QuestionTechnologyId;
+ private string _SubInspectId;
private string _TermItemId;
@@ -272084,20 +272324,18 @@ namespace Model
private string _InspectUser;
+ private string _HandleUser;
+
private string _ApproveUser;
+ private System.Nullable _AdjustCompleteTime;
+
private System.Nullable _ApproveState;
private string _AddUser;
private System.Nullable _AddTime;
- private string _HandleUser;
-
- private System.Nullable _AdjustCompleteTime;
-
- private string _SubInspectId;
-
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -272114,8 +272352,8 @@ namespace Model
partial void OnConstructionUnitChanged();
partial void OnProblemTypeChanging(System.Nullable value);
partial void OnProblemTypeChanged();
- partial void OnQuestionTechnologyIdChanging(string value);
- partial void OnQuestionTechnologyIdChanged();
+ partial void OnSubInspectIdChanging(string value);
+ partial void OnSubInspectIdChanged();
partial void OnTermItemIdChanging(string value);
partial void OnTermItemIdChanged();
partial void OnWorkPackIdChanging(string value);
@@ -272128,20 +272366,18 @@ namespace Model
partial void OnRectifyTimeChanged();
partial void OnInspectUserChanging(string value);
partial void OnInspectUserChanged();
+ partial void OnHandleUserChanging(string value);
+ partial void OnHandleUserChanged();
partial void OnApproveUserChanging(string value);
partial void OnApproveUserChanged();
+ partial void OnAdjustCompleteTimeChanging(System.Nullable value);
+ partial void OnAdjustCompleteTimeChanged();
partial void OnApproveStateChanging(System.Nullable value);
partial void OnApproveStateChanged();
partial void OnAddUserChanging(string value);
partial void OnAddUserChanged();
partial void OnAddTimeChanging(System.Nullable value);
partial void OnAddTimeChanged();
- partial void OnHandleUserChanging(string value);
- partial void OnHandleUserChanged();
- partial void OnAdjustCompleteTimeChanging(System.Nullable value);
- partial void OnAdjustCompleteTimeChanged();
- partial void OnSubInspectIdChanging(string value);
- partial void OnSubInspectIdChanged();
#endregion
public PreRun_InspectTailTerm()
@@ -272269,22 +272505,22 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionTechnologyId", DbType="VarChar(50)")]
- public string QuestionTechnologyId
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")]
+ public string SubInspectId
{
get
{
- return this._QuestionTechnologyId;
+ return this._SubInspectId;
}
set
{
- if ((this._QuestionTechnologyId != value))
+ if ((this._SubInspectId != value))
{
- this.OnQuestionTechnologyIdChanging(value);
+ this.OnSubInspectIdChanging(value);
this.SendPropertyChanging();
- this._QuestionTechnologyId = value;
- this.SendPropertyChanged("QuestionTechnologyId");
- this.OnQuestionTechnologyIdChanged();
+ this._SubInspectId = value;
+ this.SendPropertyChanged("SubInspectId");
+ this.OnSubInspectIdChanged();
}
}
}
@@ -272409,6 +272645,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")]
+ public string HandleUser
+ {
+ get
+ {
+ return this._HandleUser;
+ }
+ set
+ {
+ if ((this._HandleUser != value))
+ {
+ this.OnHandleUserChanging(value);
+ this.SendPropertyChanging();
+ this._HandleUser = value;
+ this.SendPropertyChanged("HandleUser");
+ this.OnHandleUserChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")]
public string ApproveUser
{
@@ -272429,6 +272685,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")]
+ public System.Nullable AdjustCompleteTime
+ {
+ get
+ {
+ return this._AdjustCompleteTime;
+ }
+ set
+ {
+ if ((this._AdjustCompleteTime != value))
+ {
+ this.OnAdjustCompleteTimeChanging(value);
+ this.SendPropertyChanging();
+ this._AdjustCompleteTime = value;
+ this.SendPropertyChanged("AdjustCompleteTime");
+ this.OnAdjustCompleteTimeChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")]
public System.Nullable ApproveState
{
@@ -272489,66 +272765,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")]
- public string HandleUser
- {
- get
- {
- return this._HandleUser;
- }
- set
- {
- if ((this._HandleUser != value))
- {
- this.OnHandleUserChanging(value);
- this.SendPropertyChanging();
- this._HandleUser = value;
- this.SendPropertyChanged("HandleUser");
- this.OnHandleUserChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")]
- public System.Nullable AdjustCompleteTime
- {
- get
- {
- return this._AdjustCompleteTime;
- }
- set
- {
- if ((this._AdjustCompleteTime != value))
- {
- this.OnAdjustCompleteTimeChanging(value);
- this.SendPropertyChanging();
- this._AdjustCompleteTime = value;
- this.SendPropertyChanged("AdjustCompleteTime");
- this.OnAdjustCompleteTimeChanged();
- }
- }
- }
-
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="NVarChar(50)")]
- public string SubInspectId
- {
- get
- {
- return this._SubInspectId;
- }
- set
- {
- if ((this._SubInspectId != value))
- {
- this.OnSubInspectIdChanging(value);
- this.SendPropertyChanging();
- this._SubInspectId = value;
- this.SendPropertyChanged("SubInspectId");
- this.OnSubInspectIdChanged();
- }
- }
- }
-
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -272590,14 +272806,14 @@ namespace Model
private string _ApproveUser;
+ private System.Nullable _ApproveType;
+
private System.Nullable _ApproveState;
private string _AddUser;
private System.Nullable _AddTime;
- private System.Nullable _ApproveType;
-
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -272616,14 +272832,14 @@ namespace Model
partial void OnApproveTimeChanged();
partial void OnApproveUserChanging(string value);
partial void OnApproveUserChanged();
+ partial void OnApproveTypeChanging(System.Nullable value);
+ partial void OnApproveTypeChanged();
partial void OnApproveStateChanging(System.Nullable value);
partial void OnApproveStateChanged();
partial void OnAddUserChanging(string value);
partial void OnAddUserChanged();
partial void OnAddTimeChanging(System.Nullable value);
partial void OnAddTimeChanged();
- partial void OnApproveTypeChanging(System.Nullable value);
- partial void OnApproveTypeChanged();
#endregion
public PreRun_InspectTermApproveRecords()
@@ -272771,6 +272987,26 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")]
+ public System.Nullable ApproveType
+ {
+ get
+ {
+ return this._ApproveType;
+ }
+ set
+ {
+ if ((this._ApproveType != value))
+ {
+ this.OnApproveTypeChanging(value);
+ this.SendPropertyChanging();
+ this._ApproveType = value;
+ this.SendPropertyChanged("ApproveType");
+ this.OnApproveTypeChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")]
public System.Nullable ApproveState
{
@@ -272831,26 +273067,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")]
- public System.Nullable ApproveType
- {
- get
- {
- return this._ApproveType;
- }
- set
- {
- if ((this._ApproveType != value))
- {
- this.OnApproveTypeChanging(value);
- this.SendPropertyChanging();
- this._ApproveType = value;
- this.SendPropertyChanged("ApproveType");
- this.OnApproveTypeChanged();
- }
- }
- }
-
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -273783,7 +273999,7 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
public string Remark
{
get
@@ -273906,12 +274122,6 @@ namespace Model
private string _InspectResult;
- private System.Nullable