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

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
李超 2025-09-20 18:17:52 +08:00
parent 7c43296f41 76668143e5
commit eb62e9a2d8
29 changed files with 916 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SGGL/BLL/BLL.csproj
View File

@ -310,6 +310,7 @@
<Compile Include="CQMS\WBS\WorkPackageInitService.cs" />
<Compile Include="CQMS\WBS\WorkPackageProjectService.cs" />
<Compile Include="CQMS\WBS\WorkPackageService.cs" />
<Compile Include="DCGL\ServerCheck\DCGLCheckNoticeItemService.cs" />
<Compile Include="DCGL\ServerCheck\DCGLCheckRectifyItemService.cs" />
<Compile Include="DCGL\ServerCheck\DCGLCheckRectifyService.cs" />
<Compile Include="DigData\HSEDataCollectService.cs" />

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

@ -4188,7 +4188,7 @@ namespace BLL
public const string MajorPlanApprovalMenuId = "fd116c94-714b-4b92-a3c9-cc83d358e2b3";
/// <summary>
/// 设计交底管理
/// 施工技术交底管理
/// </summary>
public const string ConTechnologyDisclosureMenuId = "A16CFA9D-2783-4573-95F9-EBA2B682B7EA";

7
SGGL/BLL/Common/Funs.cs
View File

@ -95,8 +95,11 @@ namespace BLL
/// </summary>
public static string CNCECPath
{
get;
set;
get
{
var path = BLL.ServerService.GetQHSEUrl();
return path;
}
}
public static string SGGLUrl
{

39
SGGL/BLL/DCGL/ServerCheck/DCGLCheckNoticeItemService.cs Normal file
View File

@ -0,0 +1,39 @@
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BLL
{
/// <summary>
/// 督查检查整改明细表
/// </summary>
public static class DCGLCheckNoticeItemService
{
/// <summary>
/// 根据主键获取督查检查整改明细信息
/// </summary>
/// <param name="checkRectifyItemId"></param>
/// <returns></returns>
public static Model.DCGL_Check_CheckInfo_TableNoticeItem GetCheckNoticeItemByCheckNoticeItemId(string checkNoticeItemId)
{
return Funs.DB.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(e => e.ID == checkNoticeItemId);
}
/// <summary>
/// 添加督查检查整改明细信息
/// </summary>
/// <param name="CheckNoticeItem"></param>
public static void UpdateCheckNoticeItem(Model.DCGL_Check_CheckInfo_TableNoticeItem CheckNoticeItem)
{
var newCheckNoticeItem = Funs.DB.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(x => x.ID == CheckNoticeItem.ID);
if (newCheckNoticeItem != null)
{
newCheckNoticeItem.Situation = CheckNoticeItem.Situation;
Funs.DB.SubmitChanges();
}
}
}
}

83
SGGL/BLL/OpenService/FileInsertService.cs
View File

@ -6,11 +6,51 @@ using System.Collections;
using System.IO;
using System.Web;
using System.Text.RegularExpressions;
using System.Net;
namespace BLL
{
public static class FileInsertService
{
/// <summary>
/// 获取服务器图片转byte
/// </summary>
/// <param name="fileHost"></param>
/// <param name="attachUrl"></param>
/// <returns></returns>
public static List<byte[]> FilePathTransStream(string fileHost, string attachUrl)
{
List<byte[]> bytes = new List<byte[]>();
var strs = attachUrl.Trim().Split(',');
try
{
foreach (var fileUrl in strs)
{
string filepath = $"{fileHost}{fileUrl}";
// 创建WebClient实例
using (WebClient webClient = new WebClient())
{
// 下载图片并保存到内存流
using (MemoryStream ms = new MemoryStream(webClient.DownloadData(filepath)))
{
// 将MemoryStream转换为byte数组
byte[] imageBytes = ms.ToArray();
bytes.Add(imageBytes);
//// 使用byte数组（例如，保存到文件或进行其他处理）
//File.WriteAllBytes("localImage.jpg", imageBytes);
}
}
}
}
catch (Exception ex)
{
Console.WriteLine("Error: " + ex.Message);
}
return bytes;
}
/// <summary>
/// 获取附件数据流类
/// </summary>
@ -45,7 +85,6 @@ namespace BLL
}
}
/// <summary>
/// 获取多附件数据流类
/// </summary>
@ -63,7 +102,6 @@ namespace BLL
{
if (strs.Count() > i)
{
//string physicalpath = Funs.AttachRootPath;
string physicalpath = Funs.RootPath;
string fpath = strs[i];
string fullPath = physicalpath + fpath;
@ -107,7 +145,6 @@ namespace BLL
}
}
/// <summary>
/// 数据和附件插入到多附件表
/// </summary>
@ -149,5 +186,45 @@ namespace BLL
}
}
}
/// <summary>
/// 数据和附件插入到多附件表【不存实际文件，只存地址】
/// </summary>
public static void InsertAttachFileRecord(string attachFileId, string dataId, string attachSource, string attachUrl)
{
var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.AttachFileId == attachFileId);
if (getAtt != null)
{
Funs.DB.AttachFile.DeleteOnSubmit(getAtt);
Funs.DB.SubmitChanges();
}
//多附件
var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataId);
if (attachFile == null && !string.IsNullOrEmpty(attachSource))
{
Model.AttachFile newAttachFile = new Model.AttachFile
{
AttachFileId = attachFileId,
ToKeyId = dataId,
AttachSource = attachSource,
AttachUrl = attachUrl
};
Funs.DB.AttachFile.InsertOnSubmit(newAttachFile);
Funs.DB.SubmitChanges();
}
else
{
if (attachFile.AttachUrl != attachUrl)
{
///删除附件文件
BLL.UploadAttachmentService.DeleteFile(Funs.RootPath, attachFile.AttachUrl);
attachFile.AttachSource = attachSource;
attachFile.AttachUrl = attachUrl;
Funs.DB.SubmitChanges();
}
}
}
}
}

