Merge branch 'master' of http://121.37.232.241:10101/r/DIXWeb

duan

2024-08-21 22bd5bc1ce2b49284cc2f042c7f4f48619fcf85b

 src/DIXWeb.Business/Workflow/BillBusiness.cs

@@ -129,7 +129,7 @@
            return record;
        }

        public Receive GetInspectBook(string InspectObjectCode, DateTime TimeBegin, DateTime TimeEnd, int Status, int rows, int page,string filterType )
        public Receive GetInspectBook(string InspectObjectCode, DateTime TimeBegin, DateTime TimeEnd, int Status, int rows, int page,string filterType,int UserId )
        {
            int Total = 0;
            Receive record = new Receive();
@@ -145,11 +145,12 @@
                        new System.Data.SqlClient.SqlParameter("@pageSize", rows),
                        new System.Data.SqlClient.SqlParameter("@pageIndex", page),
                        new System.Data.SqlClient.SqlParameter("@FilterType", filterType),
                        new System.Data.SqlClient.SqlParameter("@UserId", UserId),
                        new System.Data.SqlClient.SqlParameter("@Total", Total),
                    };
                    int index = paramList.Length - 1;
                    paramList[index].Direction = ParameterDirection.Output;
                    record.rows = db.Database.SqlQuery<ReceiveInspectBook>("exec biz.p_getInspectBook @InspectObjectCode,@TimeBegin,@TimeEnd,@Status,@pageSize,@pageIndex,@FilterType,@Total output ", paramList).ToList();
                    record.rows = db.Database.SqlQuery<ReceiveInspectBook>("exec biz.p_getInspectBook @InspectObjectCode,@TimeBegin,@TimeEnd,@Status,@pageSize,@pageIndex,@FilterType,@UserId,@Total output ", paramList).ToList();
                    record.total = int.Parse(paramList[index].Value.ToString());
                }
                record.Code = 200;