From 5af1eb5ab23e39e493aba3d2c3db2afaeb4d540e Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 18 Sep 2025 10:24:21 +0800 Subject: [PATCH 1/6] 1 --- .../PublishProfiles/FolderProfile.pubxml.user | 22 +++++++++---------- SGGL/WebAPI/WebAPI.csproj.user | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user index 638a5488..ae27f3b9 100644 --- a/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>G:\发布\五环WebApi - True|2025-09-16T11:11:12.4383069Z||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||; + True|2025-09-18T01:53:17.9300539Z||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||; @@ -86,22 +86,22 @@ 10/28/2024 14:02:50 - 09/16/2025 19:11:11 + 09/18/2025 09:53:17 - 09/16/2025 19:11:11 + 09/18/2025 09:53:17 12/06/2024 20:13:58 - 09/16/2025 19:10:50 + 09/18/2025 09:52:53 12/26/2024 09:46:52 - 09/16/2025 19:10:50 + 09/18/2025 09:52:53 12/18/2020 05:32:28 @@ -128,10 +128,10 @@ 07/25/2012 19:48:56 - 09/16/2025 19:10:44 + 09/18/2025 09:52:47 - 09/16/2025 19:10:44 + 09/18/2025 09:52:47 07/04/2024 14:13:01 @@ -389,13 +389,13 @@ 02/09/2013 00:42:28 - 09/16/2025 19:10:53 + 09/18/2025 09:52:57 - 09/16/2025 19:10:53 + 09/18/2025 09:52:57 - 09/16/2025 19:10:53 + 09/18/2025 09:52:57 01/23/2014 21:57:34 @@ -479,7 +479,7 @@ 10/28/2024 14:02:50 - 09/16/2025 19:10:54 + 09/18/2025 09:52:58 10/28/2024 14:02:50 diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index 17978b44..1a1a9a6c 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU true From f3db5bfdabe224618d655dbb579eee696e26a9bf Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 18 Sep 2025 11:13:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=9D=A3=E6=9F=A5=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=95=B4=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DCGL/ServerCheck/CheckNotice.aspx.cs | 2 +- .../DCGL/ServerCheck/CheckRectify.aspx.cs | 264 +++++++++++++++++- .../DCGL/ServerCheck/CheckRectifyEdit.aspx | 84 +++++- .../DCGL/ServerCheck/CheckRectifyEdit.aspx.cs | 40 ++- .../CheckRectifyEdit.aspx.designer.cs | 13 +- SGGL/FineUIPro.Web/res/css/viewer.min.css | 9 + SGGL/FineUIPro.Web/res/js/hook.js | 6 + SGGL/FineUIPro.Web/res/js/jquery-3.3.1.min.js | 2 + SGGL/FineUIPro.Web/res/js/viewer.min.js | 10 + SGGL/WebAPI/WebAPI.csproj.user | 2 +- 10 files changed, 410 insertions(+), 22 deletions(-) create mode 100644 SGGL/FineUIPro.Web/res/css/viewer.min.css create mode 100644 SGGL/FineUIPro.Web/res/js/hook.js create mode 100644 SGGL/FineUIPro.Web/res/js/jquery-3.3.1.min.js create mode 100644 SGGL/FineUIPro.Web/res/js/viewer.min.js diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs index a7d158c9..a08899ac 100644 --- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs @@ -396,7 +396,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck JArray arr = JArray.Parse(data); if (arr.Count() > 0) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) { List ids = new List(); foreach (var item in arr) diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs index 931c3f1e..995b16c5 100644 --- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs @@ -13,10 +13,12 @@ namespace FineUIPro.Web.DCGL.ServerCheck { public partial class CheckRectify : PageBase { + private static string proType; protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { + proType = Request.Params["proType"] ?? string.Empty; this.GetButtonPower(); //btnNew.OnClientClick = Window1.GetShowReference("CheckRectifyEdit.aspx") + "return false;"; ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); @@ -30,15 +32,19 @@ namespace FineUIPro.Web.DCGL.ServerCheck /// private void BindGrid() { - string strSql = string.Empty; + StringBuilder sb = new StringBuilder(); + sb.Append($@"SELECT S.CheckRectifyId,S.CheckRectifyCode,S.ProjectId,S.ProjectName,S.UnitId,U.UnitName,S.CheckDate,CASE S.HandleState WHEN '{BLL.Const.State_1}' THEN '未签发' WHEN '{BLL.Const.State_2}' THEN '未上报' ELSE '已上报' END AS HandleState, + S.IssueMan,S.IssueDate,ISNULL(TotalCount.TotalCount,0) AS TotalCount ,ISNULL(CompleteCount.CompleteCount,0) AS CompleteCount,(ISNULL(TotalCount.TotalCount,0) -ISNULL(CompleteCount.CompleteCount,0)) AS UnCompleteCount "); + sb.Append("FROM dbo.DCGL_Check_CheckRectify AS S LEFT JOIN dbo.Base_Unit AS U ON U.UnitId = S.UnitId "); + sb.Append(" LEFT JOIN (SELECT COUNT(*) AS TotalCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem GROUP BY CheckRectifyId) AS TotalCount ON S.CheckRectifyId=TotalCount.CheckRectifyId "); + sb.Append(" LEFT JOIN (SELECT COUNT(*) AS CompleteCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem WHERE RealEndDate IS NOT NULL GROUP BY CheckRectifyId) AS CompleteCount ON S.CheckRectifyId=CompleteCount.CheckRectifyId "); + if (!string.IsNullOrWhiteSpace(proType) && proType == "1") + {//只查询本项目检查数据 + sb.Append($"WHERE S.ProjectId='{this.CurrUser.LoginProjectId}' "); + } + sb.Append("ORDER BY HandleState"); SqlParameter[] parameter = new SqlParameter[] { }; - strSql = "SELECT S.CheckRectifyId,S.CheckRectifyCode,S.ProjectId,S.ProjectName,S.UnitId,U.UnitName,S.CheckDate,CASE S.HandleState WHEN '" + BLL.Const.State_1 + "' THEN '未签发' WHEN '" + BLL.Const.State_2 + "' THEN '未上报' ELSE '已上报' END AS HandleState," - + @" S.IssueMan,S.IssueDate,ISNULL(TotalCount.TotalCount,0) AS TotalCount ,ISNULL(CompleteCount.CompleteCount,0) AS CompleteCount,(ISNULL(TotalCount.TotalCount,0) -ISNULL(CompleteCount.CompleteCount,0)) AS UnCompleteCount" - + @" FROM dbo.DCGL_Check_CheckRectify AS S LEFT JOIN dbo.Base_Unit AS U ON U.UnitId = S.UnitId" - + @" LEFT JOIN (SELECT COUNT(*) AS TotalCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem GROUP BY CheckRectifyId) AS TotalCount ON S.CheckRectifyId=TotalCount.CheckRectifyId" - + @" LEFT JOIN (SELECT COUNT(*) AS CompleteCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem WHERE RealEndDate IS NOT NULL GROUP BY CheckRectifyId) AS CompleteCount ON S.CheckRectifyId=CompleteCount.CheckRectifyId" - + @" ORDER BY HandleState"; - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + DataTable tb = SQLHelper.GetDataTableRunText(sb.ToString(), parameter); // 2.获取当前分页数据 //var table = this.GetPagedDataTable(Grid1, tb1); @@ -365,7 +371,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck #endregion #endregion - + /// /// 从集团获取 /// @@ -387,8 +393,9 @@ namespace FineUIPro.Web.DCGL.ServerCheck #region 获取 + /// - /// 获取 + /// 获取督查检查整改 /// /// /// @@ -397,7 +404,239 @@ namespace FineUIPro.Web.DCGL.ServerCheck var responeData = new Model.ResponeData(); try { - string unitId =CommonService.GetThisUnitId(); + string unitId = CommonService.GetThisUnitId(); + string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getDCGLCheckInfoRectify?unitId=" + unitId; + string contenttype = "application/json;charset=unicode"; + Hashtable newToken = new Hashtable + { + { "token", ServerService.GetToken().Token } + }; + + var strJosn = APIGetHttpService.Http(baseurl, "GET", contenttype, newToken, null); + if (!string.IsNullOrEmpty(strJosn)) + { + JObject obj = JObject.Parse(strJosn); + responeData.code = Funs.GetNewIntOrZero(obj["code"].ToString()); + responeData.message = obj["message"].ToString(); + if (responeData.code == 1) + { + JArray getData = JArray.Parse(obj["data"].ToString()); + if (getData.Count() > 0) + { + using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) + { + List ids = new List(); + foreach (var item in getData) + { + string getCheckRectifyId = item["CheckRectifyId"].ToString(); + if (!ids.Contains(getCheckRectifyId)) + { + var newRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == getCheckRectifyId); + if (newRectify == null) + { + ids.Add(getCheckRectifyId); + Model.DCGL_Check_CheckRectify newCheckRectify = new Model.DCGL_Check_CheckRectify + { + CheckRectifyId = getCheckRectifyId, + CheckRectifyCode = item["CheckRectifyCode"].ToString(), + ProjectId = item["ProjectId"].ToString(), + ProjectName = item["ProjectName"].ToString(), + UnitId = unitId, + CheckDate = Funs.GetNewDateTime(item["CheckDate"].ToString()), + IssueMan = item["IssueMan"].ToString(), + IssueDate = Funs.GetNewDateTime(item["IssueDate"].ToString()), + HandleState = item["HandleState"].ToString() + }; + db.DCGL_Check_CheckRectify.InsertOnSubmit(newCheckRectify); + db.SubmitChanges(); + } + else + { + newRectify.CheckRectifyCode = item["CheckRectifyCode"].ToString(); + db.SubmitChanges(); + } + + //获取对应主表主键的明细集合 + string getNoticeItemId = item["NoticeItemId"].ToString(); + var notice = db.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(x => x.ID == getNoticeItemId); + if (notice == null) + { + Model.DCGL_Check_CheckInfo_TableNoticeItem newCheckRectifyItem = new Model.DCGL_Check_CheckInfo_TableNoticeItem + { + ID = getNoticeItemId, + CheckInfoId = item["CheckInfoId"].ToString(), + SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()), + Describe = item["Describe"].ToString(), + Standards = item["Standards"].ToString(), + Advice = item["Advice"].ToString(), + LimitTime = Funs.GetNewDateTime(item["LimitTime"].ToString()), + + Situation = item["Situation"].ToString(), + Remark = item["Remark"].ToString(), + Url = item["Url"].ToString(), + AffUrl = item["AffUrl"].ToString(), + RiskLevel = item["RiskLevel"].ToString(), + ProblemTypes = item["ProblemTypes"].ToString(), + ProblemSubTypeId = item["ProblemSubTypeId"].ToString(), + ProblemSubType = item["ProblemSubType"].ToString(), + States = item["States"].ToString(), + + //WorkType = item["WorkType"].ToString(), + //DangerPoint = item["DangerPoint"].ToString(), + //RiskExists = item["RiskExists"].ToString(), + //IsProject = Convert.ToBoolean(item["IsProject"].ToString()), + //CheckMan = item["CheckMan"].ToString(), + //SubjectUnitMan = item["SubjectUnitMan"].ToString(), + }; + db.DCGL_Check_CheckInfo_TableNoticeItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + + BLL.CommonService.DeleteAttachFileById(getNoticeItemId);//删除附件 + ////上传附件 + string getAttachFileId = item["AttachFileId"].ToString(); + if (!string.IsNullOrEmpty(getAttachFileId)) + { + List resultList = new List(); + string filePath = item["FilePath"].ToString(); + string attachSource = item["AttachSource"].ToString(); + string attachUrl = item["AttachUrl"].ToString(); + + BLL.FileInsertService.InsertAttachFileRecord(getAttachFileId, getNoticeItemId, attachSource, attachUrl); + //if (!string.IsNullOrWhiteSpace(filePath) && !string.IsNullOrWhiteSpace(attachSource) && !string.IsNullOrWhiteSpace(attachUrl)) + //{ + // resultList = FileInsertService.FilePathTransStream(filePath, attachUrl); + //} + //BLL.FileInsertService.InsertAttachFile(getAttachFileId, getNoticeItemId, attachSource, attachUrl, resultList); + } + + string getCheckRectifyItemId = item["CheckRectifyItemId"].ToString(); + var oldItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == getCheckRectifyItemId); + if (oldItem == null) + { + Model.DCGL_Check_CheckRectifyItem newCheckRectifyItem = new Model.DCGL_Check_CheckRectifyItem + { + CheckRectifyItemId = getCheckRectifyItemId, + CheckRectifyId = getCheckRectifyId, + NoticeItemId = getNoticeItemId, + ConfirmMan = item["ConfirmMan"].ToString(), + ConfirmManName = item["ConfirmManName"].ToString(), + ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()), + OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()), + OrderEndPerson = item["OrderEndPerson"].ToString(), + RealEndDate = Funs.GetNewDateTime(item["RealEndDate"].ToString()), + }; + + db.DCGL_Check_CheckRectifyItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + } + else + { + //获取对应主表主键的明细集合 + string getNoticeItemId = item["NoticeItemId"].ToString(); + var notice = db.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(x => x.ID == getNoticeItemId); + if (notice == null) + { + + Model.DCGL_Check_CheckInfo_TableNoticeItem newCheckRectifyItem = new Model.DCGL_Check_CheckInfo_TableNoticeItem + { + ID = getNoticeItemId, + CheckInfoId = item["CheckInfoId"].ToString(), + SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()), + Describe = item["Describe"].ToString(), + Standards = item["Standards"].ToString(), + Advice = item["Advice"].ToString(), + LimitTime = Funs.GetNewDateTime(item["LimitTime"].ToString()), + + Situation = item["Situation"].ToString(), + Remark = item["Remark"].ToString(), + Url = item["Url"].ToString(), + AffUrl = item["AffUrl"].ToString(), + RiskLevel = item["RiskLevel"].ToString(), + ProblemTypes = item["ProblemTypes"].ToString(), + ProblemSubTypeId = item["ProblemSubTypeId"].ToString(), + ProblemSubType = item["ProblemSubType"].ToString(), + States = item["States"].ToString(), + + //WorkType = item["WorkType"].ToString(), + //DangerPoint = item["DangerPoint"].ToString(), + //RiskExists = item["RiskExists"].ToString(), + //IsProject = Convert.ToBoolean(item["IsProject"].ToString()), + //CheckMan = item["CheckMan"].ToString(), + //SubjectUnitMan = item["SubjectUnitMan"].ToString(), + }; + db.DCGL_Check_CheckInfo_TableNoticeItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + + BLL.CommonService.DeleteAttachFileById(getNoticeItemId);//删除附件 + ////上传附件 + string getAttachFileId = item["AttachFileId"].ToString(); + if (!string.IsNullOrEmpty(getAttachFileId)) + { + List resultList = new List(); + string attachSource = item["AttachSource"].ToString(); + string attachUrl = item["AttachUrl"].ToString(); + BLL.FileInsertService.InsertAttachFileRecord(getAttachFileId, getNoticeItemId, attachSource, attachUrl); + //if (!string.IsNullOrWhiteSpace(filePath) && !string.IsNullOrWhiteSpace(attachSource) && !string.IsNullOrWhiteSpace(attachUrl)) + //{ + // resultList = FileInsertService.FilePathTransStream(filePath, attachUrl); + //} + //BLL.FileInsertService.InsertAttachFile(getAttachFileId, getNoticeItemId, attachSource, attachUrl, resultList); + } + + string getCheckRectifyItemId = item["CheckRectifyItemId"].ToString(); + var oldItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == getCheckRectifyItemId); + if (oldItem == null) + { + Model.DCGL_Check_CheckRectifyItem newCheckRectifyItem = new Model.DCGL_Check_CheckRectifyItem + { + CheckRectifyItemId = getCheckRectifyItemId, + CheckRectifyId = getCheckRectifyId, + NoticeItemId = getNoticeItemId, + ConfirmMan = item["ConfirmMan"].ToString(), + ConfirmManName = item["ConfirmManName"].ToString(), + ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()), + OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()), + OrderEndPerson = item["OrderEndPerson"].ToString(), + RealEndDate = Funs.GetNewDateTime(item["RealEndDate"].ToString()), + }; + + db.DCGL_Check_CheckRectifyItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + } + } + } + } + responeData.message = "获取成功:整改明细记录" + getData.Count().ToString() + "条"; + } + } + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = "获取失败:" + ex.Message; + ErrLogInfo.WriteLog("督查检查通知单获取!", ex); + } + + return responeData; + } + #endregion + + #region 获取 + /// + /// 获取 + /// + /// + /// + public static Model.ResponeData getCheck_CheckRectifyListToSUBOld() + { + var responeData = new Model.ResponeData(); + try + { + string unitId = CommonService.GetThisUnitId(); string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getDCGLCheckRectify?unitId=" + unitId; string contenttype = "application/json;charset=unicode"; Hashtable newToken = new Hashtable @@ -416,7 +655,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck JArray getData = JArray.Parse(obj["data"].ToString()); if (getData.Count() > 0) { - using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString)) { List ids = new List(); foreach (var item in getData) @@ -591,6 +830,7 @@ namespace FineUIPro.Web.DCGL.ServerCheck CheckRectifyId = getCheckRectifyId, NoticeItemId = getNoticeItemId, ConfirmMan = item["ConfirmMan"].ToString(), + ConfirmManName = item["ConfirmManName"].ToString(), ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()), OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()), OrderEndPerson = item["OrderEndPerson"].ToString(), diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx index cbec1d1f..c545431f 100644 --- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx @@ -6,11 +6,36 @@ 隐患整改单 + + + @@ -57,7 +82,7 @@ @@ -74,10 +99,16 @@ - + + + + + <%-- - + --%> @@ -108,12 +139,19 @@ - + --%> + + + + +