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

0510

This commit is contained in:
李超 2024-05-10 14:45:54 +08:00
parent ba518ac354
commit 98c1cad987
12 changed files with 581 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
SGGL/BLL/API/APICommonService.cs
View File

@ -88,7 +88,7 @@ namespace BLL
var tempData = new
{
access_token,
touser = getUser.OpenId,
touser = getUser.OpenId,
template_id = Const.WX_TemplateID,
page = "pages/index/index",
data = new
@ -102,11 +102,53 @@ namespace BLL
lang = "zh_CN",
};
string joson = JsonConvert.SerializeObject(tempData);
string messages= APIGetHttpService.Http(url, "POST", contenttype, null, joson);
string messages = APIGetHttpService.Http(url, "POST", contenttype, null, joson);
//// 记录
SaveSysHttpLog(getUser.UserName, url+ "$joson$" + joson , messages);
SaveSysHttpLog(getUser.UserName, url + "$joson$" + joson, messages);
return messages;
}
else if (getUser == null)
{
var person = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.PersonId == userId);
if (person != null)
{
var user = Funs.DB.Sys_User.FirstOrDefault(x => x.IdentityCard == person.IdentityCard);
if (user != null && !string.IsNullOrEmpty(user.OpenId))
{
string miniprogram_state = ConfigurationManager.AppSettings["miniprogram_state"];
if (string.IsNullOrEmpty(miniprogram_state))
{
miniprogram_state = "formal";
}
//miniprogram_state = "developer";
string contenttype = "application/json;charset=utf-8";
string url = $"https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token={access_token}";
var tempData = new
{
access_token,
touser = user.OpenId,
template_id = Const.WX_TemplateID,
page = "pages/index/index",
data = new
{
thing2 = new { value = thing2 },
name1 = new { value = name1 },
date3 = new { value = date3 }//,
//date6 = new { value = thing6 }
},
miniprogram_state,
lang = "zh_CN",
};
string joson = JsonConvert.SerializeObject(tempData);
string messages = APIGetHttpService.Http(url, "POST", contenttype, null, joson);
//// 记录
SaveSysHttpLog(user.UserName, url + "$joson$" + joson, messages);
return messages;
}
}
return "openId is null";
}
else
{
return "openId is null";

6
SGGL/FineUIPro.Web/Controls/FlowOperateControl.ascx.cs
View File

@ -438,9 +438,9 @@ namespace FineUIPro.Web.Controls
{
foreach (var itemClosed in updateNoClosedFlowOperate)
{
itemClosed.IsClosed = true;
Funs.DB.SubmitChanges();
}
itemClosed.IsClosed = true;
}
Funs.DB.SubmitChanges();
}
if (newFlowOperate.State != BLL.Const.State_2) ///未审核完成的时 增加下一步办理

