zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

特种设备修改，车辆管理人员管理合并，考试接口创建试卷和答题使用redis

Browse Source
This commit is contained in:
李鹏飞
2024-04-02 14:28:52 +08:00
parent 1b96387adc
commit d87b2d5be9
49 changed files with 4175 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentIn.aspx
+25 -5
View File
@@ -64,11 +64,31 @@
<f:RenderField Width="150px" ColumnID="CarNumber" DataField="CarNumber" SortField="CarNumber"
FieldType="String" HeaderText="车牌号" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="OwnerCheck" DataField="OwnerCheck" SortField="OwnerCheck"
FieldType="String" HeaderText="进场前自查自检情况" HeaderTextAlign="Center" TextAlign="Left">
<f:RenderField Width="100px" ColumnID="InsuredAmount" DataField="InsuredAmount"
SortField="InsuredAmount" FieldType="String" HeaderText="保额(元)" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="130px" ColumnID="CertificateNum" DataField="CertificateNum"
<f:BoundField Width="140px" DataField="EququalityExpireDate" DataFormatString="{0:yyyy-MM-dd}" HeaderText="设备资质有效期" />
<f:BoundField Width="140px" DataField="InDate" DataFormatString="{0:yyyy-MM-dd}" HeaderText="进场时间" />
<f:RenderField Width="160px" ColumnID="OwnerCheck" DataField="OwnerCheck" SortField="OwnerCheck"
FieldType="String" HeaderText="进场前自查自检情况" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="160px" ColumnID="OperatorName" DataField="OperatorName"
SortField="OperatorName" FieldType="String" HeaderText="操作人员姓名" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="OperatorIdentityCard" DataField="OperatorIdentityCard"
SortField="OperatorIdentityCard" FieldType="String" HeaderText="操作人员身份证号" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:BoundField Width="180px" DataField="OperatorQualityExpireDate" DataFormatString="{0:yyyy-MM-dd}" HeaderText="操作人员资质有效期" />
<f:RenderField Width="160px" ColumnID="CertificationDepartment" DataField="CertificationDepartment"
SortField="CertificationDepartment" FieldType="String" HeaderText="发证部门" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<%--<f:RenderField Width="130px" ColumnID="CertificateNum" DataField="CertificateNum"
SortField="CertificateNum" FieldType="String" HeaderText="施工设备合格证号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
@@ -94,7 +114,7 @@
<f:RenderField Width="100px" ColumnID="CommercialInsuranceNum" DataField="CommercialInsuranceNum"
SortField="CommercialInsuranceNum" FieldType="String" HeaderText="商业险保单号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</f:RenderField>--%>
<f:CheckBoxField Width="60px" SortField="IsUsed" RenderAsStaticField="true" DataField="IsUsed"
HeaderText="在用" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentIn.aspx.cs
+1 -1
View File
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.HSSE.InApproveManager
{
string strSql = "SELECT EquipmentIn.EquipmentInId,EquipmentInItem.EquipmentInItemId,"
+ @"EquipmentIn.ProjectId,"
+ @"EquipmentInItem.SpecialEquipmentId,EquipmentInItem.SizeModel,EquipmentInItem.OwnerCheck,EquipmentInItem.CertificateNum,EquipmentInItem.SafetyInspectionNum,EquipmentInItem.DrivingLicenseNum,EquipmentInItem.RegistrationNum,EquipmentInItem.OperationQualificationNum,EquipmentInItem.InsuranceNum,EquipmentInItem.CommercialInsuranceNum,EquipmentInItem.IsUsed,EquipmentInItem.IsIn,"
+ @"EquipmentInItem.SpecialEquipmentId,EquipmentInItem.SizeModel,EquipmentInItem.OwnerCheck,EquipmentInItem.CertificateNum,EquipmentInItem.SafetyInspectionNum,EquipmentInItem.DrivingLicenseNum,EquipmentInItem.RegistrationNum,EquipmentInItem.OperationQualificationNum,EquipmentInItem.InsuranceNum,EquipmentInItem.CommercialInsuranceNum,EquipmentInItem.IsUsed,EquipmentInItem.IsIn,EquipmentInItem.InDate,EquipmentInItem.EququalityExpireDate,EquipmentInItem.InsuredAmount,EquipmentInItem.OperatorName,EquipmentInItem.OperatorIdentityCard,EquipmentInItem.OperatorQualityExpireDate,EquipmentInItem.CertificationDepartment ,"
+ @"CodeRecords.Code AS EquipmentInCode,"
+ @"EquipmentIn.UnitId,"
+ @"EquipmentIn.CarNumber,"
SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInEdit.aspx
+25 -4
View File
@@ -119,12 +119,33 @@
SortField="CommercialInsuranceNum" FieldType="String" HeaderText="商业险保单号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:BoundField Width="100px" DataField="InDate" DataFormatString="{0:yyyy-MM-dd}" HeaderText="进场时间" />
<f:BoundField Width="100px" DataField="EququalityExpireDate" DataFormatString="{0:yyyy-MM-dd}" HeaderText="设备资质有效期" />
<f:RenderField Width="100px" ColumnID="InsuredAmount" DataField="InsuredAmount"
SortField="InsuredAmount" FieldType="String" HeaderText="保额(元)" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="OperatorName" DataField="OperatorName"
SortField="OperatorName" FieldType="String" HeaderText="操作人员姓名" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="OperatorIdentityCard" DataField="OperatorIdentityCard"
SortField="OperatorIdentityCard" FieldType="String" HeaderText="操作人员身份证号" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:BoundField Width="100px" DataField="OperatorQualityExpireDate" DataFormatString="{0:yyyy-MM-dd}" HeaderText="操作人员资质有效期" />
<f:RenderField Width="100px" ColumnID="CertificationDepartment" DataField="CertificationDepartment"
SortField="CertificationDepartment" FieldType="String" HeaderText="发证部门" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:CheckBoxField Width="60px" SortField="IsUsed" RenderAsStaticField="true" DataField="IsUsed"
HeaderText="在用" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
HeaderText="在用" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
<f:CheckBoxField Width="60px" SortField="IsIn" RenderAsStaticField="true" DataField="IsIn"
HeaderText="在场" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
HeaderText="在场" HeaderTextAlign="Center" TextAlign="Center">
</f:CheckBoxField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx
+7 -7
View File
@@ -30,12 +30,12 @@
<f:FormRow>
<Items>
<f:DatePicker runat="server" ID="dt1" Label="设备资质有效期" LabelAlign="Right" MaxLength="50" LabelWidth="150px"/>
<f:DatePicker runat="server" ID="dtEququalityExpireDate" Label="设备资质有效期" LabelAlign="Right" MaxLength="50" LabelWidth="150px"/>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" ID="DatePicker1" Label="进场时间" LabelAlign="Right" MaxLength="50" LabelWidth="150px"/>
<f:DatePicker runat="server" ID="dtInDate" Label="进场时间" LabelAlign="Right" MaxLength="50" LabelWidth="150px"/>
</Items>
</f:FormRow>
@@ -84,7 +84,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="TextBox1" runat="server" Label="保额" LabelAlign="Right" MaxLength="50" LabelWidth="150px">
<f:TextBox ID="txtInsuredAmount" runat="server" Label="保额(元)" LabelAlign="Right" MaxLength="50" LabelWidth="150px" InputType="number">
</f:TextBox>
</Items>
</f:FormRow>
@@ -103,26 +103,26 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="TextBox2" runat="server" Label="操作人员姓名" LabelAlign="Right"
<f:TextBox ID="txtOperatorName" runat="server" Label="操作人员姓名" LabelAlign="Right"
MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="TextBox3" runat="server" Label="操作人员身份证号" LabelAlign="Right"
<f:TextBox ID="txtOperatorIdentityCard" runat="server" Label="操作人员身份证号" LabelAlign="Right"
MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" ID="DatePicker2" Label="操作人员资质有效期" LabelAlign="Right" MaxLength="50" LabelWidth="150px"/>
<f:DatePicker runat="server" ID="dtOperatorQualityExpireDate" Label="操作人员资质有效期" LabelAlign="Right" MaxLength="50" LabelWidth="150px"/>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="TextBox4" runat="server" Label="发证部门" LabelAlign="Right"
<f:TextBox ID="txtCertificationDepartment" runat="server" Label="发证部门" LabelAlign="Right"
MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx.cs
+16
View File
@@ -73,6 +73,14 @@ namespace FineUIPro.Web.HSSE.InApproveManager
this.txtOperationQualificationNum.Text = equipmentInItem.OperationQualificationNum;
this.txtInsuranceNum.Text = equipmentInItem.InsuranceNum;
this.txtCommercialInsuranceNum.Text = equipmentInItem.CommercialInsuranceNum;
this.dtInDate.SelectedDate = equipmentInItem.InDate;
this.dtEququalityExpireDate.SelectedDate = equipmentInItem.EququalityExpireDate;
this.txtInsuredAmount.Text = equipmentInItem.InsuredAmount.ToString();
this.txtOperatorName.Text = equipmentInItem.OperatorName;
this.txtOperatorIdentityCard.Text = equipmentInItem.OperatorIdentityCard;
this.dtOperatorQualityExpireDate.SelectedDate = equipmentInItem.OperatorQualityExpireDate;
this.txtCertificationDepartment.Text = equipmentInItem.CertificationDepartment;
if (equipmentInItem.IsUsed != true)
{
this.cbIsUsed.Checked = false;
@@ -119,6 +127,14 @@ namespace FineUIPro.Web.HSSE.InApproveManager
equipmentInItem.CommercialInsuranceNum = this.txtCommercialInsuranceNum.Text.Trim();
equipmentInItem.IsUsed = Convert.ToBoolean(this.cbIsUsed.Checked);
equipmentInItem.IsIn = Convert.ToBoolean(this.cbIsIn.Checked);
equipmentInItem.InDate = dtInDate.SelectedDate;
equipmentInItem.EququalityExpireDate = this.dtEququalityExpireDate.SelectedDate;
equipmentInItem.InsuredAmount = Funs.GetNewDecimalOrZero(this.txtInsuredAmount.Text) ;
equipmentInItem.OperatorName = this.txtOperatorName.Text.Trim();
equipmentInItem.OperatorIdentityCard = this.txtOperatorIdentityCard.Text.Trim();
equipmentInItem.OperatorQualityExpireDate = this.dtOperatorQualityExpireDate.SelectedDate;
equipmentInItem.CertificationDepartment = this.txtCertificationDepartment.Text.Trim();
if (!string.IsNullOrEmpty(this.EquipmentInItemId))
{
equipmentInItem.EquipmentInItemId = this.EquipmentInItemId;
SGGL/FineUIPro.Web/HSSE/InApproveManager/EquipmentInItemEdit.aspx.designer.cs
Generated
+14 -14
View File
@@ -60,22 +60,22 @@ namespace FineUIPro.Web.HSSE.InApproveManager
protected global::FineUIPro.TextBox txtSizeModel;
/// <summary>
/// dt1 控件。
/// dtEququalityExpireDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker dt1;
protected global::FineUIPro.DatePicker dtEququalityExpireDate;
/// <summary>
/// DatePicker1 控件。
/// dtInDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker DatePicker1;
protected global::FineUIPro.DatePicker dtInDate;
/// <summary>
/// txtOwnerCheck 控件。
@@ -132,13 +132,13 @@ namespace FineUIPro.Web.HSSE.InApproveManager
protected global::FineUIPro.TextBox txtOperationQualificationNum;
/// <summary>
/// TextBox1 控件。
/// txtInsuredAmount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox1;
protected global::FineUIPro.TextBox txtInsuredAmount;
/// <summary>
/// txtInsuranceNum 控件。
@@ -159,40 +159,40 @@ namespace FineUIPro.Web.HSSE.InApproveManager
protected global::FineUIPro.TextBox txtCommercialInsuranceNum;
/// <summary>
/// TextBox2 控件。
/// txtOperatorName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox2;
protected global::FineUIPro.TextBox txtOperatorName;
/// <summary>
/// TextBox3 控件。
/// txtOperatorIdentityCard 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox3;
protected global::FineUIPro.TextBox txtOperatorIdentityCard;
/// <summary>
/// DatePicker2 控件。
/// dtOperatorQualityExpireDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker DatePicker2;
protected global::FineUIPro.DatePicker dtOperatorQualityExpireDate;
/// <summary>
/// TextBox4 控件。
/// txtCertificationDepartment 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox TextBox4;
protected global::FineUIPro.TextBox txtCertificationDepartment;
/// <summary>
/// cbIsUsed 控件。