|
|
@@ -166,8 +166,7 @@ public class fqcitems : IHttpHandler, IReadOnlySessionState
|
|
|
LEFT JOIN TP_MST_USER USR ON USR.USERID= m.UPDATEUSERID
|
|
|
WHERE
|
|
|
m.VALUEFLAG = '1'
|
|
|
- AND m.ACCOUNTID = @ACCOUNTID@
|
|
|
- ORDER BY m.UPDATETIME DESC
|
|
|
+ AND m.ACCOUNTID = @ACCOUNTID@
|
|
|
";
|
|
|
List<CDAParameter> sqlPara = new List<CDAParameter>();
|
|
|
sqlPara.Add(new CDAParameter("ACCOUNTID", HttpContext.Current.Session["accountId"]));
|
|
|
@@ -179,7 +178,7 @@ public class fqcitems : IHttpHandler, IReadOnlySessionState
|
|
|
}
|
|
|
if(!string.IsNullOrEmpty(form["INSPECTTYPE"]))
|
|
|
{
|
|
|
- sqlStr += " AND INSTR( m.INSPECTTYPE, @INSPECTTYPE@ ) > 0 ";
|
|
|
+ sqlStr += " AND m.INSPECTTYPE = @INSPECTTYPE@ ";
|
|
|
sqlPara.Add(new CDAParameter("INSPECTTYPE", form["INSPECTTYPE"]));
|
|
|
}
|
|
|
if(!string.IsNullOrEmpty(form["INSPECTNAME"]))
|
|
|
@@ -211,6 +210,11 @@ public class fqcitems : IHttpHandler, IReadOnlySessionState
|
|
|
{
|
|
|
sqlStr += " ORDER BY " + sort + " " + order;
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sqlStr += " ORDER BY m.UPDATETIME DESC " ;
|
|
|
+
|
|
|
+ }
|
|
|
int total = 0;
|
|
|
DataTable dt = conn.SelectPages(page, rows,out total, sqlStr, sqlPara.ToArray());
|
|
|
return new JsonResult(dt) { total = total}.ToJson();
|