From fea620424db455e82bd2488fab37c523f132096b Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Thu, 19 Oct 2023 23:19:38 +0800
Subject: [PATCH] 2023-10-19

---
 .../版本日志/SGGLDB_WH_2023-10-19.sql     | Bin 33236 -> 33902 bytes
 .../CQMSConstructSolutionApproveService.cs    |   4 +-
 .../CQMS/Solution/ConstructSolution.aspx      |   4 +-
 .../CQMS/Solution/ConstructSolutionView.aspx  |   6 +-
 SGGL/FineUIPro.Web/ErrLog.txt                 | 120 ++++++++++++++++++
 .../CQMS/CQMSConstructSolutionController.cs   |   1 +
 6 files changed, 128 insertions(+), 7 deletions(-)

diff --git a/DataBase/版本日志/SGGLDB_WH_2023-10-19.sql b/DataBase/版本日志/SGGLDB_WH_2023-10-19.sql
index 53d85d9ffd7bb9d2299ac6f10eeb4edca33948a5..334839e1e76b3d88e2e9a55aa92cde9794ebe8f6 100644
GIT binary patch
delta 369
zcmcc8%=E5<X+vK%GcN<z<lbseSs=}z!BEVQ%8&!Z$qXe73P7CCPynP2C!a6Zp3GOn
z#i%jakx_WEUzLrZBT%M*p$Mp=45(g@L2I&Om1iKTs1Df7U<OwPA0T#S2mzYq%izi2
z2ec^~sI!P61*o@(A(lZCDC5Ww3?xy-btYdd*PQH9<u*B_Mu5AVAp@*Fl|f;0e~mVy
z!esVZO@4QVAO?SiP=)}YZYPFFkXxBG8ImRoR?AP0tJ1MWb(0>N4GIjlKz&I-AE4T-
zz>vt0$B;7FyULy)%><B}*rB?BY;{&Hpb46j6KjOQp;=s`Jy{@;ZSuVuq0LUkPK=w&
H>f)FI>{nE`

delta 103
zcmaFY!E~jWX+vN2<Vn>Yyc!I}45<t`K%C4_GWmSDHhUUF5ko#h?qvTuUqJ<iM1}$&
z1c{UZ)hJBvuGgM?pjKw`jCwQHM20+ul*v=;6(_%`m15MKoG2{6Ij&fZakD^U95Vpd
CZy_uI

diff --git a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
index 1bfad9d2..a4222ead 100644
--- a/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
+++ b/SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
@@ -249,7 +249,7 @@ namespace BLL
         public static Model.Solution_CQMSConstructSolutionApprove GetThisApproveByConstructSolutionId( string constructSolutionId)
         {
             var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
-                where x.ConstructSolutionId == constructSolutionId && x.ApproveDate != null
+                where x.ConstructSolutionId == constructSolutionId && x.ApproveDate == null
                 orderby x.Order
                 select x).FirstOrDefault();
             return q;
@@ -258,7 +258,7 @@ namespace BLL
         {
             string name = "";
             var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove
-                where x.ConstructSolutionId == constructSolutionId.ToString() && x.ApproveDate != null
+                where x.ConstructSolutionId == constructSolutionId.ToString() && x.ApproveDate == null
                 orderby x.Order
                 select x).FirstOrDefault();
             if (q!=null)
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
index c1d737dd..8a96bfa1 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx
@@ -154,10 +154,10 @@
                                 <asp:Label ID="Label1" runat="server" Text='<%# BLL.CQMSConstructSolutionService.ConvertState(Eval("State")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:TemplateField ColumnID="State" Width="60px" HeaderText="当前审批人" HeaderTextAlign="Center" TextAlign="Center"
+                        <f:TemplateField ColumnID="ApprovaMan" Width="60px" HeaderText="当前审批人" HeaderTextAlign="Center" TextAlign="Center"
                                          EnableLock="true" Locked="False">
                             <ItemTemplate>
-                                <asp:Label ID="Label2" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.GetThisApproveNameByConstructSolutionId(Eval("State")) %>'></asp:Label>
+                                <asp:Label ID="Label2" runat="server" Text='<%# BLL.CQMSConstructSolutionApproveService.GetThisApproveNameByConstructSolutionId(Eval("ConstructSolutionId")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
                     </Columns>
diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx
index 64349829..402f1421 100644
--- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionView.aspx
@@ -178,7 +178,7 @@
                                         </f:Tree>
                                     </Items>
                                 </f:Panel>
-                                <f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px"
+                                <f:Panel ID="Panel3" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px" Hidden="True"
                                     TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
                                     <Items>
                                         <f:Tree runat="server" ID="trTwo" ShowHeader="false" ShowBorder="false">
@@ -196,7 +196,7 @@
                                         </f:Tree>
                                     </Items>
                                 </f:Panel>
-                                <f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px"
+                                <f:Panel ID="Panel5" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px" Hidden="True"
                                     TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
                                     <Items>
                                         <f:Tree runat="server" ID="trFour" ShowHeader="false" ShowBorder="false">
@@ -214,7 +214,7 @@
                                         </f:Tree>
                                     </Items>
                                 </f:Panel>
-                                <f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px"
+                                <f:Panel ID="Panel7" Title="Panel1" Width="200px" AutoScroll="true" Layout="Fit" Height="200px" Hidden="True"
                                     TableRowspan="5" runat="server" BodyPadding="10px" ShowBorder="false" ShowHeader="false">
                                     <Items>
                                         <f:Tree runat="server" ID="trSixe" ShowHeader="false" ShowBorder="false">
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index b012a6c2..e084b543 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -3215,3 +3215,123 @@ IP地址:::1
 
 出错时间:10/07/2023 16:42:46
 
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'MonitorPW' 无效。
+列名 'MonitorId' 无效。
+错误堆栈:
+   在 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.Collections.Generic.IEnumerable<T>.GetEnumerator()
+   在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
+   在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
+   在 BLL.ProjectService.GetProjectByUserIdStateDropDownList(String userId, String state) 位置 D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\BLL\ProjectData\ProjectService.cs:行号 322
+   在 BLL.ProjectService.InitProjectShortNameByStateDropDownList(DropDownList dropName, String userId, String state, Boolean isShowPlease) 位置 D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\BLL\ProjectData\ProjectService.cs:行号 427
+   在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 297
+   在 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)
+出错时间:10/19/2023 22:11:45
+出错文件:http://localhost:8579/indexProject.aspx?projectId=1dcf6629-8d05-413e-a09a-016c7bd36167
+IP地址:::1
+操作人员:JT
+
+出错时间:10/19/2023 22:11:45
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'MonitorPW' 无效。
+列名 'MonitorId' 无效。
+错误堆栈:
+   在 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.Collections.Generic.IEnumerable<T>.GetEnumerator()
+   在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
+   在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
+   在 BLL.ProjectService.GetProjectByUserIdStateDropDownList(String userId, String state) 位置 D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\BLL\ProjectData\ProjectService.cs:行号 322
+   在 BLL.ProjectService.InitProjectShortNameByStateDropDownList(DropDownList dropName, String userId, String state, Boolean isShowPlease) 位置 D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\BLL\ProjectData\ProjectService.cs:行号 427
+   在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 297
+   在 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)
+出错时间:10/19/2023 22:12:05
+出错文件:http://localhost:8579/indexProject.aspx?projectId=1dcf6629-8d05-413e-a09a-016c7bd36167
+IP地址:::1
+操作人员:JT
+
+出错时间:10/19/2023 22:12:05
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:列名 'MonitorPW' 无效。
+列名 'MonitorId' 无效。
+错误堆栈:
+   在 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.Collections.Generic.IEnumerable<T>.GetEnumerator()
+   在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection)
+   在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source)
+   在 BLL.ProjectService.GetProjectByUserIdStateDropDownList(String userId, String state) 位置 D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\BLL\ProjectData\ProjectService.cs:行号 322
+   在 BLL.ProjectService.InitProjectShortNameByStateDropDownList(DropDownList dropName, String userId, String state, Boolean isShowPlease) 位置 D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\BLL\ProjectData\ProjectService.cs:行号 427
+   在 FineUIPro.Web.indexProject.Page_Load(Object sender, EventArgs e) 位置 D:\数据\诺必达\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 297
+   在 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)
+出错时间:10/19/2023 22:12:46
+出错文件:http://localhost:8579/indexProject.aspx?projectId=1dcf6629-8d05-413e-a09a-016c7bd36167
+IP地址:::1
+操作人员:JT
+
+出错时间:10/19/2023 22:12:46
+
diff --git a/SGGL/WebAPI/Controllers/CQMS/CQMSConstructSolutionController.cs b/SGGL/WebAPI/Controllers/CQMS/CQMSConstructSolutionController.cs
index 29ab1061..dabedcb1 100644
--- a/SGGL/WebAPI/Controllers/CQMS/CQMSConstructSolutionController.cs
+++ b/SGGL/WebAPI/Controllers/CQMS/CQMSConstructSolutionController.cs
@@ -126,6 +126,7 @@ namespace Mvc.Controllers
                 // Model.Check_CheckControlApprove approve1 = BLL.CheckControlApproveService.GetCheckControlApproveByCheckControlId(approve.CheckControlCode);
                 approve.ApproveDate = DateTime.Now;
                 approve = BLL.CQMSConstructSolutionApproveService.UpdateConstructSolutionApproveForApi(approve);
+                BLL.CQMSConstructSolutionApproveService.PushMessageToNextMan(approve.ConstructSolutionId);//推送待办
                 var approves = BLL.CQMSConstructSolutionApproveService.getConApprovesForApi(approve.ConstructSolutionId, approve.Edition.Value);
                 Solution_CQMSConstructSolutionApprove first = null;
                 bool allAgree = true;