21
SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs
View File

@ -24,11 +24,11 @@ namespace BLL
//public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 关键事项通知提醒责任人
/// 关键事项通知提醒责任人、抄送人
/// </summary>
/// <param name="userId"></param>
/// <param name="userIds"></param>
/// <param name="gjsxId"></param>
public static void GJSXNoticeSendEmail(string userId, string gjsxId)
public static void GJSXNoticeSendEmail(List<string> userIds, string gjsxId)
{
string strSql = $@"select
DATEDIFF(DAY, CompleteDate, isnull(CloseDate,getdate())) AS DateDiffDays
@ -87,12 +87,23 @@ namespace BLL
}).ToList();
var gItem = lstOverdue.FirstOrDefault();
if (gItem != null)
{
foreach (var userId in userIds)
{
var user = UserService.GetUserByUserId(userId);
if (gItem != null && !string.IsNullOrWhiteSpace(user.Email))
if (!string.IsNullOrWhiteSpace(user.Email))
{
MailMessage mail = new MailMessage();
//邮件主题
if (userId == gItem.User_AcceptanceUserId)
{
mail.Subject = $"你有新的关键事项了——{gItem.ProjectName}";
}
else
{
mail.Subject = $"有新的关键事项抄送你了——{gItem.ProjectName}";
}
mail.To.Add(user.Email);
//mail.To.Add("test@test.com");
mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析
@ -138,6 +149,8 @@ namespace BLL
}
}
}
}
}
/// <summary>

2
SGGL/FineUIPro.Web/CQMS/Check/JointCheck.aspx.cs
View File

