zjh
2025-02-21 2a0ac6f8783c138a3fa3937e0594ae339260f5e3
StandardPda/MES.Service/service/QC/LljService.cs
@@ -27,14 +27,14 @@
        var itemIds = GetQaItem(db, queryObj.createUser);
        var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser>((a, b, c) =>
                new JoinQueryInfos(JoinType.Inner, a.ItemId == b.ItemId,
                    JoinType.Inner, b.Sid == c.Fid
        var pageList = db.Queryable<LtsLlj, IqcBefore, SysUser, VMesQaItemsDetect01>((a, b, c,d) =>
                new JoinQueryInfos(JoinType.Left, a.ItemId == b.ItemId,
                    JoinType.Left, b.Sid == c.Fid,JoinType.Inner, a.Id == d.Id
                ))
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                "未完成".Equals(queryObj.result),
                (a, b, c) => a.FcheckResu == null)
                (a, b, c) => a.FcheckResu == null )
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.result) &&
                !"未完成".Equals(queryObj.result),
@@ -44,9 +44,10 @@
                (a, b, c) => itemIds.Contains(a.ItemId))
            .WhereIF(id > 0, (a, b, c) => a.Id == id)
            .OrderByDescending((a, b, c) => a.Id)
            .Select((a, b, c) => new LtsLlj
            .Select((a, b, c, d) => new LtsLlj
            {
                UserName = c.Fname
                UserName = c.Fname,
                FIRST=d.First
            }, true)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);