班管家工单节点添加是否必填项及服务预约单统计添加待验收状态2021年12月21日09:50:02

src/rest/openapi/restcontroller/housekeeper/workorder/SQL/服务预约单统计.sql

@@ -1,14 +1,17 @@
-DECLARE @siteid nvarchar(20)=$siteid$,@fagentnum nvarchar(20)=$fagentnum$,@allcount int=0,@pending int =0,@processing int =0,@closed int=0,@created int =0
+DECLARE @siteid nvarchar(20)=$siteid$,@fagentnum nvarchar(20)=$fagentnum$,@allcount int=0,@pending int =0,@tobeaccepted int =0,@processing int =0,@closed int=0,@created int =0
 select @allcount=isnull(sum(1),0) from Serviceform t
 where t.siteid=@siteid and t.fagentnum=@fagentnum
 select @created=isnull(sum(1),0) from Serviceform t
 where t.siteid=@siteid and t.fstatus='待指派' and t.fagentnum=@fagentnum
 select @pending=isnull(sum(1),0) from Serviceform t
 where t.siteid=@siteid and t.fstatus='待处理' and t.fagentnum=@fagentnum
+select @tobeaccepted=isnull(sum(1),0) from Serviceform t
+where t.siteid=@siteid and t.fstatus='待验收' and t.fagentnum=@fagentnum
 select @processing=isnull(sum(1),0) from Serviceform t
 where t.siteid=@siteid and t.fstatus='进行中' and t.fagentnum=@fagentnum
 select @closed=isnull(sum(1),0) from Serviceform t
 where t.siteid=@siteid and t.fstatus='已完成' and t.fagentnum=@fagentnum
 
-select @allcount allcount,@created created,@pending pending,@processing processing,@closed closed
+
+select @allcount allcount,@created created,@pending pending,@tobeaccepted tobeaccepted,@processing processing,@closed closed
 

src/rest/openapi/restcontroller/housekeeperwebapp/workorder/SQL/工单节点详情查询.sql

@@ -21,8 +21,13 @@ select t.frownum,(isnull(t.oneprocessname,'')+isnull(t.twoprocessname,'')) conte
        t.siteid,
        t3.fagentnum,
        t.fisoperator,
-       t.fissignature
+       t.fissignature,
+       t4.ffisupload,
+       t4.ffisaddtitem,
+       t4.ffisqualified,
+       t4.ffissignature
 from ordernode t
 join Workorder t3 on t3.Workorderid=t.fparentid
 left join worker t1 on t1.workphone=t.Operator
+left join Flowwork t4 on t4.workname=isnull(t.oneprocessname,'')+isnull(twoprocessname,'') and t4.siteid=t.siteid
 where EXISTS(select 1 from Workorder t2 where t2.fworknum=$fworknum$ and t2.Workorderid=t.fparentid) and t.FROWNUM=$frownum$