120
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -2008,3 +2008,123 @@ IP地址:::1
出错时间:05/07/2024 14:24:40
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:找不到行或行已更改。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 FineUIPro.Web.Controls.FlowOperateControl.btnSaveData(String projectId, String menuId, String dataId, Boolean isClosed, String content, String url) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\Controls\FlowOperateControl.ascx.cs:行号 429
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.SaveData(String type) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 201
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.btnSubmit_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 157
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:05/09/2024 18:26:40
出错文件:http://localhost:1295/HSSE/Solution/LargerHazardEdit.aspx
IP地址:::1
操作人员:JT
出错时间:05/09/2024 18:26:40
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:找不到行或行已更改。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 FineUIPro.Web.Controls.FlowOperateControl.btnSaveData(String projectId, String menuId, String dataId, Boolean isClosed, String content, String url) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\Controls\FlowOperateControl.ascx.cs:行号 429
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.SaveData(String type) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 201
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.btnSubmit_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 157
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:05/09/2024 18:29:51
出错文件:http://localhost:1295/HSSE/Solution/LargerHazardEdit.aspx
IP地址:::1
操作人员:JT
出错时间:05/09/2024 18:29:51
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:找不到行或行已更改。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 FineUIPro.Web.Controls.FlowOperateControl.btnSaveData(String projectId, String menuId, String dataId, Boolean isClosed, String content, String url) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\Controls\FlowOperateControl.ascx.cs:行号 429
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.SaveData(String type) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 201
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.btnSubmit_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 157
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:05/09/2024 18:43:50
出错文件:http://localhost:1295/HSSE/Solution/LargerHazardEdit.aspx
IP地址:::1
操作人员:安玉春
出错时间:05/09/2024 18:43:50
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:找不到行或行已更改。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 FineUIPro.Web.Controls.FlowOperateControl.btnSaveData(String projectId, String menuId, String dataId, Boolean isClosed, String content, String url) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\Controls\FlowOperateControl.ascx.cs:行号 429
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.SaveData(String type) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 201
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.btnSubmit_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 157
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:05/09/2024 18:43:54
出错文件:http://localhost:1295/HSSE/Solution/LargerHazardEdit.aspx
IP地址:::1
操作人员:安玉春
出错时间:05/09/2024 18:43:54
错误信息开始=====>
错误类型:ChangeConflictException
错误信息:找不到行或行已更改。
错误堆栈:
在 System.Data.Linq.ChangeProcessor.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges(ConflictMode failureMode)
在 System.Data.Linq.DataContext.SubmitChanges()
在 FineUIPro.Web.Controls.FlowOperateControl.btnSaveData(String projectId, String menuId, String dataId, Boolean isClosed, String content, String url) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\Controls\FlowOperateControl.ascx.cs:行号 429
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.SaveData(String type) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 201
在 FineUIPro.Web.HSSE.Solution.LargerHazardEdit.btnSubmit_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\Solution\LargerHazardEdit.aspx.cs:行号 157
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:05/09/2024 18:44:01
出错文件:http://localhost:1295/HSSE/Solution/LargerHazardEdit.aspx
IP地址:::1
操作人员:安玉春
出错时间:05/09/2024 18:44:01

3
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx
View File

@ -1,8 +1,7 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionPlanListEdit.aspx.cs"
Inherits="FineUIPro.Web.HSSE.ActionPlan.ActionPlanListEdit" ValidateRequest="false" %>
<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl"
TagPrefix="uc1" %>
<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl" TagPrefix="uc1" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">

21
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx
View File

@ -1,6 +1,6 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LargerHazardEdit.aspx.cs" ValidateRequest="false" Inherits="FineUIPro.Web.HSSE.Solution.LargerHazardEdit" %>
<!DOCTYPE html>
<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl" TagPrefix="uc1" %>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>编辑危险性较大的工程清单</title>
@ -23,7 +23,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:RadioButtonList ID="rblIsArgument" runat="server" Label="专家论证" LabelWidth="100px" Required="true" ShowRedStar="true">
<f:RadioButtonList ID="rblIsArgument" runat="server" Label="专家论证" LabelWidth="100px" Required="true" ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="rblIsArgument_SelectedIndexChanged">
</f:RadioButtonList>
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" Label="编制时间" ID="txtRecordTime">
</f:DatePicker>
@ -41,8 +41,8 @@
<f:DropDownList ID="drpStates" runat="server" Label="状态" LabelAlign="Right" >
<%-- <f:ListItem Text="审批完成" Value="1"/>--%>
<f:ListItem Text="作业中" Value="2"/>
<f:ListItem Text="已关闭" Value="3"/>
<%-- <f:ListItem Text="已取消" Value="0"/>--%>
<f:ListItem Text="已关闭" Value="3"/>
<%--<f:ListItem Text="已取消" Value="0"/>--%>
</f:DropDownList>
</Items>
</f:FormRow>
@ -59,6 +59,16 @@
</f:HtmlEditor>
</Items>
</f:FormRow>
<f:FormRow ID="AuditFlow" Hidden="true">
<Items>
<f:ContentPanel ID="ContentPanel1" runat="server" ShowHeader="false" EnableCollapse="true"
BodyPadding="0px">
<uc1:FlowOperateControl ID="ctlAuditFlow" runat="server" />
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
@ -72,6 +82,9 @@
</f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Icon="SystemSaveNew" runat="server" ToolTip="提交" Text="提交" ValidateForms="SimpleForm1"
OnClick="btnSubmit_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose">
</f:Button>

