xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

升级

Browse Source
This commit is contained in:
geh
2026-03-23 15:22:29 +08:00
parent 94584d242b
commit c38590add8
173 changed files with 19679 additions and 4413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/FineUIPro.Web/HSSE/InformationProject/PromotionalActivities.aspx.cs
+8 -1
View File
@@ -38,6 +38,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
if (!IsPostBack)
{
Funs.DropDownPageSize(this.ddlPageSize);
ActivityTypeService.InitActivityTypeDropDownList(this.drpActivityType, true);
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
@@ -88,10 +89,11 @@ namespace FineUIPro.Web.HSSE.InformationProject
return;
}
string strSql = @"SELECT PromotionalActivities.PromotionalActivitiesId,PromotionalActivities.ProjectId,CodeRecords.Code AS Code,PromotionalActivities.Title,PromotionalActivities.ActivitiesDate,PromotionalActivities.UnitNames"
+ @" ,PromotionalActivities.CompileMan,Users.UserName AS CompileManName,PromotionalActivities.CompileDate,PromotionalActivities.States "
+ @" ,PromotionalActivities.CompileMan,Users.UserName AS CompileManName,PromotionalActivities.CompileDate,PromotionalActivities.States,ActivityType.ActivityTypeName "
+ @" ,(CASE WHEN PromotionalActivities.States = " + BLL.Const.State_0 + " OR PromotionalActivities.States IS NULL THEN '待['+OperateUser.UserName+']提交' WHEN PromotionalActivities.States = " + BLL.Const.State_2 + " THEN '审核/审批完成' ELSE '待['+OperateUser.UserName+']办理' END) AS FlowOperateName"
+ @" FROM InformationProject_PromotionalActivities AS PromotionalActivities "
+ @" LEFT JOIN Sys_CodeRecords AS CodeRecords ON PromotionalActivities.PromotionalActivitiesId=CodeRecords.DataId "
+ @" LEFT JOIN Base_ActivityType AS ActivityType ON PromotionalActivities.ActivityTypeId=ActivityType.ActivityTypeId "
+ @" LEFT JOIN Sys_FlowOperate AS FlowOperate ON PromotionalActivities.PromotionalActivitiesId=FlowOperate.DataId AND FlowOperate.IsClosed <> 1"
+ @" LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId"
+ @" LEFT JOIN Sys_User AS Users ON PromotionalActivities.CompileMan=Users.UserId WHERE 1=1 ";
@@ -107,6 +109,11 @@ namespace FineUIPro.Web.HSSE.InformationProject
{
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
}
if (this.drpActivityType.SelectedValue != BLL.Const._Null)
{
strSql += " AND PromotionalActivities.ActivityTypeId = @ActType";
listStr.Add(new SqlParameter("@ActType", this.drpActivityType.SelectedValue));
}
if (!string.IsNullOrEmpty(this.txtCode.Text.Trim()))
{