@ -367,7 +367,7 @@ namespace FineUIPro.Web.CQMS.Check
{
if (!string.IsNullOrEmpty(approve.ApproveMan))
{
if (this.CurrUser.UserId == approve.ApproveMan || CurrUser.UserId == Const.sysglyId)
if (approve.ApproveMan.Contains(this.CurrUser.UserId) || CurrUser.UserId == Const.sysglyId)
{
if (jointCheck.State == BLL.Const.JointCheck_Compile)
{

12
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx
View File

@ -76,6 +76,12 @@
<f:RenderField ColumnID="AttendMan" DataField="AttendMan" FieldType="String" HeaderText="参加人员" TextAlign="Center"
HeaderTextAlign="Center" Width="130px">
</f:RenderField>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("ConTechnologyDisclosureId")) %>' ToolTip="附件查看"></asp:LinkButton>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -96,16 +102,16 @@
</f:Panel>
<f:Window ID="Window1" Title="施工技术交底管理" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="900px" Height="430px">
Width="900px" Height="600px">
</f:Window>
<f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
Width="1200px" Height="660px">
</f:Window>
<%--<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
IsModal="true" Width="700px" Height="500px">
</f:Window>--%>
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosure.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive {
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class ConTechnologyDisclosure {
public partial class ConTechnologyDisclosure
{
/// <summary>
/// form1 控件。
@ -138,6 +140,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -174,6 +185,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Menu1 控件。
/// </summary>

21
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx
View File

@ -45,22 +45,35 @@
<f:TextBox ID="txtAttendMan" runat="server" Label="参加人员" MaxLength="100" LabelAlign="Right" LabelWidth="130px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="140px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<%--<f:HiddenField ID="hdAttachUrl" runat="server">
</f:HiddenField>--%>
<f:HiddenField ID="hdAttachUrl" runat="server">
</f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<%--<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>--%>
</f:Window>
</form>
</body>
</html>

28
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.Comprehensive;
using System;
using System.Collections.Generic;
using System.Linq;
@ -47,6 +48,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (con != null)
{
this.ConTechnologyDisclosureId = con.ConTechnologyDisclosureId;
this.hdAttachUrl.Text = this.ConTechnologyDisclosureId;
if (!string.IsNullOrEmpty(con.CNProfessionalId))
{
this.drpCNProfessionalId.SelectedValue = con.CNProfessionalId;
@ -126,9 +128,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newCon.DisclosurePersonNum = Funs.GetNewInt(this.txtDisclosurePersonNum.Text.Trim());
if (string.IsNullOrEmpty(this.ConTechnologyDisclosureId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
newCon.ConTechnologyDisclosureId = this.hdAttachUrl.Text;
}
else
{
newCon.ConTechnologyDisclosureId = SQLHelper.GetNewID(typeof(Model.Comprehensive_ConTechnologyDisclosure));
this.hdAttachUrl.Text = newCon.ConTechnologyDisclosureId;
}
newCon.CompileMan = this.CurrUser.UserId;
newCon.CompileDate = DateTime.Now;
BLL.ConTechnologyDisclosureService.AddConTechnologyDisclosure(newCon);
@ -165,5 +174,22 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
}
#endregion
#region 附件上传
/// <summary>
/// 附件上传
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttach_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录
{
this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
}
Model.Comprehensive_ConTechnologyDisclosure con = BLL.ConTechnologyDisclosureService.GetConTechnologyDisclosureById(this.ConTechnologyDisclosureId);
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/ConTechnologyDisclosure&menuId={1}", this.hdAttachUrl.Text, BLL.Const.ConTechnologyDisclosureMenuId)));
}
#endregion
}
}

45
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureEdit.aspx.designer.cs generated
View File

@ -131,6 +131,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// </remarks>
protected global::FineUIPro.TextBox txtAttendMan;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -140,6 +167,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -148,5 +184,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
}
}

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
View File

@ -234,8 +234,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
designDetails.DesignDetailsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
this.hdAttachUrl.Text = designDetails.DesignDetailsId;
}
designDetails.CompileMan = this.CurrUser.UserId;
designDetails.CompileDate = DateTime.Now;
designDetails.Status = BLL.Const.Comprehensive_Compile;

12
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx
View File

@ -64,6 +64,12 @@
<f:RenderField ColumnID="Remark" DataField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
HeaderTextAlign="Center" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:TemplateField ColumnID="AttachFile" Width="150px" HeaderText="附件" HeaderTextAlign="Center" TextAlign="Left">
<ItemTemplate>
<asp:LinkButton ID="lbtnFileUrl" runat="server" CssClass="ItemLink"
Text='<%# BLL.AttachFileService.GetBtnFileUrl(Eval("TrainingRecordsId")) %>' ToolTip="附件查看"></asp:LinkButton>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -84,11 +90,15 @@
</f:Panel>
<f:Window ID="Window1" Title="培训记录" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="800px" Height="500px">
Width="800px" Height="600px">
</f:Window>
<f:Window ID="Window2" Title="培训记录导入" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1200px" Height="650px">
</f:Window>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
IsModal="true" Width="700px" Height="500px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>

24
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecords.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive {
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class TrainingRecords {
public partial class TrainingRecords
{
/// <summary>
/// form1 控件。
@ -120,6 +122,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// lbtnFileUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -156,6 +167,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
/// <summary>
/// Menu1 控件。
/// </summary>

19
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx
View File

@ -52,16 +52,35 @@
<f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="50" LabelAlign="Right" LabelWidth="130px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" Label="上传附件"
LabelAlign="Right" LabelWidth="140px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
</f:Button>
</Items>
</f:Panel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField ID="hdAttachUrl" runat="server">
</f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" ToolTip="保存" ValidateForms="SimpleForm1" OnClick="btnSave_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
Height="500px">
</f:Window>
</form>
</body>
</html>

28
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.Comprehensive;
using System;
using System.Linq;
@ -40,6 +41,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (trainingRecords != null)
{
this.TrainingRecordsId = trainingRecords.TrainingRecordsId;
this.hdAttachUrl.Text = this.TrainingRecordsId;
this.txtTrainingContents.Text = trainingRecords.TrainingContents;
if (!string.IsNullOrEmpty(trainingRecords.CNProfessionalId))
{
@ -90,8 +92,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.TrainingRecordsService.UpdateTrainingRecords(trainingRecords);
}
else
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
trainingRecords.TrainingRecordsId = this.hdAttachUrl.Text;
}
else
{
trainingRecords.TrainingRecordsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_TrainingRecords));
this.hdAttachUrl.Text = trainingRecords.TrainingRecordsId;
}
trainingRecords.ProjectId = this.CurrUser.LoginProjectId;
BLL.TrainingRecordsService.AddTrainingRecords(trainingRecords);
}
@ -122,5 +132,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
}
#endregion
#region 附件上传
/// <summary>
/// 附件上传
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttach_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.hdAttachUrl.Text)) //新增记录
{
this.hdAttachUrl.Text = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails));
}
Model.Comprehensive_TrainingRecords trainingRecords = BLL.TrainingRecordsService.GetTrainingRecordsById(this.TrainingRecordsId);
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/TrainingRecords&menuId={1}", this.hdAttachUrl.Text, BLL.Const.TrainingRecordsMenuId)));
}
#endregion
}
}