51
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.HSSE.ActionPlan;
using System;
using System.Linq;
using System.Web;
@ -78,6 +79,7 @@ namespace FineUIPro.Web.HSSE.Solution
if (largerHazard.IsArgument == true)
{
this.rblIsArgument.SelectedValue = "True";
AuditFlow.Hidden = false;
}
else
{
@ -107,6 +109,14 @@ namespace FineUIPro.Web.HSSE.Solution
this.txtRemark.Text = HttpUtility.HtmlDecode("描述");
this.txtRecordTime.Text = string.Format("{0:yyyy-MM-dd}",DateTime.Now);
}
///初始化审核菜单
this.ctlAuditFlow.MenuId = BLL.Const.ProjectLargerHazardListMenuId;
this.ctlAuditFlow.DataId = this.HazardId;
this.ctlAuditFlow.ProjectId = this.ProjectId;
this.ctlAuditFlow.UnitId = this.CurrUser.UnitId;
this.ctlAuditFlow.drpPersonUser = Funs.DB.Sys_User.Where(x => x.UnitId == Const.UnitId_CD && x.IsExpertArgumentationIsAuditor==true).ToList();
}
}
#endregion
@ -128,7 +138,26 @@ namespace FineUIPro.Web.HSSE.Solution
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
/// <summary>
/// 提交按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSubmit_Click(object sender, EventArgs e)
{
if (this.drpHazardType.SelectedValue == BLL.Const._Null)
{
ShowNotify("请选择类型！", MessageBoxIcon.Warning);
return;
}
if (this.rblIsArgument.SelectedValue == "True" && this.ctlAuditFlow.NextStep == BLL.Const.State_1 && this.ctlAuditFlow.NextPerson == BLL.Const._Null)
{
Alert.ShowInTop("请选择下一步办理人！", MessageBoxIcon.Warning);
return;
}
this.SaveData(BLL.Const.BtnSubmit);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
/// <summary>
/// 保存数据
/// </summary>
@ -164,8 +193,15 @@ namespace FineUIPro.Web.HSSE.Solution
BLL.LargerHazardService.AddLargerHazard(largerHazard);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnAdd);
}
////保存流程审核数据
if (this.rblIsArgument.SelectedValue == "True")
{
this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.ProjectActionPlanListMenuId, this.HazardId, (type == BLL.Const.BtnSubmit ? true : false), largerHazard.HazardCode, "../ActionPlan/ActionPlanListView.aspx?ActionPlanListId={0}");
}
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.ProjectInformation);
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.DangerousProject);
}
#region 附件上传
@ -204,5 +240,18 @@ namespace FineUIPro.Web.HSSE.Solution
BLL.LargerHazardService.AddLargerHazard(largerHazard);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId,BLL.Const.ProjectLargerHazardListMenuId,BLL.Const.BtnAdd);
}
protected void rblIsArgument_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.rblIsArgument.SelectedValue == "True")
{
AuditFlow.Hidden = false;
}
else
{
AuditFlow.Hidden = true;
}
}
}
}

