服务人员行程查询条件由进行中变为非作废

src/rest/openapi/restcontroller/hyworkorder/web/workorder/HyWorkOrder.java

@@ -76,7 +76,7 @@ public class HyWorkOrder extends Controller {
         if(StringUtils.isBlank(hrid))return getReturnObject_err("hridΪ¿Õ").toString();
         if(StringUtils.isBlank(siteid))return getReturnObject_err("siteidΪ¿Õ").toString();
         JSONObject where = content.getJSONObject("where");
-        String wherestr="t.fstatus='½øÐÐÖÐ' ";
+        String wherestr="t.fstatus<>'×÷·Ï' ";
         if(where!=null){
             DBConnect dbConnect=new DBConnect();
             if(where.containsKey("projectleader")&&!StringUtils.isBlank(where.getString("projectleader"))){

src/rest/openapi/restcontroller/hyworkorder/web/workorder/SQL/服务人员行程列表查询.sql

@@ -1,4 +1,4 @@
-select t.fworknum,t.fprovince+t.fcity+t.fcounty+t.faddress faddress,convert(varchar,t.ACCEPTANCEDATE,120)createdate,t.progress,
+select t.fstatus,t.fworknum,t.fprovince+t.fcity+t.fcounty+t.faddress faddress,convert(varchar,t.ACCEPTANCEDATE,120)createdate,t.progress,
 (
   select top 1 isnull(t1.oneprocessname,'')+isnull(t1.twoprocessname,'')  from hyordernode t1 where t1.fparentid=t.hyWorkorderid and t1.isconfirm=0 and t1.ischilden=0 order by t1.FROWNUM
 )curcontent