Merge remote-tracking branch 'origin/develop' into develop-test

src/custom/restcontroller/sale/serviceorder/serviceorder.java

@@ -221,7 +221,7 @@ public class serviceorder extends Controller {
                                     updateSQL.setValue("status", "待受理");
                                     updateSQL.setValue("sys_enterpriseid_service", row.getLong("sys_enterpriseid"));
                                     updateSQL.setDateValue("allocationdate");
-                                    updateSQL.setValue("allocationby", username);
+                                    updateSQL.setValue("allocationby", "自动分配");
                                     sqlList.add(updateSQL.getSQL());
                                     sqlList.add(
                                             DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
@@ -237,7 +237,7 @@ public class serviceorder extends Controller {
                                     updateSQL.setValue("status", "待受理");
                                     updateSQL.setValue("sys_enterpriseid_service", row.getLong("sys_enterpriseid"));
                                     updateSQL.setDateValue("allocationdate");
-                                    updateSQL.setValue("allocationby", username);
+                                    updateSQL.setValue("allocationby", "自动分配");
                                     sqlList.add(updateSQL.getSQL());
                                     sqlList.add(
                                             DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
@@ -254,7 +254,7 @@ public class serviceorder extends Controller {
                                     updateSQL.setValue("status", "待受理");
                                     updateSQL.setValue("sys_enterpriseid_service", row.getLong("sys_enterpriseid"));
                                     updateSQL.setDateValue("allocationdate");
-                                    updateSQL.setValue("allocationby", username);
+                                    updateSQL.setValue("allocationby", "自动分配");
                                     sqlList.add(updateSQL.getSQL());
                                     sqlList.add(
                                             DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
@@ -263,7 +263,7 @@ public class serviceorder extends Controller {
                         }
                     }
                 }else {
-                    Rows serviceagents = dbConnect.runSqlQuery("select t1.sys_enterpriseid,t2.province,t2.city,t2.county from sa_agents t1 inner join sa_agents_salescope  t2  on  t1.sa_agentsid=t2.sa_agentsid and t1.siteid=t2.siteid where t1.siteid='" + siteid + "' and t1.isservice=1");
+                    Rows serviceagents = dbConnect.runSqlQuery("select t1.sys_enterpriseid,t2.province,t2.city,t2.county from sa_agents t1 inner join sa_agents_salescope  t2  on  t1.sa_agentsid=t2.sa_agentsid and t1.siteid=t2.siteid where t1.siteid='" + siteid + "' and status=1 and signingstate!='停用(已止)' and t1.isservice=1");
                     RowsMap countyRowsMap = serviceagents.toRowsMap("county");
                     RowsMap cityRowsMap = serviceagents.toRowsMap("city");
                     RowsMap provinceRowsMap = serviceagents.toRowsMap("province");
@@ -277,7 +277,7 @@ public class serviceorder extends Controller {
                                 updateSQL.setValue("status", "待受理");
                                 updateSQL.setValue("sys_enterpriseid_service", row.getLong("sys_enterpriseid"));
                                 updateSQL.setDateValue("allocationdate");
-                                updateSQL.setValue("allocationby", username);
+                                updateSQL.setValue("allocationby", "自动分配");
                                 sqlList.add(updateSQL.getSQL());
                                 sqlList.add(
                                         DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
@@ -293,7 +293,7 @@ public class serviceorder extends Controller {
                                 updateSQL.setValue("status", "待受理");
                                 updateSQL.setValue("sys_enterpriseid_service", row.getLong("sys_enterpriseid"));
                                 updateSQL.setDateValue("allocationdate");
-                                updateSQL.setValue("allocationby", username);
+                                updateSQL.setValue("allocationby", "自动分配");
                                 sqlList.add(updateSQL.getSQL());
                                 sqlList.add(
                                         DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
@@ -310,7 +310,7 @@ public class serviceorder extends Controller {
                                 updateSQL.setValue("status", "待受理");
                                 updateSQL.setValue("sys_enterpriseid_service", row.getLong("sys_enterpriseid"));
                                 updateSQL.setDateValue("allocationdate");
-                                updateSQL.setValue("allocationby", username);
+                                updateSQL.setValue("allocationby", "自动分配");
                                 sqlList.add(updateSQL.getSQL());
                                 sqlList.add(
                                         DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
@@ -325,7 +325,7 @@ public class serviceorder extends Controller {
                 updateSQL.setSiteid(siteid);
                 updateSQL.setValue("status", "待受理");
                 updateSQL.setDateValue("allocationdate");
-                updateSQL.setValue("allocationby", username);
+                updateSQL.setValue("allocationby", "自动分配");
                 sqlList.add(updateSQL.getSQL());
                 sqlList.add(
                         DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());