~sjz/YC.git - Gitblit

			@@ -15,9 +15,24 @@
			[SugarColumn(ColumnName = "STATUS_DATE")] //用于SqlSugar
			public DateTime? StatusDate { get; set; }

			[SugarColumn(ColumnName = "FNAME")]
			public string? FName { get; set; }

			[SugarColumn(ColumnName = "RESULT")]
			public string? Result { get; set; }

			[SugarColumn(ColumnName = "FSUBMIT")]
			public string? FSubmit { get; set; }

			[SugarColumn(ColumnName = "FSUBMIT_BY")]
			public string? FSubmitBy { get; set; }

			[SugarColumn(ColumnName = "FSUBMIT_DATE")]
			public DateTime? FSubmitDate { get; set; }

			[SugarColumn(ColumnName = "MOID_NUM")]
			public string? MoidNum { get; set; }

			[SugarColumn(IsIgnore = true)]
			public string? SearchValue { get; set; }

			@@ -55,11 +55,11 @@
			.WhereIF(
			StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
			"未完成".Equals(queryObj.Result),
			a => a.Result == queryObj.Result)
			a => a.FSubmit == null)
			.WhereIF(
			StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
			!"未完成".Equals(queryObj.Result),
			a => a.Result != "未完成")
			a => a.FSubmit != null)
			.OrderBy(a => a.CreateTime, OrderByType.Desc);
			var totalCount = data.Count();
			var items = data.ToPageList(queryObj.PageIndex, queryObj.Limit);

	MES.Service/Dto/service/SJPageResult.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	MES.Service/service/QC/SJService.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史