优化

DataBase/版本日志/GetFileName.sql

@@ -0,0 +1,42 @@
+USE [SGGLDB_XJYJ]
+GO
+
+/****** Object:  UserDefinedFunction [dbo].[GetFileName]    Script Date: 2025-3-5 18:28:21 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+
+-- =============================================
+-- Author:        Paul Griffin
+-- Create date:   18 January 2015
+-- Description:   Returns a filename with extension
+--                from a full path:
+--                    D:\Temp\Resources\Images\My.Picture.jpg
+--                ==> My.Picture.jpg
+-- =============================================
+ALTER FUNCTION [dbo].[GetFileName]
+(
+    @Path NVARCHAR(MAX)
+)
+RETURNS NVARCHAR(MAX)
+AS
+BEGIN
+    DECLARE @FileName NVARCHAR(MAX)
+    DECLARE @ReversedPath NVARCHAR(MAX)
+	
+	SET @Path=REPLACE(@Path,'/','\');
+    SET @ReversedPath = REVERSE(@Path)
+    
+    if CHARINDEX('\', @ReversedPath)>0
+    
+	SELECT @FileName = RIGHT(@Path, CHARINDEX('\', @ReversedPath)-1)
+
+	RETURN @FileName
+  
+END
+GO
+
+

SGGL/BLL/API/APIBaseInfoService.cs

@@ -456,6 +456,13 @@ namespace BLL
                 return getDataLists;
             }
         }
+
+        /// <summary>
+        /// 获取职务工种list
+        /// </summary>
+        /// <param name="projectId"></param>
+        /// <param name="strParam"></param>
+        /// <returns></returns>
         public static List<Model.BaseInfoItem> getWorkPost(string projectId,string strParam)
         {
             List<Model.BaseInfoItem> res = new List<Model.BaseInfoItem>();
@@ -463,7 +470,7 @@ namespace BLL
             {
                 var getDataLists = (from x in db.Base_WorkPost
                                     where strParam == null || x.WorkPostName.Contains(strParam)
-                                    orderby x.WorkPostName
+                                    orderby x.WorkPostCode
                                     select new Model.BaseInfoItem { BaseInfoId = x.WorkPostId, BaseInfoCode = x.WorkPostCode, BaseInfoName = x.WorkPostName }).ToList();
                 if (!string.IsNullOrEmpty(projectId))
                 {

SGGL/BLL/BaseInfo/WorkPostService.cs

@@ -157,6 +157,35 @@ namespace BLL
             }
         }
 
+        /// <summary>
+        ///  表下拉框
+        /// </summary>
+        /// <param name="dropName">下拉框名字</param>
+        /// <param name="projectId">项目id</param>
+        /// <param name="isShowPlease">是否显示请选择</param>
+        public static void InitWorkPostByProjectIdDropDownList(FineUIPro.DropDownList dropName, string projectId, bool isShowPlease)
+        {
+            List<string> postIds = new List<string>();
+            if (!string.IsNullOrWhiteSpace(projectId))
+            {
+                postIds = (from u in Funs.DB.SitePerson_Person where u.ProjectId == projectId select u.WorkPostId).Distinct().ToList();
+            }
+            else
+            {
+                postIds = (from u in Funs.DB.SitePerson_Person select u.WorkPostId).Distinct().ToList();
+            }
+            var workPost = (from x in Funs.DB.Base_WorkPost where postIds.Contains(x.WorkPostId) orderby x.WorkPostCode select x).ToList();
+
+            dropName.DataValueField = "WorkPostId";
+            dropName.DataTextField = "WorkPostName";
+            dropName.DataSource = workPost;
+            dropName.DataBind();
+            if (isShowPlease)
+            {
+                Funs.FineUIPleaseSelect(dropName);
+            }
+        }
+
         /// <summary>
         ///  表下拉框
         /// </summary>

SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx

@@ -30,7 +30,7 @@
                         </f:Toolbar>
                         <f:Tree ID="trCompanyTraining" EnableCollapse="true" ShowHeader="true" Title="公司教材库" MinHeight="400px"
                             OnNodeCommand="trCompanyTraining_NodeCommand" AutoLeafIdentification="true" runat="server"
-                        EnableTextSelection="True" >
+                            EnableTextSelection="True">
                         </f:Tree>
                     </Items>
                 </f:Panel>
@@ -42,11 +42,14 @@
                             runat="server" BoxFlex="1" DataKeyNames="CompanyTrainingItemIdNum" DataIDField="CompanyTrainingItemIdNum"
                             AllowSorting="true" SortField="CompanyTrainingItemCode" OnRowCommand="Grid1_RowCommand"
                             SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true"
-                        PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
+                            PageSize="20" OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
                             OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True" EnableColumnLines="true">
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar3" Position="Top" runat="server">
                                     <Items>
+                                        <f:DropDownList ID="drpWorkPost" runat="server" Label="适用岗位" AutoSelectFirstItem="true" AutoPostBack="true" EnableEdit="true" OnSelectedIndexChanged="drp_SelectedIndexChanged"
+                                            LabelAlign="Right" LabelWidth="80px" Width="300px">
+                                        </f:DropDownList>
                                         <f:TextBox ID="txtCompanyTrainingItemCode" runat="server" Label="编号" EmptyText="输入查询教材编号"
                                             AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
                                             LabelAlign="Right">
@@ -73,7 +76,7 @@
                                     <asp:Label ID="lbNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                                 </ItemTemplate>
                             </f:TemplateField>--%>
-                            <f:TemplateField Width="120px" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Left"
+                                <f:TemplateField Width="120px" HeaderText="编号" HeaderTextAlign="Center" TextAlign="Center"
                                     SortField="CompanyTrainingItemCode" ColumnID="tfCompanyTrainingItemCode">
                                     <ItemTemplate>
                                         <asp:Label ID="lbCompanyTrainingItemCode" runat="server" Text='<%# Bind("CompanyTrainingItemCode") %>'
@@ -97,7 +100,7 @@
                                     </asp:Label>
                                 </ItemTemplate>
                             </f:TemplateField>--%>
-                            <f:TemplateField Width="100px" HeaderText="整理时间" HeaderTextAlign="Center" TextAlign="Left" ColumnID="tfCompileDate"
+                                <f:TemplateField Width="100px" HeaderText="整理时间" HeaderTextAlign="Center" TextAlign="Center" ColumnID="tfCompileDate"
                                     SortField="CompileDate">
                                     <ItemTemplate>
                                         <asp:Label ID="lbCompileDate" runat="server" Text='<%# Bind("CompileDate","{0:yyyy-MM-dd}") %>'
@@ -105,7 +108,8 @@
                                     </ItemTemplate>
                                 </f:TemplateField>
                                 <f:LinkButtonField ColumnID="AttachUrlName" DataTextField="AttachUrlName" DataToolTipField="AttachUrlName" HeaderText="附件"
-                                        CommandName="Attach" EnableAjax="false"  HeaderTextAlign="Center" Width="300px" ></f:LinkButtonField>
+                                    CommandName="Attach" EnableAjax="false" HeaderTextAlign="Center" Width="120px">
+                                </f:LinkButtonField>
                                 <f:BoundField runat="server" Hidden="true" ColumnID="hdUrl" DataField="AttachUrl"></f:BoundField>
                             </Columns>
                             <Listeners>

SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx.cs

@@ -25,6 +25,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
             {
                 Funs.DropDownPageSize(this.ddlPageSize);
                 this.GetButtonPower();
+                WorkPostService.InitWorkPostDropDownList(drpWorkPost, true);
                 InitTreeMenu();
             }
         }
@@ -172,6 +173,21 @@ namespace FineUIPro.Web.HSSE.EduTrain
         {
             BindGrid();
         }
+
+        #endregion
+
+        #region 下拉触发事件
+
+        /// <summary>
+        /// 适用岗位下拉触发事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drp_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.BindGrid();
+        }
+
         #endregion
 
         #region 绑定数据
@@ -206,6 +222,11 @@ namespace FineUIPro.Web.HSSE.EduTrain
                     strSql += " AND CompanyTrainingItemName LIKE @CompanyTrainingItemName";
                     listStr.Add(new SqlParameter("@CompanyTrainingItemName", "%" + this.txtCompanyTrainingItemName.Text.Trim() + "%"));
                 }
+                if (!string.IsNullOrEmpty(this.drpWorkPost.SelectedValue) && this.drpWorkPost.SelectedValue != Const._Null)
+                {
+                    strSql += " AND (WorkPostIds IS NULL OR WorkPostIds LIKE @WorkPostId)";
+                    listStr.Add(new SqlParameter("@WorkPostId", "%" + this.drpWorkPost.SelectedValue + "%"));
+                }
                 SqlParameter[] parameter = listStr.ToArray();
                 DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -507,7 +528,7 @@ namespace FineUIPro.Web.HSSE.EduTrain
                     if (Path.GetExtension(savedName) == ".mp4" || Path.GetExtension(savedName).ToLower() == ".mp4" || Path.GetExtension(savedName) == ".m4v")
                     {
                         string mpUrl = HttpUtility.UrlEncode(attUrl.Replace('\\', '/'));
-                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/player.aspx?url={0}", attUrl.Replace('\\', '/'), "播放 - "),"播放视频",700,560));
+                        PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("~/AttachFile/player.aspx?url={0}", attUrl.Replace('\\', '/'), "播放 - "), "播放视频", 700, 560));
                     }
                     else
                     {

SGGL/FineUIPro.Web/HSSE/EduTrain/CompanyTraining.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.EduTrain {
+namespace FineUIPro.Web.HSSE.EduTrain
+{
 
 
-    public partial class CompanyTraining {
+    public partial class CompanyTraining
+    {
 
         /// <summary>
         /// form1 控件。
@@ -120,6 +122,15 @@ namespace FineUIPro.Web.HSSE.EduTrain {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
 
+        /// <summary>
+        /// drpWorkPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWorkPost;
+
         /// <summary>
         /// txtCompanyTrainingItemCode 控件。
         /// </summary>

SGGL/FineUIPro.Web/HSSE/EduTrain/Plan.aspx.cs

@@ -1,4 +1,5 @@
 using BLL;
+using FineUIPro.Web.BaseInfo;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -43,11 +44,12 @@ namespace FineUIPro.Web.HSSE.EduTrain
         {
             UnitService.InitUnitByProjectIdUnitTypeDropDownList1(drpUnit, this.CurrUser.LoginProjectId, false);
             TrainTypeService.InitTrainTypeDropDownList(drpTrainType, true);
-            var data = APIBaseInfoService.getWorkPost(CurrUser.ProjectId, null);
-            this.drpWorkPost.DataValueField = "BaseInfoId";
-            this.drpWorkPost.DataTextField = "BaseInfoName";
-            this.drpWorkPost.DataSource = data;
-            this.drpWorkPost.DataBind();
+            WorkPostService.InitWorkPostByProjectIdDropDownList(drpWorkPost, this.CurrUser.LoginProjectId, false);
+            //var data = APIBaseInfoService.getWorkPost(CurrUser.ProjectId, null);
+            //this.drpWorkPost.DataValueField = "BaseInfoId";
+            //this.drpWorkPost.DataTextField = "BaseInfoName";
+            //this.drpWorkPost.DataSource = data;
+            //this.drpWorkPost.DataBind();
             //Funs.FineUIPleaseSelect(drpWorkPost);
         }
 

SGGL/FineUIPro.Web/HSSE/EduTrain/PlanEdit.aspx.cs

@@ -120,15 +120,16 @@ namespace FineUIPro.Web.HSSE.EduTrain
             TrainTypeService.InitTrainTypeDropDownList(drpTrainType, true);
             TrainLevelService.InitTrainLevelDropDownList(drpTrainLevel, true);
             UnitService.InitUnitByProjectIdUnitTypeDropDownList1(dpUnit, this.CurrUser.LoginProjectId, false);
-            var postIds = (from u in Funs.DB.SitePerson_Person
-                           where u.ProjectId == CurrUser.LoginProjectId
-                           select u.WorkPostId).Distinct();
+            WorkPostService.InitWorkPostByProjectIdDropDownList(dpWorkPost, this.CurrUser.LoginProjectId, false);
+            //var postIds = (from u in Funs.DB.SitePerson_Person
+            //               where u.ProjectId == CurrUser.LoginProjectId
+            //               select u.WorkPostId).Distinct();
 
-            var workPost = (from x in Funs.DB.Base_WorkPost where postIds.Contains(x.WorkPostId) orderby x.WorkPostCode select x).ToList();
-            dpWorkPost.DataValueField = "WorkPostId";
-            dpWorkPost.DataTextField = "WorkPostName";
-            dpWorkPost.DataSource = workPost;
-            dpWorkPost.DataBind();
+            //var workPost = (from x in Funs.DB.Base_WorkPost where postIds.Contains(x.WorkPostId) orderby x.WorkPostCode select x).ToList();
+            //dpWorkPost.DataValueField = "WorkPostId";
+            //dpWorkPost.DataTextField = "WorkPostName";
+            //dpWorkPost.DataSource = workPost;
+            //dpWorkPost.DataBind();
             List<JQueryFeature> myList = new List<JQueryFeature>();
 
             BoundTree(myList, "0", 0);