88
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.Solution {
public partial class LargerHazardEdit {
namespace FineUIPro.Web.HSSE.Solution
{
public partial class LargerHazardEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtLargerHazardCode 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtLargerHazardCode;
/// <summary>
/// drpHazardType 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpHazardType;
/// <summary>
/// txtExpectedTime 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtExpectedTime;
/// <summary>
/// rblIsArgument 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsArgument;
/// <summary>
/// txtRecordTime 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtRecordTime;
/// <summary>
/// txtAddress 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAddress;
/// <summary>
/// rblIsSuperLargerHazard 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblIsSuperLargerHazard;
/// <summary>
/// txtTrainPersonNum 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtTrainPersonNum;
/// <summary>
/// drpStates 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtDescriptions;
/// <summary>
/// txtRemark 控件。
/// </summary>
@ -137,7 +139,34 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HtmlEditor txtRemark;
/// <summary>
/// AuditFlow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow AuditFlow;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// ctlAuditFlow 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -146,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// lbTemp 控件。
/// </summary>
@ -155,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbTemp;
/// <summary>
/// btnAttachUrl 控件。
/// </summary>
@ -164,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAttachUrl;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -173,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -182,7 +211,16 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// btnClose 控件。
/// </summary>
@ -191,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Solution {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// WindowAtt 控件。
/// </summary>

13
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx
View File

@ -97,9 +97,18 @@
FieldType="String" HeaderText="专家论证" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="StatesStr" DataField="StatesStr"
SortField="StatesStr" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
TextAlign="Left">
SortField="StatesStr" FieldType="String" HeaderText="状态" HeaderTextAlign="Center"
TextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="StatesName" Width="100px" HeaderText="审核状态" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="labStatesName" runat="server" Text='<%# ConvertState(Eval("HazardId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

17
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.cs
View File

@ -312,5 +312,22 @@ namespace FineUIPro.Web.HSSE.Solution
string id = Grid1.SelectedRowID;
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("LargerHazardView.aspx?HazardId={0}", id, "查看 - ")));
}
protected string ConvertState(object state)
{
if (state != null)
{
var s = Funs.DB.Sys_FlowOperate.FirstOrDefault(x => x.DataId == state.ToString() && x.IsClosed == false);
if (s != null)
{
var user = Funs.DB.Sys_User.FirstOrDefault(x => x.UserId == s.OperaterId);
if (user != null)
{
return "待[" + user.UserName + "]审核";
}
}
}
return "";
}
}
}

9
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx.designer.cs generated
View File

@ -176,6 +176,15 @@ namespace FineUIPro.Web.HSSE.Solution
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// labStatesName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labStatesName;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>

219
SGGL/Model/Model.cs
View File

