添加首检的查询条件，添加首检，巡检返回总行数

啊鑫

2 天以前 f2900f2e7a9fef2e536c34e8d8406ac60c0f06ba

 StandardInterface/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,7 +43,7 @@
        if (StringUtil.IsNotNullOrEmpty(queryObj.StatusUser))
            lineNo = _baseService.getUserLineNo(queryObj.StatusUser);

        var data = db.Queryable<SJPageResult>()
        var query = db.Queryable<SJPageResult>()
            .WhereIF(lineNo != null && lineNo.Length > 0,
                a => lineNo.Contains(a.line))
            .WhereIF(queryObj.Id != null, a => a.Id == queryObj.Id)
@@ -56,11 +56,56 @@
            .WhereIF(
                StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
                !"未完成".Equals(queryObj.Result),
                a => a.Result != "未完成")
            .OrderBy(a => a.BillNo, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
                a => a.Result != "未完成");

        return data;
        // 新增的动态搜索逻辑
        if (!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField))
        {
            switch (queryObj.searchField)
            {
                case "daa001":  // 工单
                    query = query.Where(x => x.daa001.Contains(queryObj.SearchValue));
                    break;
                case "billNo":  // 检验单号
                    query = query.Where(x => x.BillNo.Contains(queryObj.SearchValue));
                    break;
                case "line":    // 产线
                    query = query.Where(x => x.line.Contains(queryObj.SearchValue));
                    break;
                case "itemNo":  // 物料编码
                    query = query.Where(x => x.ItemNo.Contains(queryObj.SearchValue));
                    break;
                case "daa003":  // 物料名称
                    query = query.Where(x => x.Daa003.Contains(queryObj.SearchValue));
                    break;
                default:
                    // 如果没有指定字段或字段不匹配，使用原有的模糊查询逻辑作为兜底方案
                    query = query.Where(x => 
                        x.ItemNo.Contains(queryObj.SearchValue) ||
                        x.Daa003.Contains(queryObj.SearchValue) ||
                        x.daa001.Contains(queryObj.SearchValue) ||
                        x.BillNo.Contains(queryObj.SearchValue) ||
                        x.line.Contains(queryObj.SearchValue));
                    break;
            }
        }
        // 为了兼容旧版本，如果没有传递 searchField，使用原来的查询逻辑
        else if (string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue))
        {
            // 保持原有的多字段模糊查询逻辑
            query = query.Where(x => 
                x.ItemNo.Contains(queryObj.SearchValue) ||
                x.Daa003.Contains(queryObj.SearchValue) ||
                x.daa001.Contains(queryObj.SearchValue) ||
                x.BillNo.Contains(queryObj.SearchValue) ||
                x.line.Contains(queryObj.SearchValue));
        }

        var totalCount = 0;
        var data = query.OrderBy(a => a.BillNo, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);

        return (data, totalCount);
    }


@@ -224,7 +269,7 @@
        item.Items = getQSItems(qsItemIpiReq.Id, null);
        var sjPageResult = new SJPageResult
            { Id = item.From.Id, Limit = 1, PageIndex = 1 };
        item.Result = getPage(sjPageResult)[0];
        item.Result = getPage(sjPageResult).item[0];

        return item;
    }