51
SGGL/FineUIPro.Web/CQMS/Comprehensive/TrainingRecordsEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.CQMS.Comprehensive {
namespace FineUIPro.Web.CQMS.Comprehensive
{
public partial class TrainingRecordsEdit {
public partial class TrainingRecordsEdit
{
/// <summary>
/// form1 控件。
@ -111,6 +113,33 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// btnAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttach;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -120,6 +149,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdAttachUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdAttachUrl;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -128,5 +166,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// WindowAtt 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window WindowAtt;
}
}

258
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs
View File

@ -13,10 +13,12 @@ namespace FineUIPro.Web.DCGL.ServerCheck
{
public partial class CheckRectify : PageBase
{
private static string proType;
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
proType = Request.Params["proType"] ?? string.Empty;
this.GetButtonPower();
//btnNew.OnClientClick = Window1.GetShowReference("CheckRectifyEdit.aspx") + "return false;";
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
@ -30,15 +32,19 @@ namespace FineUIPro.Web.DCGL.ServerCheck
/// </summary>
private void BindGrid()
{
string strSql = string.Empty;
StringBuilder sb = new StringBuilder();
sb.Append($@"SELECT S.CheckRectifyId,S.CheckRectifyCode,S.ProjectId,S.ProjectName,S.UnitId,U.UnitName,S.CheckDate,CASE S.HandleState WHEN '{BLL.Const.State_1}' THEN '未签发' WHEN '{BLL.Const.State_2}' THEN '未上报' ELSE '已上报' END AS HandleState,
S.IssueMan,S.IssueDate,ISNULL(TotalCount.TotalCount,0) AS TotalCount ,ISNULL(CompleteCount.CompleteCount,0) AS CompleteCount,(ISNULL(TotalCount.TotalCount,0) -ISNULL(CompleteCount.CompleteCount,0)) AS UnCompleteCount ");
sb.Append("FROM dbo.DCGL_Check_CheckRectify AS S LEFT JOIN dbo.Base_Unit AS U ON U.UnitId = S.UnitId ");
sb.Append(" LEFT JOIN (SELECT COUNT(*) AS TotalCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem GROUP BY CheckRectifyId) AS TotalCount ON S.CheckRectifyId=TotalCount.CheckRectifyId ");
sb.Append(" LEFT JOIN (SELECT COUNT(*) AS CompleteCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem WHERE RealEndDate IS NOT NULL GROUP BY CheckRectifyId) AS CompleteCount ON S.CheckRectifyId=CompleteCount.CheckRectifyId ");
if (!string.IsNullOrWhiteSpace(proType) && proType == "1")
{//只查询本项目检查数据
sb.Append($"WHERE S.ProjectId='{this.CurrUser.LoginProjectId}' ");
}
sb.Append("ORDER BY HandleState");
SqlParameter[] parameter = new SqlParameter[] { };
strSql = "SELECT S.CheckRectifyId,S.CheckRectifyCode,S.ProjectId,S.ProjectName,S.UnitId,U.UnitName,S.CheckDate,CASE S.HandleState WHEN '" + BLL.Const.State_1 + "' THEN '未签发' WHEN '" + BLL.Const.State_2 + "' THEN '未上报' ELSE '已上报' END AS HandleState,"
+ @" S.IssueMan,S.IssueDate,ISNULL(TotalCount.TotalCount,0) AS TotalCount ,ISNULL(CompleteCount.CompleteCount,0) AS CompleteCount,(ISNULL(TotalCount.TotalCount,0) -ISNULL(CompleteCount.CompleteCount,0)) AS UnCompleteCount"
+ @" FROM dbo.DCGL_Check_CheckRectify AS S LEFT JOIN dbo.Base_Unit AS U ON U.UnitId = S.UnitId"
+ @" LEFT JOIN (SELECT COUNT(*) AS TotalCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem GROUP BY CheckRectifyId) AS TotalCount ON S.CheckRectifyId=TotalCount.CheckRectifyId"
+ @" LEFT JOIN (SELECT COUNT(*) AS CompleteCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem WHERE RealEndDate IS NOT NULL GROUP BY CheckRectifyId) AS CompleteCount ON S.CheckRectifyId=CompleteCount.CheckRectifyId"
+ @" ORDER BY HandleState";
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter);
// 2.获取当前分页数据
//var table = this.GetPagedDataTable(Grid1, tb1);
@ -386,13 +392,246 @@ namespace FineUIPro.Web.DCGL.ServerCheck
}
#region 获取
/// <summary>
/// 获取督查检查整改
/// </summary>
/// <param name="type"></param>
/// <returns></returns>
public static Model.ResponeData getCheck_CheckRectifyListToSUB()
{
var responeData = new Model.ResponeData();
try
{
string unitId = CommonService.GetThisUnitId();
string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getDCGLCheckInfoRectify?unitId=" + unitId;
string contenttype = "application/json;charset=unicode";
Hashtable newToken = new Hashtable
{
{ "token", ServerService.GetToken().Token }
};
var strJosn = APIGetHttpService.Http(baseurl, "GET", contenttype, newToken, null);
if (!string.IsNullOrEmpty(strJosn))
{
JObject obj = JObject.Parse(strJosn);
responeData.code = Funs.GetNewIntOrZero(obj["code"].ToString());
responeData.message = obj["message"].ToString();
if (responeData.code == 1)
{
JArray getData = JArray.Parse(obj["data"].ToString());
if (getData.Count() > 0)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
List<string> ids = new List<string>();
foreach (var item in getData)
{
string getCheckRectifyId = item["CheckRectifyId"].ToString();
if (!ids.Contains(getCheckRectifyId))
{
var newRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == getCheckRectifyId);
if (newRectify == null)
{
ids.Add(getCheckRectifyId);
Model.DCGL_Check_CheckRectify newCheckRectify = new Model.DCGL_Check_CheckRectify
{
CheckRectifyId = getCheckRectifyId,
CheckRectifyCode = item["CheckRectifyCode"].ToString(),
ProjectId = item["ProjectId"].ToString(),
ProjectName = item["ProjectName"].ToString(),
UnitId = unitId,
CheckDate = Funs.GetNewDateTime(item["CheckDate"].ToString()),
IssueMan = item["IssueMan"].ToString(),
IssueDate = Funs.GetNewDateTime(item["IssueDate"].ToString()),
HandleState = item["HandleState"].ToString()
};
db.DCGL_Check_CheckRectify.InsertOnSubmit(newCheckRectify);
db.SubmitChanges();
}
else
{
newRectify.CheckRectifyCode = item["CheckRectifyCode"].ToString();
db.SubmitChanges();
}
//获取对应主表主键的明细集合
string getNoticeItemId = item["NoticeItemId"].ToString();
var notice = db.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(x => x.ID == getNoticeItemId);
if (notice == null)
{
Model.DCGL_Check_CheckInfo_TableNoticeItem newCheckRectifyItem = new Model.DCGL_Check_CheckInfo_TableNoticeItem
{
ID = getNoticeItemId,
CheckInfoId = item["CheckInfoId"].ToString(),
SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()),
Describe = item["Describe"].ToString(),
Standards = item["Standards"].ToString(),
Advice = item["Advice"].ToString(),
LimitTime = Funs.GetNewDateTime(item["LimitTime"].ToString()),
Situation = item["Situation"].ToString(),
Remark = item["Remark"].ToString(),
Url = item["Url"].ToString(),
AffUrl = item["AffUrl"].ToString(),
RiskLevel = item["RiskLevel"].ToString(),
ProblemTypes = item["ProblemTypes"].ToString(),
ProblemSubTypeId = item["ProblemSubTypeId"].ToString(),
ProblemSubType = item["ProblemSubType"].ToString(),
States = item["States"].ToString(),
//WorkType = item["WorkType"].ToString(),
//DangerPoint = item["DangerPoint"].ToString(),
//RiskExists = item["RiskExists"].ToString(),
//IsProject = Convert.ToBoolean(item["IsProject"].ToString()),
//CheckMan = item["CheckMan"].ToString(),
//SubjectUnitMan = item["SubjectUnitMan"].ToString(),
};
db.DCGL_Check_CheckInfo_TableNoticeItem.InsertOnSubmit(newCheckRectifyItem);
db.SubmitChanges();
}
BLL.CommonService.DeleteAttachFileById(getNoticeItemId);//删除附件
////上传附件
string getAttachFileId = item["AttachFileId"].ToString();
if (!string.IsNullOrEmpty(getAttachFileId))
{
List<byte[]> resultList = new List<byte[]>();
string filePath = item["FilePath"].ToString();
string attachSource = item["AttachSource"].ToString();
string attachUrl = item["AttachUrl"].ToString();
BLL.FileInsertService.InsertAttachFileRecord(getAttachFileId, getNoticeItemId, attachSource, attachUrl);
//if (!string.IsNullOrWhiteSpace(filePath) && !string.IsNullOrWhiteSpace(attachSource) && !string.IsNullOrWhiteSpace(attachUrl))
//{
// resultList = FileInsertService.FilePathTransStream(filePath, attachUrl);
//}
//BLL.FileInsertService.InsertAttachFile(getAttachFileId, getNoticeItemId, attachSource, attachUrl, resultList);
}
string getCheckRectifyItemId = item["CheckRectifyItemId"].ToString();
var oldItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == getCheckRectifyItemId);
if (oldItem == null)
{
Model.DCGL_Check_CheckRectifyItem newCheckRectifyItem = new Model.DCGL_Check_CheckRectifyItem
{
CheckRectifyItemId = getCheckRectifyItemId,
CheckRectifyId = getCheckRectifyId,
NoticeItemId = getNoticeItemId,
ConfirmMan = item["ConfirmMan"].ToString(),
ConfirmManName = item["ConfirmManName"].ToString(),
ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()),
OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()),
OrderEndPerson = item["OrderEndPerson"].ToString(),
RealEndDate = Funs.GetNewDateTime(item["RealEndDate"].ToString()),
};
db.DCGL_Check_CheckRectifyItem.InsertOnSubmit(newCheckRectifyItem);
db.SubmitChanges();
}
}
else
{
//获取对应主表主键的明细集合
string getNoticeItemId = item["NoticeItemId"].ToString();
var notice = db.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(x => x.ID == getNoticeItemId);
if (notice == null)
{
Model.DCGL_Check_CheckInfo_TableNoticeItem newCheckRectifyItem = new Model.DCGL_Check_CheckInfo_TableNoticeItem
{
ID = getNoticeItemId,
CheckInfoId = item["CheckInfoId"].ToString(),
SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()),
Describe = item["Describe"].ToString(),
Standards = item["Standards"].ToString(),
Advice = item["Advice"].ToString(),
LimitTime = Funs.GetNewDateTime(item["LimitTime"].ToString()),
Situation = item["Situation"].ToString(),
Remark = item["Remark"].ToString(),
Url = item["Url"].ToString(),
AffUrl = item["AffUrl"].ToString(),
RiskLevel = item["RiskLevel"].ToString(),
ProblemTypes = item["ProblemTypes"].ToString(),
ProblemSubTypeId = item["ProblemSubTypeId"].ToString(),
ProblemSubType = item["ProblemSubType"].ToString(),
States = item["States"].ToString(),
//WorkType = item["WorkType"].ToString(),
//DangerPoint = item["DangerPoint"].ToString(),
//RiskExists = item["RiskExists"].ToString(),
//IsProject = Convert.ToBoolean(item["IsProject"].ToString()),
//CheckMan = item["CheckMan"].ToString(),
//SubjectUnitMan = item["SubjectUnitMan"].ToString(),
};
db.DCGL_Check_CheckInfo_TableNoticeItem.InsertOnSubmit(newCheckRectifyItem);
db.SubmitChanges();
}
BLL.CommonService.DeleteAttachFileById(getNoticeItemId);//删除附件
////上传附件
string getAttachFileId = item["AttachFileId"].ToString();
if (!string.IsNullOrEmpty(getAttachFileId))
{
List<byte[]> resultList = new List<byte[]>();
string attachSource = item["AttachSource"].ToString();
string attachUrl = item["AttachUrl"].ToString();
BLL.FileInsertService.InsertAttachFileRecord(getAttachFileId, getNoticeItemId, attachSource, attachUrl);
//if (!string.IsNullOrWhiteSpace(filePath) && !string.IsNullOrWhiteSpace(attachSource) && !string.IsNullOrWhiteSpace(attachUrl))
//{
// resultList = FileInsertService.FilePathTransStream(filePath, attachUrl);
//}
//BLL.FileInsertService.InsertAttachFile(getAttachFileId, getNoticeItemId, attachSource, attachUrl, resultList);
}
string getCheckRectifyItemId = item["CheckRectifyItemId"].ToString();
var oldItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == getCheckRectifyItemId);
if (oldItem == null)
{
Model.DCGL_Check_CheckRectifyItem newCheckRectifyItem = new Model.DCGL_Check_CheckRectifyItem
{
CheckRectifyItemId = getCheckRectifyItemId,
CheckRectifyId = getCheckRectifyId,
NoticeItemId = getNoticeItemId,
ConfirmMan = item["ConfirmMan"].ToString(),
ConfirmManName = item["ConfirmManName"].ToString(),
ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()),
OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()),
OrderEndPerson = item["OrderEndPerson"].ToString(),
RealEndDate = Funs.GetNewDateTime(item["RealEndDate"].ToString()),
};
db.DCGL_Check_CheckRectifyItem.InsertOnSubmit(newCheckRectifyItem);
db.SubmitChanges();
}
}
}
}
}
responeData.message = "获取成功：整改明细记录" + getData.Count().ToString() + "条";
}
}
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = "获取失败：" + ex.Message;
ErrLogInfo.WriteLog("督查检查通知单获取！", ex);
}
return responeData;
}
#endregion
#region 获取
/// <summary>
/// 获取
/// </summary>
/// <param name="type"></param>
/// <returns></returns>
public static Model.ResponeData getCheck_CheckRectifyListToSUB()
public static Model.ResponeData getCheck_CheckRectifyListToSUBOld()
{
var responeData = new Model.ResponeData();
try
@ -591,6 +830,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
CheckRectifyId = getCheckRectifyId,
NoticeItemId = getNoticeItemId,
ConfirmMan = item["ConfirmMan"].ToString(),
ConfirmManName = item["ConfirmManName"].ToString(),
ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()),
OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()),
OrderEndPerson = item["OrderEndPerson"].ToString(),

