Update SJService getPage method to return total count like LljService

啊鑫

4 天以前 8a53164b2ff75612596a7c65eda284b5a03e01f1

Update SJService getPage method to return total count like LljService

- Modified SJService.getPage() to return tuple with item list and total count
- Updated SJController.GetPage() to handle new return format and include TotalCount
- Added missing properties to SJPageResult based on view definition
- Updated filtering logic to use FSubmit status for better query performance

 StandardPda/MES.Service/Dto/service/SJPageResult.cs

@@ -82,4 +82,28 @@
    /// </summary>
    [SugarColumn(ColumnName = "DAA008")]
    public decimal? Daa008 { get; set; }

    /// <summary>
    ///     提交状态
    /// </summary>
    [SugarColumn(ColumnName = "FSUBMIT")]
    public decimal? FSubmit { get; set; }

    /// <summary>
    ///     提交人
    /// </summary>
    [SugarColumn(ColumnName = "FSUBMIT_BY")]
    public string? FSubmitBy { get; set; }

    /// <summary>
    ///     提交时间
    /// </summary>
    [SugarColumn(ColumnName = "FSUBMIT_DATE")]
    public DateTime? FSubmitDate { get; set; }

    /// <summary>
    ///     工单编号
    /// </summary>
    [SugarColumn(ColumnName = "MOID_NUM")]
    public string? MoidNum { get; set; }
}

 StandardPda/MES.Service/service/QC/SJService.cs

@@ -34,7 +34,7 @@
    }

    //获取所有数据分页
    public List<SJPageResult> getPage(SJPageResult queryObj)
    public (List<SJPageResult> item, int TotalCount) getPage(SJPageResult queryObj)
    {
        var db = SqlSugarHelper.GetInstance();

@@ -43,24 +43,34 @@
        // if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
        //     lineNo = _baseService.getUserLineNo(queryObj.StatusUser);

        var totalCount = 0;

        var data = db.Queryable<SJPageResult>()
            .WhereIF(lineNo != null && lineNo.Length > 0,
                a => lineNo.Contains(a.line))
            .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);
    }


@@ -222,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;
    }
@@ -453,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;
    }
}

 StandardPda/MESApplication/Controllers/QC/SJController.cs

@@ -41,14 +41,14 @@
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new SJService().getPage(queryObj);
            resultInfos.tbBillList = tbBillList;
            var (item, totalCount) = new SJService().getPage(queryObj);
            resultInfos.tbBillList = item;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
                data = resultInfos,
                TotalCount = totalCount
            };
        }
        catch (Exception ex)
@@ -319,4 +319,27 @@
            return ResponseResult.ResponseError(ex);
        }
    }
    
    //IqcQaSubmit
    [HttpPost("SJQaSubmit")]
    public ResponseResult SJQaSubmit(LLJDto rkjDto)
    {
        try
        {
            dynamic resultInfos = new ExpandoObject();
            var tbBillList =
                new SJService().SJQaSubmit(rkjDto);
            resultInfos.tbBillList = tbBillList;
            return new ResponseResult
            {
                status = 0,
                message = "OK",
                data = resultInfos
            };
        }
        catch (Exception ex)
        {
            return ResponseResult.ResponseError(ex);
        }
    }
}