服务工单

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单列表查询.sql

@@ -2,6 +2,8 @@ select  t1.*,
         t2.billno servicebillno,
         t2.class1,
         t2.class2,
+        t2.name customername,
+        t2.phonenumber customerphonenumber,
         t4.name templatename,
         t6.agentnum,
         t5.abbreviation,

src/custom/restcontroller/webmanage/sale/workorder/SQL/服务工单状态统计.sql

@@ -2,12 +2,17 @@ select COUNT(1) totalCount,
     ifnull(SUM(CASE WHEN t1.status = '待接单' THEN 1 ELSE 0 END),0) toacceptCount,
 	ifnull(SUM(CASE WHEN t1.status = '待开始' THEN 1 ELSE 0 END),0) tostartCount,
 	ifnull(SUM(CASE WHEN t1.status = '进行中' THEN 1 ELSE 0 END),0) startingCount,
-	ifnull(SUM(CASE WHEN t1.status = '已完成' THEN 1 ELSE 0 END),0) completeCount,
-	ifnull(SUM(CASE WHEN t1.status = '暂停' THEN 1 ELSE 0 END),0) tostopCount
+	ifnull(SUM(CASE WHEN t1.status = '已完工' THEN 1 ELSE 0 END),0) completeCount,
+	ifnull(SUM(CASE WHEN t1.status = '提交' THEN 1 ELSE 0 END),0) submitCount
 from sa_workorder t1
    left join sa_serviceorder t2 on t1.sa_serviceorderid=t2.sa_serviceorderid and t1.siteid=t2.siteid 
    left join sa_workorder_template t4 on t1.sa_workorder_templateid=t4.sa_workorder_templateid and t1.siteid=t4.siteid
    left join sys_enterprise t5 on t5.sys_enterpriseid=t1.sys_enterpriseid and t1.siteid=t5.siteid
    left join sa_agents t6 on t6.sys_enterpriseid=t1.sys_enterpriseid and t1.siteid=t6.siteid
    left join sys_hr t7 on t7.hrid=t2.saler_hrid and t7.siteid=t2.siteid
+   left join (SELECT * FROM (SELECT *,ROW_NUMBER() OVER (PARTITION BY sa_serviceorderid ORDER BY sa_serviceorderitemsid ASC) AS rowno FROM sa_serviceorderitems) t WHERE rowno = 1) t8 on t8.sa_serviceorderid=t1.sa_serviceorderid and t8.siteid=t1.siteid
+   left join plm_item t9 on t9.itemid=t8.itemid and t9.siteid=t8.siteid
+   LEFT JOIN sys_enterprise t10 ON t10.sys_enterpriseid = t2.sys_enterpriseid_service
+    AND t10.siteid = t2.siteid
+   LEFT JOIN sa_agents t11 ON t11.sys_enterpriseid = t10.sys_enterpriseid
 where t1.siteid=$siteid$ and t1.status<>'作废' 

src/custom/restcontroller/webmanage/sale/workorder/workorder.java

@@ -326,6 +326,9 @@ public class workorder extends Controller {
 //                            " and exists(select 1 from sys_datateam where ownerid=t1.sa_workorderid and ownertable='sa_workorder' and userid='")
 //                    .append(userid).append("')");
 //        }
+        if(sys_enterpriseid!=0){
+            where.append(" and t2.sys_enterpriseid_service ='").append(sys_enterpriseid).append("'");
+        }
 
         if (content.containsKey("where")) {
             JSONObject whereObject = content.getJSONObject("where");
@@ -335,6 +338,7 @@ public class workorder extends Controller {
                 where.append("or t1.remarks like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
+
             if (whereObject.containsKey("status") && !"".equals(whereObject.getString("status"))) {
                 where.append(" and t1.status ='").append(whereObject.getString("status")).append("'");
             }
@@ -736,8 +740,8 @@ public class workorder extends Controller {
             sa_serviceorderid = rows.get(0).getLong("sa_serviceorderid");
         }
         for (Row row : rows) {
-            if (row.getString("status").equals("已完成")) {
-                return getErrReturnObject().setErrMsg("单号为：【" + row.getString("billno") + "】的工单为非已完成状态，无法作废工单")
+            if (row.getString("status").equals("已完工")) {
+                return getErrReturnObject().setErrMsg("单号为：【" + row.getString("billno") + "】的工单为非已完工状态，无法作废工单")
                         .toString();
             }
         }
@@ -837,7 +841,7 @@ public class workorder extends Controller {
                         + "' and sa_workorderid !=" + sa_workorderid);
         boolean isallcomplete = true;
         for (int i = 0; i < workorders.size(); i++) {
-            if (!workorders.get(i).getString("status").equals("已完成")
+            if (!workorders.get(i).getString("status").equals("已完工")
                     && !workorders.get(i).getString("status").equals("关闭")
                     && !workorders.get(i).getString("status").equals("作废")) {
                 isallcomplete = false;
@@ -879,7 +883,7 @@ public class workorder extends Controller {
 
         }
 
-        sqlList.add("update sa_workorder set status='已完成',finishby='" + username
+        sqlList.add("update sa_workorder set status='已完工',finishby='" + username
                 + "',finishdate=CURRENT_TIME  where sa_workorderid=" + sa_workorderid);
         sqlList.add(DataContrlLog.createLog(this, "sa_workorder", sa_workorderid, "工单完结", "服务工单完结成功").getSQL());