84
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx
View File

@ -6,11 +6,36 @@
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>隐患整改单</title>
<link href="../../res/css/viewer.min.css" rel="stylesheet" />
<script src="../../res/js/jquery-3.4.1.min.js" type="text/javascript"></script>
<script src="../../res/js/viewer.min.js" type="text/javascript"></script>
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.imgPreview {
display: none;
top: 0;
left: 0;
width: 100%; /*容器占满整个屏幕*/
height: 100%;
position: fixed;
background: rgba(0, 0, 0, 0.5);
}
.imgPreview img {
z-index: 100;
width: 60%;
position: fixed;
top: 50%;
left: 50%;
transform: translate(-50%,-50%);
}
/*添加鼠标移入图片效果*/
.img {
cursor: url("ico/放大镜.png"), auto;
}
</style>
</head>
<body>
@ -57,7 +82,7 @@
<f:FormRow>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" runat="server"
BoxFlex="1" DataKeyNames="CheckRectifyItemId" AllowCellEditing="true" Height="420px"
BoxFlex="1" DataKeyNames="CheckRectifyItemId" AllowCellEditing="true" Height="620px"
ClicksToEdit="1" DataIDField="CheckRectifyItemId" EnableColumnLines="true">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="45px" HeaderTextAlign="Center" TextAlign="Center" />
@ -74,10 +99,16 @@
<asp:Label ID="Label4" runat="server" Text='<%# Bind("RiskExists") %>' ToolTip='<%#Bind("RiskExists") %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" HeaderText="整改前" Text="相关照片"
<f:TemplateField ColumnID="tfImageUrl1" MinWidth="120px" HeaderText="整改前" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbImageUrl1" runat="server" Text='<%# ConvertImageUrlByImage(Eval("NoticeItemId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%--<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" HeaderText="整改前" Text="相关照片"
ToolTip="相关照片附件" DataIFrameUrlFields="NoticeItemId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Check&type=-1"
Title="相关照片" ColumnID="WindowAtt">
</f:WindowField>
</f:WindowField>--%>
<f:WindowField TextAlign="Center" Width="80px" WindowID="WindowAtt" HeaderText="整改后" Text="相关照片"
ToolTip="相关照片附件" DataIFrameUrlFields="CheckRectifyItemId" DataIFrameUrlFormatString="../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/Check&menuId=2E4A3E58-44B7-41B0-BFE3-634DF29AAE27"
Title="相关照片" ColumnID="WindowAtt1">
@ -108,12 +139,19 @@
</f:DatePicker>
</Editor>
</f:RenderField>
<f:RenderField ColumnID="Verification" DataField="Verification" Width="100px" HeaderToolTip="企业管理部门验证人"
<%-- <f:RenderField ColumnID="Verification" DataField="Verification" Width="100px" HeaderToolTip="企业管理部门验证人"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="验证人">
<Editor>
<f:TextBox ID="txtVerification" Text='<%# Eval("Verification")%>' MaxLength="50" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>--%>
<f:RenderField ColumnID="Situation" DataField="Situation" Width="220px" HeaderToolTip="整改情况"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="整改情况">
<Editor>
<f:TextBox ID="txtSituation" Text='<%# Eval("Situation")%>' MaxLength="500" runat="server">
</f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="1px" ColumnID="CheckRectifyItemId" DataField="CheckRectifyItemId"
FieldType="String" HeaderText="主键" Hidden="true" HeaderTextAlign="Center">
@ -143,5 +181,43 @@
IsModal="true" Width="800px" Height="500px">
</f:Window>
</form>
<div class="imgPreview">
<img src="#" alt="" id="imgPreview" />
</div>
<script type="text/javascript">
var imgID = '<%=Grid1.ClientID %>';
function showImg() {
var $wrap = $("#" + imgID)
//console.log($wrap)
$wrap.find('img').on('click', function () {
var src = $(this).attr('src');
console.log(src)
if (src.indexOf("/res/icon") != -1) {
return;
}
var div = document.createElement('div');
div.style.display = 'none';
div.innerHTML = '<img src="' + src + '">'; // 创建一个包含图片的 div 元素
document.body.appendChild(div); // 将 div 元素添加到页面中
var viewer = new Viewer(div.firstChild); // 创建 Viewer 实例并传入图片元素
viewer.show(); // 显示图片预览
// 在 Viewer 关闭后移除添加的 div 元素
viewer.on('hidden', function () {
document.body.removeChild(div);
});
});
$('.imgPreview').on('click', function () {
// $('.imgPreview').hide()
});
}
F.ready(function () {
showImg();
})
</script>
<script src="../../res/js/hook.js" type="text/javascript"></script>
</body>
</html>

