From 8a53164b2ff75612596a7c65eda284b5a03e01f1 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 24 七月 2025 23:31:04 +0800
Subject: [PATCH] Update SJService getPage method to return total count like LljService
---
StandardPda/MES.Service/service/QC/SJService.cs | 91 +++++++++++++++++++++++++++++----------------
1 files changed, 58 insertions(+), 33 deletions(-)
diff --git a/StandardPda/MES.Service/service/QC/SJService.cs b/StandardPda/MES.Service/service/QC/SJService.cs
index db188ef..639ef64 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -34,14 +34,16 @@
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
- public List<SJPageResult> getPage(SJPageResult queryObj)
+ public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
string[]? lineNo = null;
- if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
- lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
+ // if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
+ // lineNo = _baseService.getUserLineNo(queryObj.StatusUser);
+
+ var totalCount = 0;
var data = db.Queryable<SJPageResult>()
.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -49,18 +51,26 @@
.WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
.WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.BillNo),
a => a.BillNo == queryObj.BillNo)
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ // "鏈畬鎴�".Equals(queryObj.Result),
+ // a => a.Result == queryObj.Result && (a.FSubmit == 0 || a.FSubmit == null))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result == queryObj.Result)
+ a => a.FSubmit == 0 || a.FSubmit == null)
+ // .WhereIF(
+ // StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
+ // !"鏈畬鎴�".Equals(queryObj.Result),
+ // a => a.Result != "鏈畬鎴�" && a.FSubmit == 1)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
- a => a.Result != "鏈畬鎴�")
+ a => a.FSubmit == 1)
.OrderBy(a => a.BillNo, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit);
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
- return data;
+ return (data, totalCount);
}
@@ -103,8 +113,8 @@
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(
- b => new QsItemIpiItem
+ .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(b =>
+ new QsItemIpiItem
{
ProjName = b.ProjName,
ItemMod = b.ItemMod,
@@ -188,21 +198,20 @@
{
var qsItemIpiReq = item.From;
var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiReq.StatusDate = DateTime.Now;
- var pid = db.Insertable(qsItemIpiReq)
- .ExecuteReturnIdentity();
- qsItemIpiReq.Id = pid;
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ qsItemIpiReq.StatusDate = DateTime.Now;
+ var pid = db.Insertable(qsItemIpiReq)
+ .ExecuteReturnIdentity();
+ qsItemIpiReq.Id = pid;
- item.gid = pid;
+ item.gid = pid;
- qsItemIpiItems.ForEach(s => s.Pid = pid);
+ qsItemIpiItems.ForEach(s => s.Pid = pid);
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
+ return db.Insertable(qsItemIpiItems)
+ .ExecuteCommand();
+ });
item.Items = getQSItems(qsItemIpiReq.Id, null);
//娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
@@ -223,7 +232,8 @@
item.Items = getQSItems(qsItemIpiReq.Id, null);
var sjPageResult = new SJPageResult
{ Id = item.From.Id, Limit = 1, PageIndex = 1 };
- item.Result = getPage(sjPageResult)[0];
+ var pageResult = getPage(sjPageResult);
+ item.Result = pageResult.item[0];
return item;
}
@@ -231,14 +241,13 @@
public QsItem SaveItem(QsItem item)
{
var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiItems.ForEach(s => s.Pid = item.gid);
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ qsItemIpiItems.ForEach(s => s.Pid = item.gid);
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
+ return db.Insertable(qsItemIpiItems)
+ .ExecuteCommand();
+ });
item.Items = getQSItems(item.gid, null);
//娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
@@ -322,8 +331,8 @@
if (count == passCount) result = 1;
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<QsItemIpiItem>()
@@ -358,8 +367,8 @@
//鍚堟牸鐨勬楠岀粨鏋滅瓑浜庢�绘楠屾暟瑙嗕负鍚堟牸
if (icount == passCount) result = 1;
- useTransactionWithOracle += SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ useTransactionWithOracle +=
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<QsItemIpiReq>()
.SetColumns(s => s.IsPass == result)
@@ -455,4 +464,20 @@
return withOracle;
}
+
+ public bool SJQaSubmit(LLJDto rkjDto)
+ {
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ return db.Updateable<QsItemIpiReq>()
+ .SetColumns(s => s.Fsubmit == 1)
+ .SetColumns(s => s.FsubmitBy == rkjDto.userNo)
+ .SetColumns(s => s.FsubmitDate == DateTime.Now)
+ .Where(s => s.Id == rkjDto.gid)
+ .ExecuteCommand();
+ });
+
+ return useTransactionWithOracle > 0;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3