diff --git a/插件库/Lskj.PubAccraditation/FrmAccraditation.cs b/插件库/Lskj.PubAccraditation/FrmAccraditation.cs index 39ffe90..79deb5a 100644 --- a/插件库/Lskj.PubAccraditation/FrmAccraditation.cs +++ b/插件库/Lskj.PubAccraditation/FrmAccraditation.cs @@ -32,6 +32,8 @@ using Lskj.Core; using System.Threading.Tasks; using DevExpress.Utils; using DevExpress.Data; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace Lskj.PubAccraditation { @@ -1254,10 +1256,41 @@ namespace Lskj.PubAccraditation if (dataTable != null) { //DataTable dataMain = dataTable.Copy(); - string sqlValue = "select * from RD_worktimetab where 1 = 1"; - sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'"; - DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); - MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime); + //string sqlValue = "select * from RD_worktimetab where 1 = 1"; + //sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'"; + //DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); + //---------- 查询①:渲染表格排程” ---------- + string sqlExcludePlan = "SELECT * FROM RD_worktimetab WHERE 1 = 1"; + sqlExcludePlan += $" AND lblOrderNo = '{billNo}'"; + sqlExcludePlan += $" AND showday >= '{dateTime:yyyy-MM-dd}'"; + sqlExcludePlan += " AND billdocument_id NOT LIKE N'计划文件%'"; + // 获取结果 + DataTable dataNoPlanFile = BaseImpl.GetDataTableResult(sqlExcludePlan); + // ---------- 查询②:只包含“计划文件” ---------- + string sqlIncludePlan = "SELECT billdocument_id FROM RD_worktimetab WHERE 1 = 1"; + sqlIncludePlan += $" AND lblOrderNo = '{billNo}'"; + sqlIncludePlan += $" AND showday >= '{dateTime:yyyy-MM-dd}'"; + sqlIncludePlan += " AND billdocument_id LIKE N'计划文件%'"; + // 获取结果 + DataTable dataOnlyPlanFile = BaseImpl.GetDataTableResult(sqlIncludePlan); + MergeMainDataWithDayPlan(dataTable, dataNoPlanFile, dateTime); + //若存在缓存计划数据则渲染合计 + if (dataOnlyPlanFile.Rows.Count > 0) + { + string jhrowtiemjson = (dataOnlyPlanFile.Rows[0]["billdocument_id"] + "").Replace("计划文件", ""); + try + { + JObject rowObject = JsonConvert.DeserializeObject(jhrowtiemjson); + JArray jArray = new JArray(); + jArray.Add(rowObject); + DataRow jhrowitem = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(jArray)).Rows[0]; + //渲染计划合计 + gridBillInfo.AddHeadquarters(jhrowitem); + } + catch (Exception) + { + } + } this.gridBillInfo.GridControl.DataSource = null; this.gridBillInfo.GridControl.DataSource = dataTable; }