40
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs
View File

@ -23,6 +23,12 @@ namespace FineUIPro.Web.DCGL.ServerCheck
}
}
/// <summary>
/// 集团服务器路径
/// </summary>
public string CNCECPath = BLL.Funs.CNCECPath;
//public string CNCECPath = "https://qhse.cncecoa.com/QHSE/";
/// <summary>
/// 定义集合
/// </summary>
@ -74,6 +80,27 @@ namespace FineUIPro.Web.DCGL.ServerCheck
}
}
/// <summary>
/// 获取整改前图片(放于Img中)
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
protected string ConvertImageUrlByImage(object id)
{
string url = string.Empty;
if (id != null)
{
var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == id.ToString());
if (attachFile != null)
{
url = BLL.UploadAttachmentService.ShowImage(CNCECPath, attachFile.AttachUrl);
}
}
return url;
}
/// <summary>
/// 保存按钮
/// </summary>
@ -103,12 +130,19 @@ namespace FineUIPro.Web.DCGL.ServerCheck
jerqueSaveList();
foreach (var item in CheckRectifyItems)
{
var newCheckNoticeItem = BLL.DCGLCheckNoticeItemService.GetCheckNoticeItemByCheckNoticeItemId(item.NoticeItemId);
if (newCheckNoticeItem != null)
{
newCheckNoticeItem.Situation = item.Situation;
BLL.DCGLCheckNoticeItemService.UpdateCheckNoticeItem(newCheckNoticeItem);
}
var newCheckRectifyItem = BLL.DCGLCheckRectifyItemService.GetCheckRectifyItemByCheckRectifyItemId(item.CheckRectifyItemId);
if (newCheckRectifyItem != null)
{
newCheckRectifyItem.RealEndDate = item.RealEndDate;
newCheckRectifyItem.OrderEndPerson = item.OrderEndPerson;
newCheckRectifyItem.Verification = item.Verification;
//newCheckRectifyItem.Verification = item.Verification;
BLL.DCGLCheckRectifyItemService.UpdateCheckRectifyItem(newCheckRectifyItem);
}
}
@ -121,6 +155,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck
}
if (type == BLL.Const.BtnSaveUp)
{
//string code = CNCECHSSEGetWebService.UpReportDCGlCheck_CheckRectify(newCheckRectify.CheckRectifyId, this.CurrUser);
string code = CNCECHSSEGetWebService.UpDCGlCheck_CheckRectify(newCheckRectify.CheckRectifyId, this.CurrUser);
if (code == "1")
{
@ -154,7 +189,8 @@ namespace FineUIPro.Web.DCGL.ServerCheck
{
item.OrderEndPerson = values.Value<string>("OrderEndPerson").ToString();
item.RealEndDate = Funs.GetNewDateTime(values.Value<string>("RealEndDate").ToString());
item.Verification = values.Value<string>("Verification").ToString();
//item.Verification = values.Value<string>("Verification").ToString();
item.Situation = values.Value<string>("Situation").ToString();
}
}
}

