Controllers/QC/LljController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Controllers/base/MessageCenterController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MesQaItemsDetectDetail12.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
entity/MessageCenter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/QC/LljService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
service/base/MessageCenterManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Controllers/QC/LljController.cs
@@ -35,6 +35,28 @@ } } [HttpPost("getBadge")] public ResponseResult getBadge() { try { dynamic resultInfos = new ExpandoObject(); var item = new LljService().getBadge(); var tbBillList = resultInfos.tbBillList = item; return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } [HttpPost("setJYItem")] public ResponseResult setJYItem([FromBody] JObject data) @@ -94,7 +116,7 @@ dynamic resultInfos = new ExpandoObject(); var tbBillList = new LljService().GetItems(releaseNo, Convert.ToDecimal(id)); id); resultInfos.tbBillList = tbBillList; return new ResponseResult { Controllers/base/MessageCenterController.cs
@@ -36,6 +36,27 @@ } } //getBadge [HttpPost("getBadge")] public ResponseResult getBadge() { try { dynamic resultInfos = new ExpandoObject(); resultInfos.tbBillList = m.getBadge(); return new ResponseResult { status = 0, message = "OK", data = resultInfos }; } catch (Exception ex) { return ResponseResult.ResponseError(ex); } } //Resend [HttpPost("Resend")] public ResponseResult Resend(MessageCenter data) entity/MesQaItemsDetectDetail12.cs
@@ -65,4 +65,6 @@ public string? CreateBy { get; set; } [SugarColumn(IsIgnore = true)] public int? count { get; set; } [SugarColumn(IsIgnore = true)] public bool? isNumber { get; set; } } entity/MessageCenter.cs
@@ -15,98 +15,115 @@ public Guid Guid { get; set; } /// <summary> /// 表名/视图名 /// </summary> [SugarColumn(ColumnName = "table_name")] public string? TableName { get; set; } /// <summary> /// 请求地址 /// </summary> [SugarColumn(ColumnName = "url")] public string? Url { get; set; } /// <summary> /// 请求方式 /// </summary> [SugarColumn(ColumnName = "method")] public string? Method { get; set; } /// <summary> /// 是否成功 0表示失败 1 表示成功 /// </summary> [SugarColumn(ColumnName = "result")] public int? Result { get; set; } /// <summary> /// 返回的JSON /// </summary> [SugarColumn(ColumnName = "result_data")] public string? ResultData { get; set; } /// <summary> /// 状态 0表示未推送 1 表示已推送 /// </summary> [SugarColumn(ColumnName = "status")] public int? Status { get; set; } /// <summary> /// 创建人 /// </summary> [SugarColumn(ColumnName = "create_by")] public string? CreateBy { get; set; } /// <summary> /// 创建时间 /// </summary> [SugarColumn(ColumnName = "create_date")] public string? CreateDate { get; set; } /// <summary> /// 业务标题 /// </summary> [SugarColumn(ColumnName = "title")] public string? Title { get; set; } /// <summary> /// 页面名称 /// </summary> [SugarColumn(ColumnName = "page_name")] public string? PageName { get; set; } /// <summary> /// 默认值: ((0)) /// 默认值: ((0)) 是否处理,0表示未处理 1表示已处理 /// </summary> [SugarColumn(ColumnName = "deal_with")] public int? DealWith { get; set; } /// <summary> /// 批次 /// </summary> [SugarColumn(ColumnName = "pid")] public Guid? Pid { get; set; } /// <summary> /// 默认值: ((1)) /// 执行顺序 默认值: ((1)) /// </summary> [SugarColumn(ColumnName = "seq")] public int? Seq { get; set; } /// <summary> /// 页面路径 /// </summary> [SugarColumn(ColumnName = "route")] public string? Route { get; set; } /// <summary> /// 请求内容 /// </summary> [SugarColumn(ColumnName = "data")] public string? Data { get; set; } /// <summary> /// 参数类型 /// </summary> [SugarColumn(ColumnName = "content_type")] public string? ContentType { get; set; } /// <summary> /// 是否是消息 0为推送失败 1为消息,默认为0 /// </summary> [SugarColumn(ColumnName = "is_message")] public int? IsMessage { get; set; } /// <summary> /// 最后一次修改时间 /// </summary> [SugarColumn(ColumnName = "update_date")] public string? UpdateDate { get; set; } /// <summary> /// 最后一次修改人 /// </summary> [SugarColumn(ColumnName = "update_by")] public string? UpdateBy { get; set; } service/QC/LljService.cs
@@ -26,11 +26,11 @@ .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && "未完成".Equals(queryObj.result), a => a.FcheckResu == null) a => (a.FcheckResu ?? "") == "") .WhereIF( StringUtil.IsNotNullOrEmpty(queryObj.result) && !"未完成".Equals(queryObj.result), a => a.FcheckResu != null) a => (a.FcheckResu ?? "") != "") .WhereIF(UtilityHelper.CheckGuid(parsedGuid), a => a.guid == parsedGuid) .OrderByDescending(a => a.CreateDate) @@ -144,7 +144,7 @@ { foreach (var item in items) item.ReleaseNo = rkjDto.releaseNo; return db.Insertable(items).ExecuteCommand(); return db.Insertable(items).IgnoreColumns(true).ExecuteCommand(); }); rkjDto.items = GetItems(rkjDto.releaseNo, null); @@ -186,16 +186,27 @@ } public List<MesQaItemsDetectDetail5> GetItems(string? releaseNo, decimal? id) string? id) { var parsedGuid = Guid.Empty; if (id != null) { var isValid = Guid.TryParse(id, out parsedGuid); if (!isValid) throw new ApplicationException("GUID转换错误"); } return Db.Queryable<MesQaItemsDetectDetail5, MesQaItemsDetectDetail12>( (a, b) => new JoinQueryInfos(JoinType.Left, a.Guid == b.ParentGuid)) .Where((a, b) => a.ReleaseNo == releaseNo) // .WhereIF(id > 0, (a, b) => a.Id == id) .WhereIF(UtilityHelper.CheckGuid(parsedGuid), (a, b) => a.Guid == parsedGuid) .GroupBy((a, b) => new { a.Guid, a.ParentGuid, a.ReleaseNo, a.FacLevel, a.FcheckItem, @@ -212,6 +223,7 @@ }).Select((a, b) => new MesQaItemsDetectDetail5 { Guid = a.Guid, ParentGuid = a.ParentGuid, ReleaseNo = a.ReleaseNo, CheckQyt = a.CheckQyt, FacLevel = a.FacLevel, @@ -240,6 +252,7 @@ { var item = new MesQaItemsDetectDetail12(); item.ParentGuid = detail.ParentGuid; item.GrandpaGuid = detail.GrandpaGuid; item.Fstand = detail.Fstand; item.FcheckResu = detail.FcheckResu; item.CreateBy = detail.LastupdateBy; @@ -247,7 +260,7 @@ result.Add(item); } return db.Insertable(result).ExecuteCommand(); return db.Insertable(result).IgnoreColumns(true).ExecuteCommand(); }); detail.CreateBy = detail.LastupdateBy; @@ -430,6 +443,18 @@ rkjDto.ItemXj02s = Db.Queryable<MesQaItemsDetectDetail12>() .Where(s => s.ParentGuid == parsedGuid) .ToList(); foreach (var mesQaItemsDetectDetail12 in rkjDto.ItemXj02s) { //this.formData.fupAllow && this.formData.fdownAllow && this.formData.fstand mesQaItemsDetectDetail12.isNumber = true; if (qsItemOqcItem.FupAllow.IsNullOrEmpty() && qsItemOqcItem.FdownAllow.IsNullOrEmpty() && qsItemOqcItem.Fstand == null) { mesQaItemsDetectDetail12.isNumber = false; } } return rkjDto; } @@ -671,4 +696,15 @@ return com > 0; } public int[] getBadge() { var isNullCount = Db.Queryable<MesQaItemsDetect01>() .Where(a => (a.FcheckResu ?? "") == "").Count(); var isNotNullCount = Db.Queryable<MesQaItemsDetect01>() .Where(a => (a.FcheckResu ?? "") != "").Count(); return [isNullCount, isNotNullCount]; } } service/base/MessageCenterManager.cs
@@ -13,8 +13,9 @@ { var totalCount = 0; var messageCenters = Db.Queryable<MessageCenter>() .Where(s => s.Result == 0 && s.Seq == 1 && s.Title != null) .Where(s => s.Result == query.DealWith && s.Seq == 1 && s.Title != null && s.DealWith == query.DealWith) .OrderByDescending(s => s.CreateDate) .ToPageList(query.PageIndex, query.Limit, ref totalCount); @@ -104,4 +105,17 @@ .ExecuteCommand(); }); } public int[] getBadge() { var count = Db.Queryable<MessageCenter>() .Where(s => s.Result == 0 && s.Status == 1 && s.Seq == 1 && s.Title != null).Count(); var count1 = Db.Queryable<MessageCenter>() .Where(s => s.Result == 1 && s.Status == 1 && s.Seq == 1 && s.Title != null).Count(); return [count,count1]; } }