台州工单接口更新

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/Afterserviceorder.java

@@ -349,9 +349,9 @@ public class Afterserviceorder extends Controller {
                 if(getpaoset.isEmpty())return getReturnObject_err("没有该服务单").toString();
                 PaoRemote remote = getpaoset.getPao(0);
                 if(where.containsKey("servicetype")) {
-                	if(where.getString("servicetype").equals("售中") || where.getString("servicetype").equals("售中")) {
+                	if(!where.getString("servicetype").equals("售前")) {
                 		 if(!where.containsKey("fsonum")) {
-                			 return getReturnObject_err("售中及售后的服务单需添加关联订单号").toString();
+                			 return getReturnObject_err("售中及售后及历史售后的服务单需添加关联订单号").toString();
                 		 }
                 	}
                 	 remote.setValue("servicetype",where.getString("servicetype"),11l); 

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

@@ -80,8 +80,8 @@ public class HyWorkOrder extends Controller {
             if(where.containsKey("customerphone")&&!StringUtils.isBlank(where.getString("customerphone"))){
                 wherestr+=" and PROJECTLEADER = '"+where.getString("projectleader")+"'";
             }
-            SQLFactory factory=new SQLFactory(this,"工单列表查询",pageSize,pageNumber,"t.fworknum desc");
-            factory.addParameter("fagentnum",fagentnum);
+            SQLFactory factory=new SQLFactory(this,"服务人员行程列表查询",pageSize,pageNumber,"t.fworknum desc");
+            //factory.addParameter("fagentnum",fagentnum);
             factory.addParameter("siteid",siteid);
             factory.addParameter_SQL("where",wherestr);
             Rows rows = dbConnect.runSqlQuery(factory.getSQL());

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

@@ -0,0 +1,10 @@
+select t.fworknum,convert(char(24),t.createdate,120)createdate,t.ftype,(isnull(t.FPROVINCE,'')+isnull(t.FCITY,'')+isnull(t.FCOUNTY,0)) fcounty,t.faddress,t1.fname projectleader,t.fstatus,t.progress,t.customername,
+       (
+           select count(1) from ordernode t2 where t2.fparentid=t.Workorderid and ischilden=0 and isconfirm=1
+       ) confirmcount,
+       (
+           select count(1) from ordernode t2 where t2.fparentid=t.Workorderid and ischilden=0
+       )count,isnull(convert (varchar,acceptancedate,120),'')acceptancedate,t.Workorderid ownerid
+from Workorder t
+left join worker t1 on t1.workphone=t.ProjectLeader
+where  t.siteid=$siteid$ and $where$