VueWebApi/DLL/DAL/ReportManagerDAL.cs
@@ -1406,7 +1406,7 @@
                }
                if (checkuser != "" && checkuser != null)
                {
                    search += "and U.usercode like '%'+@checkuser+'%' ";
                    search += "and U.username like '%'+@checkuser+'%' ";
                    dynamicParams.Add("@checkuser", checkuser);
                }        
                if (opencheckdate != "" && opencheckdate != null)
@@ -1415,14 +1415,9 @@
                    dynamicParams.Add("@opencheckdate", opencheckdate + " 00:00:00");
                    dynamicParams.Add("@closecheckdate", closecheckdate + " 23:59:59");
                }
                if (search == "")
                {
                    search = "and 1=1 ";
                }
                search = search.Substring(3);//截取索引2后面的字符
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.check_type,A.check_typename,A.sampmethod,M.partcode,M.partname,M.partspec,R.hbatchno,
                var sql = @"select A.id,A.check_type,A.check_typename,A.sampmethod,M.partcode,M.partname,M.partspec,R.hbatchno,
                            A.hbarcode,A.customer_code,C.name as customer_name,U.usercode,U.username,A.lm_date,A.check_result 
                            from TStepCheckRecord A
                            inner join TStepCheckRecordSub B on A.id=B.m_id
@@ -1430,7 +1425,7 @@
                            left  join T_BarCodeBill R on A.hbarcode=R.hbarcode
                            left  join TCustomer C on A.customer_code=C.code
                            left  join TUser U on A.check_user=U.usercode
                            where " + search;
                            where A.check_type in('InCheck','OutCheck') " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";