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

20220424 清日志、清考勤定时器，考试生成试卷接口方法修改

Browse Source
This commit is contained in:
杨红卫
2022-04-24 18:29:54 +08:00
parent 54fc77e7c1
commit 93df6c189c
21 changed files with 412 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/FileUpload/QRCodeFile/20220702110716845.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 38 KiB

SGGL/FineUIPro.Web/FileUpload/QRCodeFile/20220702110726069.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 37 KiB

SGGL/FineUIPro.Web/FileUpload/QRCodeFile/20220702110734021.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

SGGL/FineUIPro.Web/FileUpload/QRCodeFile/20221629111627216.jpg
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 36 KiB

SGGL/FineUIPro.Web/Global.asax.cs
+21 -11
View File
@@ -28,7 +28,6 @@
Funs.SGGLUrl = ConfigurationManager.AppSettings["SGGLUrl"];
Funs.RealNameApiUrl = ConfigurationManager.AppSettings["RealNameApiUrl"];
Funs.ControlApiUrl = ConfigurationManager.AppSettings["ControlApiUrl"];
sysUser = UserService.GetUserByUserId(Const.sysglyId);
}
catch (Exception ex)
@@ -64,16 +63,27 @@
{
ErrLogInfo.WriteLog("通用定时器启动失败!", ex);
}
////员工考核定时器
//try
//{
// BLL.MonitorService.StartPersonQuarterCheck();
// BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "员工考核定时器启动成功！");
//}
//catch (Exception ex)
//{
// ErrLogInfo.WriteLog("员工考核定时器启动失败!", ex);
//}
///实名制日志清理定时器
try
{
BLL.RealNameMonitorService.StartMonitorDeletePushLog();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "实名制日志清理定时器启动成功！");
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("实名制日志清理定时器启动失败!", ex);
}
///考勤记录清理定时器
try
{
BLL.RealNameMonitorService.StartMonitorCleanAttendance();
BLL.LogService.AddSys_Log(sysUser, string.Empty, string.Empty, string.Empty, "考勤去重定时器启动成功！");
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("实名制日志清理定时器启动失败!", ex);
}
////从集团获取数据定时器
try
{
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx
+17 -10
View File
@@ -30,20 +30,23 @@
<Tabs>
<f:Tab ID="Tab1" Title="基础信息" BodyPadding="5px" Layout="VBox" IconFont="Bookmark" runat="server">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server"
OnClick="btnSave_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Icon="SystemSave" runat="server"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnCustomQuery" Text="自定义查询" Icon="SystemSearch" runat="server"
OnClick="btnCustomQuery_Click" Hidden="true">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Form ID="SimpleForm1" LabelAlign="Right" MessageTarget="Qtip" RedStarPosition="BeforeText"
LabelWidth="90px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" runat="server"
AutoScroll="false">
<Items>
<f:Panel ID="Panel3" runat="server" ShowBorder="false" ShowHeader="false" Layout="HBox"
BoxConfigAlign="StretchMax">
@@ -123,6 +126,10 @@
</f:TabStrip>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="查询" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="1024px" Maximized="true"
Height="620px">
</f:Window>
</form>
</body>
</html>
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.cs
+9
View File
@@ -38,6 +38,10 @@ namespace FineUIPro.Web.Personal
{
/// Tab1加载页面方法
this.Tab1LoadData();
if (this.CurrUser.UserId == Const.hfnbdId)
{
this.btnCustomQuery.Hidden = false;
}
}
}
@@ -143,5 +147,10 @@ namespace FineUIPro.Web.Personal
Alert.ShowInParent("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
protected void btnCustomQuery_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../SysManage/CustomQuery.aspx"), "查询"));
}
}
}
SGGL/FineUIPro.Web/Personal/PersonalInfo.aspx.designer.cs
Generated
+18
View File
@@ -75,6 +75,15 @@ namespace FineUIPro.Web.Personal {
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnCustomQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCustomQuery;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -290,5 +299,14 @@ namespace FineUIPro.Web.Personal {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm2;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}
SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs
+2 -1
View File
@@ -113,7 +113,7 @@ namespace FineUIPro.Web.ProjectData
{
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
BLL.LogService.AddSys_Log(this.CurrUser, "删除项目用户！", null, BLL.Const.ProjectUserMenuId, BLL.Const.BtnDelete);
var projectUser = BLL.ProjectUserService.GetProjectUserById(Grid1.DataKeys[rowIndex][0].ToString());
if (projectUser != null)
{
@@ -123,6 +123,7 @@ namespace FineUIPro.Web.ProjectData
BLL.RoleItemService.DeleteRoleItem(roleItem.RoleItemId);
}
}
BLL.LogService.AddSys_Log(this.CurrUser, "删除项目用户！", projectUser.UserId, BLL.Const.ProjectUserMenuId, BLL.Const.BtnDelete);
BLL.ProjectUserService.DeleteProjectUserById(Grid1.DataKeys[rowIndex][0].ToString());
}