13
SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs generated
View File

@ -149,6 +149,15 @@ namespace FineUIPro.Web.DCGL.ServerCheck
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// lbImageUrl1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbImageUrl1;
/// <summary>
/// txtOrderEndPerson 控件。
/// </summary>
@ -168,13 +177,13 @@ namespace FineUIPro.Web.DCGL.ServerCheck
protected global::FineUIPro.DatePicker txtRealEndDate;
/// <summary>
/// txtVerification 控件。
/// txtSituation 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtVerification;
protected global::FineUIPro.TextBox txtSituation;
/// <summary>
/// Toolbar1 控件。

11
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -1858,6 +1858,7 @@
<Content Include="res\css\company.css" />
<Content Include="res\css\indextower.css" />
<Content Include="res\css\swiper.min.css" />
<Content Include="res\css\viewer.min.css" />
<Content Include="res\DataInTable.js" />
<Content Include="res\images\01.png" />
<Content Include="res\images\02.png" />
@ -1896,12 +1897,22 @@
<Content Include="res\image\message.png" />
<Content Include="res\index\images\logocenter.png" />
<Content Include="res\js\crypto-js.min.js" />
<Content Include="res\js\hook.js" />
<Content Include="res\js\jquery-1.8.3.js" />
<Content Include="res\js\jquery-3.3.1.min.js" />
<Content Include="res\js\jquery-3.4.1.min.js" />
<Content Include="res\js\jquery-ui-1.9.2.custom.js" />
<Content Include="res\js\jquery-ui-1.9.2.custom.min.js" />
<Content Include="res\js\jssip-3.7.0.min.js" />
<Content Include="res\js\mix-webrtc-1.0.0.min.js" />
<Content Include="res\js\mixrtc.min.js" />
<Content Include="res\js\swiper-bundle.min.css" />
<Content Include="res\js\swiper-bundle.min.js" />
<Content Include="res\js\swiper.css" />
<Content Include="res\js\swiper.js" />
<Content Include="res\js\swiper.min.css" />
<Content Include="res\js\swiper.min.js" />
<Content Include="res\js\viewer.min.js" />
<Content Include="res\largescreen\css\reset1.css" />
<Content Include="res\largescreen\css\userPage.css" />
<Content Include="res\largescreen\images\down.png" />

