优化多组织代码

sjz

17 小时以前 302054e253f1550ee64430882786ec9a3920ec92

 MES.Service/service/QC/XJService.cs

@@ -61,7 +61,8 @@
                             a.Daa018 != "完工")
            .GroupBy((a, b) => new
            {
                b.LineNo, b.LineName
                b.LineNo,
                b.LineName
            })
            .Select((a, b) => new MesLine
            {
@@ -137,6 +138,7 @@
                !"未完成".Equals(queryObj.result),
                (s, a, c, b) => s.FcheckResu != null)
            .WhereIF(id > 0, (s, a, c, b) => s.Id == id)
            //.WhereIF(queryObj.Comments != null, (s, a, c, b) => s.Comments == queryObj.Comments)
            .Select((s, a, c, b) => new QsQaItemXj
            {
                Daa020 = c.LineNo,
@@ -151,26 +153,26 @@
                ItemModel = b.ItemModel,
                FcheckBy = s.FcheckBy,
                FcheckResu = s.FcheckResu,
                Remarks = s.Remarks
                Remarks = s.Remarks,
                Comments = s.Comments
            }).OrderBy(s => s.CreateDate, OrderByType.Desc)
            .ToPageList(queryObj.PageIndex, queryObj.Limit);
    }


    public List<QsQaItemXj01> setJYItem(decimal itemId)
    public List<QsQaItemXj01> setJYItem(string itemNo)
    {
        var db = SqlSugarHelper.GetInstance();

        var count = db.Queryable<MesQa>().Where(s => s.QsType == "2"
            && s.ItemId == itemId && s.Fsubmit == 1).Count();
        var count = db.Queryable<MesQa>().Where(s =>
            s.QsType == "2" && s.ItemNo == itemNo && s.Fsubmit == 1).Count();

        if (count <= 0) return new List<QsQaItemXj01>();

        return db
            .Queryable<MesQualityStandard>()
            .Where(b => b.QsType == "2"
                        && b.ItemId == itemId).Select(
                b => new QsQaItemXj01
            .Where(b => b.QsType == "2" && b.ItemNo == itemNo).Select(b =>
                new QsQaItemXj01
                {
                    ProjName = b.ProjName,
                    ItemMod = b.ItemMod,
@@ -398,8 +400,8 @@

        if (count == passCount) result = 1;

        var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
            db =>
        var useTransactionWithOracle =
            SqlSugarHelper.UseTransactionWithOracle(db =>
            {
                var commit = 0;
                commit += db.Updateable<QsQaItemXj01>()
@@ -503,6 +505,19 @@
        });
    }


    public int saveCommentGid(XJDto dto)
    {
        return SqlSugarHelper.UseTransactionWithOracle(db =>
        {
            return db.Updateable<QsQaItemXj>()
                .SetColumns(it =>
                    it.Comments == dto.Comments) //SetColumns是可以叠加的 写2个就2个字段赋值
                .Where(it => it.Id == dto.gid)
                .ExecuteCommand();
        });
    }

    //子表修改备注字段
    public int saveRemarksPid(XJDto dto)
    {