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

超过一定规模的危大施工方案增加字段，去除总结

This commit is contained in:
潘鸿锋 2024-04-08 09:18:38 +08:00
parent 9544361049
commit cd3a4ac71a
12 changed files with 5731 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CreateModel2017.bat
View File

@ -27,7 +27,7 @@ REM --------------
@echo.
@call "%VS150%"
SqlMetal /views /server:. /user:sa /password:1111 /database:SGGLDB_WH /code:%Model_ROOT%\Model.cs /namespace:Model
SqlMetal /views /server:DESKTOP-1QITK9E\MSSQLSERVER2 /user:sa /password:123 /database:SGGLDB_WH /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成
pause

10
DataBase/版本日志/SGGLDB_WH_2024-04-02-phf.sql Normal file
View File

@ -0,0 +1,10 @@
update sys_menu set menuname='项目质量周报' where menuname='施工质量周报'
update sys_menu set menuname='项目质量月报' where menuname='施工质量月报'
update sys_menu set menuname='项目质量月报（新）' where menuname='施工质量月报（新）'
update Comprehensive_MajorPlanApproval set ExpertReviewMan='' where ExpertReviewMan is null;
--超危大工程方案管理增加是否通过专家评审
alter table Comprehensive_MajorPlanApproval
add IsReview bit NULL;

4
SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs
View File

@ -119,6 +119,8 @@ namespace BLL
newMajorPlanApproval.CompileDate = majorPlanApproval.CompileDate;
newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId;
newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan;
newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
db.SubmitChanges();
}
@ -146,6 +148,8 @@ namespace BLL
newMajorPlanApproval.AttachUrl = majorPlanApproval.AttachUrl;
newMajorPlanApproval.UnitWorkId = majorPlanApproval.UnitWorkId;
newMajorPlanApproval.ExpertReviewMan = majorPlanApproval.ExpertReviewMan;
newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
db.SubmitChanges();
}
}

5
SGGL/BLL/Common/Const.cs
View File

@ -3895,6 +3895,11 @@ namespace BLL
/// </summary>
public static string WorkPost_HSSEDirector = "8A7C2CDF-AFB5-4826-9951-343253342DAC";
/// <summary>
/// 综合ID
/// </summary>
public const string ComprehensiveId = "3686d62d-26b8-4ff9-8160-f3688d58bfc0";
#region WBS_BreakdownProject表中SourceBreakdownId
public const string SourceBreakdownId = "2cbaabf0-c58a-4a12-b36e-4f8e588fa18e";

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx
View File

@ -71,9 +71,9 @@
<f:RenderField ColumnID="ApprovalMan" DataField="ApprovalMan" FieldType="String" HeaderText="批准人" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="ImplementationDeviation" DataField="ImplementationDeviation" FieldType="String" HeaderText="施工总结" TextAlign="Center"
<%-- <f:RenderField ColumnID="ImplementationDeviation" DataField="ImplementationDeviation" FieldType="String" HeaderText="施工总结" TextAlign="Center"
HeaderTextAlign="Center" Width="220px">
</f:RenderField>
</f:RenderField>--%>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left" >
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"

8
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx
View File

@ -48,7 +48,13 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtImplementationDeviation" runat="server" Label="施工总结" MaxLength="500" LabelWidth="130px" LabelAlign="right"></f:TextArea>
<%--<f:TextArea ID="txtImplementationDeviation" runat="server" Label="施工总结" MaxLength="500" LabelWidth="130px" LabelAlign="right"></f:TextArea>--%>
<f:RadioButtonList runat="server" ID="rblIsReview" Label="是否通过专家评审" ShowRedStar="true" LabelAlign="Right" LabelWidth="130px">
<f:RadioItem Text="是" Value="true" Selected="true" />
<f:RadioItem Text="否" Value="false" />
</f:RadioButtonList>
<f:Label Hidden="true" runat="server"></f:Label>
</Items>
</f:FormRow>
<f:FormRow>

16
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs
View File

@ -64,8 +64,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.txtAuditMan.Text = majorPlanApproval.AuditMan;
this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan;
this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
//this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
this.txtExpertReviewMan.Text = majorPlanApproval.ExpertReviewMan;
this.rblIsReview.SelectedValue = majorPlanApproval.IsReview.HasValue && majorPlanApproval.IsReview == true ? "true" : "false";
}
else
{
@ -108,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
majorPlanApproval.AuditMan = this.txtAuditMan.Text.Trim();
majorPlanApproval.ApprovalMan = this.txtApprovalMan.Text.Trim();
majorPlanApproval.ImplementationDeviation = this.txtImplementationDeviation.Text.Trim();
//majorPlanApproval.ImplementationDeviation = this.txtImplementationDeviation.Text.Trim();
string ids = string.Empty;
var lists = this.drpUnitWorkIds.SelectedValueArray;
foreach (var item in lists)
@ -120,6 +122,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
ids = ids.Substring(0, ids.LastIndexOf(","));
}
majorPlanApproval.UnitWorkId = ids;
if (this.rblIsReview.SelectedValue == "true")
{
majorPlanApproval.IsReview = true;
}
else
{
majorPlanApproval.IsReview = false;
}
if (string.IsNullOrEmpty(this.MajorPlanApprovalId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs generated
View File

@ -132,13 +132,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
protected global::FineUIPro.TextBox txtExpertReviewMan;
/// <summary>
/// txtImplementationDeviation 控件。
/// rblIsReview 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtImplementationDeviation;
protected global::FineUIPro.RadioButtonList rblIsReview;
/// <summary>
/// Panel2 控件。

1701
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx
View File

File diff suppressed because it is too large Load Diff

3029
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.cs
View File

File diff suppressed because it is too large Load Diff

1039
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit2.aspx.designer.cs generated
View File

File diff suppressed because it is too large Load Diff

74
SGGL/Model/Model.cs
View File

@ -95255,6 +95255,8 @@ namespace Model
private string _ExpertReviewMan;
private System.Nullable<bool> _IsReview;
private EntityRef<Base_CNProfessional> _Base_CNProfessional;
private EntityRef<Base_Project> _Base_Project;
@ -95299,6 +95301,8 @@ namespace Model
partial void OnUnitWorkIdChanged();
partial void OnExpertReviewManChanging(string value);
partial void OnExpertReviewManChanged();
partial void OnIsReviewChanging(System.Nullable<bool> value);
partial void OnIsReviewChanged();
#endregion
public Comprehensive_MajorPlanApproval()
@ -95642,6 +95646,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsReview", DbType="Bit")]
public System.Nullable<bool> IsReview
{
get
{
return this._IsReview;
}
set
{
if ((this._IsReview != value))
{
this.OnIsReviewChanging(value);
this.SendPropertyChanging();
this._IsReview = value;
this.SendPropertyChanged("IsReview");
this.OnIsReviewChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Comprehensive_MajorPlanApproval_Base_CNProfessional", Storage="_Base_CNProfessional", ThisKey="CNProfessionalId", OtherKey="CNProfessionalId", IsForeignKey=true)]
public Base_CNProfessional Base_CNProfessional
{
@ -98526,10 +98550,10 @@ namespace Model
private string _ProjectId;
private string _DraCode;
private string _CNProfessionalId;
private string _DraCode;
private System.Nullable<System.DateTime> _ReviewDate;
private string _UnitWorkId;
@ -98552,10 +98576,10 @@ namespace Model
partial void OnIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnDraCodeChanging(string value);
partial void OnDraCodeChanged();
partial void OnCNProfessionalIdChanging(string value);
partial void OnCNProfessionalIdChanged();
partial void OnDraCodeChanging(string value);
partial void OnDraCodeChanged();
partial void OnReviewDateChanging(System.Nullable<System.DateTime> value);
partial void OnReviewDateChanged();
partial void OnUnitWorkIdChanging(string value);
@ -98597,7 +98621,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
@ -98617,26 +98641,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string DraCode
{
get
{
return this._DraCode;
}
set
{
if ((this._DraCode != value))
{
this.OnDraCodeChanging(value);
this.SendPropertyChanging();
this._DraCode = value;
this.SendPropertyChanged("DraCode");
this.OnDraCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CNProfessionalId", DbType="NVarChar(50)")]
public string CNProfessionalId
{
@ -98657,6 +98661,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DraCode", DbType="NVarChar(50)")]
public string DraCode
{
get
{
return this._DraCode;
}
set
{
if ((this._DraCode != value))
{
this.OnDraCodeChanging(value);
this.SendPropertyChanging();
this._DraCode = value;
this.SendPropertyChanged("DraCode");
this.OnDraCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewDate", DbType="DateTime")]
public System.Nullable<System.DateTime> ReviewDate
{