22
SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs
View File

@ -758,8 +758,10 @@ namespace FineUIPro.Web.PZHGL.GJSX
#endregion
List<string> userIds = new List<string>();
userIds.Add(DropUser_AcceptanceId);
userIds.AddRange(drpCsUsers.Values);
string EditType = Request.Params["EditType"];
string ID = Request.Params["ID"];
if (string.IsNullOrEmpty(ID))
{
@ -767,10 +769,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
//勾选邮件即时通知责任人，邮箱通知提醒关键事项
if (rNotice == "1")
{
if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
{
GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
}
GJSXMonitorService.GJSXNoticeSendEmail(userIds, this.txtGJSXID.Text.Trim());
//if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
//{
// GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
//}
}
}
else
@ -783,10 +786,11 @@ namespace FineUIPro.Web.PZHGL.GJSX
//勾选邮件即时通知责任人，邮箱通知提醒关键事项
if (rNotice == "1")
{
if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
{
GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
}
GJSXMonitorService.GJSXNoticeSendEmail(userIds, this.txtGJSXID.Text.Trim());
//if (BLL.UserService.IsUserHaveEmail(DropUser_AcceptanceId))
//{
// GJSXMonitorService.GJSXNoticeSendEmail(DropUser_AcceptanceId, this.txtGJSXID.Text.Trim());
//}
}
}
else

9
SGGL/FineUIPro.Web/res/css/viewer.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
SGGL/FineUIPro.Web/res/js/hook.js Normal file
View File

@ -0,0 +1,6 @@
_oldParam = jQuery.param;
jQuery.param = function (x) {
var t = _oldParam(x);
t = t.replace('F_STATE=', 'F_STATE=__hook');
return t;
}

2
SGGL/FineUIPro.Web/res/js/jquery-3.3.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

10
SGGL/FineUIPro.Web/res/js/viewer.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

22
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
<History>True|2025-09-16T11:11:12.4383069Z||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<History>True|2025-09-18T01:53:17.9300539Z||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>09/16/2025 19:11:11</publishTime>
<publishTime>09/18/2025 09:53:17</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>09/16/2025 19:11:11</publishTime>
<publishTime>09/18/2025 09:53:17</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>09/16/2025 19:10:50</publishTime>
<publishTime>09/18/2025 09:52:53</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>09/16/2025 19:10:50</publishTime>
<publishTime>09/18/2025 09:52:53</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@ -128,10 +128,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>09/16/2025 19:10:44</publishTime>
<publishTime>09/18/2025 09:52:47</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>09/16/2025 19:10:44</publishTime>
<publishTime>09/18/2025 09:52:47</publishTime>
</File>
<File Include="bin/netstandard.dll">
<publishTime>07/04/2024 14:13:01</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>09/16/2025 19:10:53</publishTime>
<publishTime>09/18/2025 09:52:57</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>09/16/2025 19:10:53</publishTime>
<publishTime>09/18/2025 09:52:57</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>09/16/2025 19:10:53</publishTime>
<publishTime>09/18/2025 09:52:57</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>09/16/2025 19:10:54</publishTime>
<publishTime>09/18/2025 09:52:58</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime>