This commit is contained in:
2025-02-25 16:41:06 +08:00
parent ca8be515a9
commit b7c8a426bf
87 changed files with 5778 additions and 1835 deletions
@@ -64,7 +64,7 @@ namespace FineUIPro.Web.Person.EduTrain
Users.UserName AS DesignerName,WorkPostNames"
+ @" FROM dbo.Training_Plan AS Plans "
+ @" LEFT JOIN Sys_User AS Users ON Users.UserId = Plans.DesignerId "
+ @" WHERE (Plans.ProjectId is null or Plans.ProjectId='') ";
+ @" WHERE Plans.ProjectId is null ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
@@ -239,7 +239,7 @@ namespace FineUIPro.Web.Person.EduTrain
string name = string.Empty;
if (workPostIds != null)
{
name = BLL.WorkPostService.getDepartNamesByIds(workPostIds);
name = BLL.DepartService.getDepartNamesByIds(workPostIds);
}
return name;
@@ -123,7 +123,7 @@
<f:MenuButton ID="btnMenuView" OnClick="btnMenuView_Click" EnablePostBack="true"
runat="server" Text="查看" Icon="Find">
</f:MenuButton>
<f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server" Hidden="true"
<f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
Text="导出" Icon="Printer" OnClick="btnPrint_Click" EnableAjax="false" DisableControlBeforePostBack="false">
</f:MenuButton>
<%--<f:MenuButton ID="btnFile" OnClick="btnMenuFile_Click" EnablePostBack="true"
@@ -56,7 +56,7 @@ namespace FineUIPro.Web.Person.EduTrain
LEFT JOIN dbo.Training_TestTraining AS Training ON Training.TrainingId = TestRecord.TestType
LEFT JOIN dbo.Sys_User AS Person ON Person.UserId = TestRecord.TestManId
LEFT JOIN dbo.Base_Unit AS Unit ON Person.UnitId=Unit.UnitId
WHERE (isFiled IS NULL OR isFiled = 0) and (TestRecord.ProjectId is null or TestRecord.ProjectId='' ) ";
WHERE (isFiled IS NULL OR isFiled = 0) and TestRecord.ProjectId is null ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtName.Text.Trim()))
{
@@ -47,7 +47,7 @@ namespace FineUIPro.Web.Person.EduTrain
{
if (!IsPostBack)
{
this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(CommonService.GetThisUnitId()) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
this.lbTestType.Text = "培训试题";
this.TestRecordId = Request.Params["TestRecordId"];
this.Type = Request.Params["Type"];
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.Person.EduTrain
{
personInfo += "项目:" + ProjectService.GetProjectNameByProjectId(testRecord.ProjectId) + " ";
}
else if (testRecord.UnitId == CommonService.GetThisUnitId())
else if (testRecord.UnitId == Const.UnitId_TCC)
{
personInfo += "部门:" + DepartService.getDepartNameById(testRecord.DepartId) + " ";
}
@@ -1,5 +1,4 @@
using BLL;
using BLL;
using System;
using System.Collections;
using System.Collections.Generic;