20230825部门人员加岗位查询、上报集团报表工时从月报取当月工时

SGGL/BLL/Person/Person_PersonsService.cs

@@ -46,7 +46,7 @@ namespace BLL
         /// <param name="personType">人员类型</param>
         /// <param name="Grid1"></param>
         /// <returns></returns>
-        public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType,string account, Grid Grid1)
+        public static IEnumerable getListData(string unitId, string departId, string projetcId, string name, string idCard, string isPost, string personType, string account,string[] workPostIds, Grid Grid1)
         {
             IQueryable<Model.Person_Persons> getDataList = getDataLists.OrderBy(x => x.UnitId).ThenBy(x => x.DepartId);
             if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
@@ -59,7 +59,8 @@ namespace BLL
             }
             if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
             {
-                var idLists=(from x in db.SitePerson_PersonItem where x.ProjectId == projetcId && !x.OutTime.HasValue
+                var idLists = (from x in db.SitePerson_PersonItem
+                               where x.ProjectId == projetcId && !x.OutTime.HasValue
                                select x.PersonId).Distinct().ToList();
                 getDataList = getDataList.Where(x => idLists.Contains(x.PersonId));
             }
@@ -93,6 +94,10 @@ namespace BLL
                 }
             }
 
+            if (workPostIds.Count()  > 0)
+            {
+                getDataList = getDataList.Where(e => workPostIds.Contains(e.WorkPostId));
+            }
             count = getDataList.Count();
             if (count == 0)
             {

SGGL/FineUIPro.Web/ErrLog.txt

@@ -0,0 +1,41 @@
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.ExecuteReader()
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
+   在 FineUIPro.Web.common.main.getSitePerson() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 90
+   在 FineUIPro.Web.common.main.Page_Load(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\common\main.aspx.cs:行号 20
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+----错误类型:Win32Exception
+----错误信息:
+----等待的操作过时。
+----错误堆栈:
+    出错时间:08/25/2023 15:46:55
+出错文件:http://localhost:8797/common/main.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:08/25/2023 15:46:55
+

SGGL/FineUIPro.Web/Person/CompanyPerson.aspx.cs

@@ -39,7 +39,7 @@ namespace FineUIPro.Web.Person
         private void BindGrid()
         {
             var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
-                this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, Grid1);
+                this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null,null, Grid1);
             Grid1.RecordCount = Person_PersonsService.count;
             Grid1.DataSource = getData;
             Grid1.DataBind();

SGGL/FineUIPro.Web/Person/DepartPerson.aspx

@@ -38,6 +38,9 @@
                                 </f:DropDownList>
                                 <f:DropDownList runat="server" ID="drpPersonType" EnableEdit="true"
                                     LabelAlign="Right" EmptyText="请选择员工类别" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
+                                </f:DropDownList>
+                                 <f:DropDownList runat="server" ID="drpWorkPost" EnableEdit="true" EnableMultiSelect="true" EnableCheckBoxSelect="true"
+                                    LabelAlign="Right" EmptyText="请选择岗位" AutoPostBack="true" OnSelectedIndexChanged="btSearch_Click">
                                 </f:DropDownList>
                                 <f:ToolbarFill runat="server">
                                 </f:ToolbarFill>

SGGL/FineUIPro.Web/Person/DepartPerson.aspx.cs

@@ -28,6 +28,9 @@ namespace FineUIPro.Web.Person
                 this.drpIsPost.SelectedValue = Const._True;
                 DropListService.InitConstDropDownList(this.drpPersonType, DropListService.Group_PersonType, false);
                 Funs.FineUIPleaseSelect(drpPersonType, "按员工类别查询");
+                
+                WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, false);
+                Funs.FineUIPleaseSelect(drpWorkPost, "按岗位查询");
                 // 绑定表格
                 this.BindGrid();
 
@@ -100,8 +103,9 @@ namespace FineUIPro.Web.Person
         /// </summary>
         private void BindGrid()
         {
+            string[] workPostIds= this.drpWorkPost.SelectedValueArray.Where(x => x != Const._Null).ToArray();
             var getData = Person_PersonsService.getListData(Const.UnitId_SEDIN, Const.Depart_constructionId, this.drpProject.SelectedValue,
-              this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, Grid1);
+              this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, null, workPostIds, Grid1);
             Grid1.RecordCount = Person_PersonsService.count;
             Grid1.DataSource = getData;
             Grid1.DataBind();

SGGL/FineUIPro.Web/Person/DepartPerson.aspx.designer.cs

@@ -104,6 +104,15 @@ namespace FineUIPro.Web.Person
         /// </remarks>
         protected global::FineUIPro.DropDownList drpPersonType;
 
+        /// <summary>
+        /// drpWorkPost 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpWorkPost;
+
         /// <summary>
         /// btSearch 控件。
         /// </summary>

SGGL/FineUIPro.Web/Person/PersonLib.aspx.cs

@@ -43,7 +43,7 @@ namespace FineUIPro.Web.Person
         private void BindGrid()
         {
             var getData = Person_PersonsService.getListData(this.drpUnit.SelectedValue, this.drpDepart.SelectedValue, this.drpProject.SelectedValue,
-                this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, this.txtAccount.Text.Trim(), Grid1);
+                this.txtPersonName.Text.Trim(), this.txtIdCard.Text.Trim(), this.drpIsPost.SelectedValue, this.drpPersonType.SelectedValue, this.txtAccount.Text.Trim(),null, Grid1);
             Grid1.RecordCount = Person_PersonsService.count;
             Grid1.DataSource = getData;
             Grid1.DataBind();

SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs

@@ -1,5 +1,6 @@
 using BLL;
 using FineUIPro.Web.BaseInfo;
+using FineUIPro.Web.DataShow;
 using FineUIPro.Web.InformationProject;
 using Model;
 using Newtonsoft.Json.Linq;
@@ -931,6 +932,12 @@ namespace FineUIPro.Web.ZHGL.Information
                 item.ContractorNum = getSitePersons.Where(x => x.UnitId != Const.UnitId_SEDIN).Count(); 
                 item.SumPersonNum = getSitePersons.Count();
                 item.TotalWorkNum = 0;
+                var getInfo = APISeDinMonthReportService.getSeDinMonthReport2ById(p.ProjectId, year + "-" + months);
+                if (getInfo != null)
+                {
+                    item.TotalWorkNum = Math.Round(getInfo.MonthWorkTime / 10000 ?? 0, 4);
+                }
+                
                 item.SeriousInjuriesNum = 0;
                 item.SeriousInjuriesPersonNum = 0;
                 item.SeriousInjuriesLossHour = 0;