@ -22,7 +22,7 @@ namespace Model
using System;
public partial class SGGLDB : System.Data.Linq.DataContext
public partial class SGGLDB: System.Data.Linq.DataContext
{
private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource();
@ -1115,6 +1115,9 @@ namespace Model
partial void InsertHSSE_MonthReportItem(HSSE_MonthReportItem instance);
partial void UpdateHSSE_MonthReportItem(HSSE_MonthReportItem instance);
partial void DeleteHSSE_MonthReportItem(HSSE_MonthReportItem instance);
partial void InsertHSSE_PerfomanceContent(HSSE_PerfomanceContent instance);
partial void UpdateHSSE_PerfomanceContent(HSSE_PerfomanceContent instance);
partial void DeleteHSSE_PerfomanceContent(HSSE_PerfomanceContent instance);
partial void InsertHSSE_Weather(HSSE_Weather instance);
partial void UpdateHSSE_Weather(HSSE_Weather instance);
partial void DeleteHSSE_Weather(HSSE_Weather instance);
@ -5366,6 +5369,14 @@ namespace Model
}
}
public System.Data.Linq.Table<HSSE_PerfomanceContent> HSSE_PerfomanceContent
{
get
{
return this.GetTable<HSSE_PerfomanceContent>();
}
}
public System.Data.Linq.Table<HSSE_Weather> HSSE_Weather
{
get
@ -176981,6 +176992,212 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HSSE_PerfomanceContent")]
public partial class HSSE_PerfomanceContent : INotifyPropertyChanging, INotifyPropertyChanged
{
private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
private string _PerfomanceId;
private string _PerfomanceContent;
private string _PerfomanceValue;
private System.Nullable<int> _PerfomanceType;
private string _ProjectId;
private System.Nullable<int> _ShowIndex;
private string _ReMark;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
partial void OnCreated();
partial void OnPerfomanceIdChanging(string value);
partial void OnPerfomanceIdChanged();
partial void OnPerfomanceContentChanging(string value);
partial void OnPerfomanceContentChanged();
partial void OnPerfomanceValueChanging(string value);
partial void OnPerfomanceValueChanged();
partial void OnPerfomanceTypeChanging(System.Nullable<int> value);
partial void OnPerfomanceTypeChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnShowIndexChanging(System.Nullable<int> value);
partial void OnShowIndexChanged();
partial void OnReMarkChanging(string value);
partial void OnReMarkChanged();
#endregion
public HSSE_PerfomanceContent()
{
OnCreated();
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PerfomanceId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
public string PerfomanceId
{
get
{
return this._PerfomanceId;
}
set
{
if ((this._PerfomanceId != value))
{
this.OnPerfomanceIdChanging(value);
this.SendPropertyChanging();
this._PerfomanceId = value;
this.SendPropertyChanged("PerfomanceId");
this.OnPerfomanceIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PerfomanceContent", DbType="NVarChar(50)")]
public string PerfomanceContent
{
get
{
return this._PerfomanceContent;
}
set
{
if ((this._PerfomanceContent != value))
{
this.OnPerfomanceContentChanging(value);
this.SendPropertyChanging();
this._PerfomanceContent = value;
this.SendPropertyChanged("PerfomanceContent");
this.OnPerfomanceContentChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PerfomanceValue", DbType="NVarChar(50)")]
public string PerfomanceValue
{
get
{
return this._PerfomanceValue;
}
set
{
if ((this._PerfomanceValue != value))
{
this.OnPerfomanceValueChanging(value);
this.SendPropertyChanging();
this._PerfomanceValue = value;
this.SendPropertyChanged("PerfomanceValue");
this.OnPerfomanceValueChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PerfomanceType", DbType="Int")]
public System.Nullable<int> PerfomanceType
{
get
{
return this._PerfomanceType;
}
set
{
if ((this._PerfomanceType != value))
{
this.OnPerfomanceTypeChanging(value);
this.SendPropertyChanging();
this._PerfomanceType = value;
this.SendPropertyChanged("PerfomanceType");
this.OnPerfomanceTypeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ShowIndex", DbType="Int")]
public System.Nullable<int> ShowIndex
{
get
{
return this._ShowIndex;
}
set
{
if ((this._ShowIndex != value))
{
this.OnShowIndexChanging(value);
this.SendPropertyChanging();
this._ShowIndex = value;
this.SendPropertyChanged("ShowIndex");
this.OnShowIndexChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReMark", DbType="NVarChar(500)")]
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();
}
}
}
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.HSSE_Weather")]
public partial class HSSE_Weather : INotifyPropertyChanging, INotifyPropertyChanged
{

30
SGGL/WebAPI/Controllers/ToDoItemController.cs
View File

@ -1,5 +1,8 @@
using BLL;
using Aspose.Words.Lists;
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Http;
@ -21,8 +24,29 @@ namespace WebAPI.Controllers
var responeData = new Model.ResponeData();
try
{
var getDataList = Funs.DB.Sp_APP_GetToDoItems(projectId, userId).ToList();
responeData.data = new { getDataList.Count, getDataList };
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var user = db.Sys_User.FirstOrDefault(x => x.UserId == userId);
var person = db.SitePerson_Person.FirstOrDefault(x => x.ProjectId == projectId && x.IdentityCard == user.IdentityCard);
var getDataList1 = db.Sp_APP_GetToDoItems(projectId, userId).ToList();
var getDataList2 = db.Sp_APP_GetToDoItems(projectId, person.PersonId).ToList();
List<ToDoItem> getDataList = new List<ToDoItem>();
HashSet<string> ids = new HashSet<string>();
foreach (var item in getDataList1)
{
getDataList.Add(item);
ids.Add(item.DataId);
}
foreach (var item in getDataList2)
{
if (!ids.Contains(item.DataId))
{
getDataList.Add(item);
}
}
responeData.data = new { getDataList.Count, getDataList };
}
}
catch (Exception ex)
{