bug优化

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

@@ -194,6 +194,45 @@ public class serviceorder extends Controller {
                                 DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
                     }
                 }
+            }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");
+                RowsMap countyRowsMap = serviceagents.toRowsMap("county");
+                RowsMap cityRowsMap = serviceagents.toRowsMap("city");
+                RowsMap provinceRowsMap = serviceagents.toRowsMap("province");
+                if (countyRowsMap.containsKey(rows.get(0).getString("county"))) {
+                    UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_serviceorder");
+                    updateSQL.setUniqueid(sa_serviceorderid);
+                    updateSQL.setSiteid(siteid);
+                    updateSQL.setValue("status", "待受理");
+                    updateSQL.setValue("sys_enterpriseid_service", countyRowsMap.get(rows.get(0).getString("county")).get(0).getLong("sys_enterpriseid"));
+                    updateSQL.setDateValue("allocationdate");
+                    updateSQL.setValue("allocationby", username);
+                    sqlList.add(updateSQL.getSQL());
+                    sqlList.add(
+                            DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
+                } else if (cityRowsMap.containsKey(rows.get(0).getString("city"))) {
+                    UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_serviceorder");
+                    updateSQL.setUniqueid(sa_serviceorderid);
+                    updateSQL.setSiteid(siteid);
+                    updateSQL.setValue("status", "待受理");
+                    updateSQL.setValue("sys_enterpriseid_service", cityRowsMap.get(rows.get(0).getString("city")).get(0).getLong("sys_enterpriseid"));
+                    updateSQL.setDateValue("allocationdate");
+                    updateSQL.setValue("allocationby", username);
+                    sqlList.add(updateSQL.getSQL());
+                    sqlList.add(
+                            DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
+                } else if (provinceRowsMap.containsKey(rows.get(0).getString("province"))) {
+                    UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_serviceorder");
+                    updateSQL.setUniqueid(sa_serviceorderid);
+                    updateSQL.setSiteid(siteid);
+                    updateSQL.setValue("status", "待受理");
+                    updateSQL.setValue("sys_enterpriseid_service", provinceRowsMap.get(rows.get(0).getString("province")).get(0).getLong("sys_enterpriseid"));
+                    updateSQL.setDateValue("allocationdate");
+                    updateSQL.setValue("allocationby", username);
+                    sqlList.add(updateSQL.getSQL());
+                    sqlList.add(
+                            DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "自动分配", "服务申请单自动分配成功").getSQL());
+                }
             }
             Rows workersRows = dbConnect.runSqlQuery(
                     "select  t3.phonenumber from sys_hr t1 left join sys_users t3 on t1.userid = t3.userid left join sys_hr t4 on t1.siteid = t4.siteid and t1.reporthrid = t4.hrid where t1.siteid = '"
@@ -231,9 +270,10 @@ public class serviceorder extends Controller {
         if (rows.isEmpty()) {
             return getErrReturnObject().setErrMsg("该服务申请单不存在").toString();
         }
-        if (!rows.get(0).getString("status").equals("待分配") && !rows.get(0).getString("status").equals("手工完结") && !rows.get(0).getString("status").equals("拒绝受理")) {
-            return getErrReturnObject().setErrMsg("非待分配或手工完结或拒绝受理的服务申请单无法分配服务商").toString();
+        if (rows.get(0).getString("status").equals("新建") || rows.get(0).getString("status").equals("已完结")) {
+            return getErrReturnObject().setErrMsg("非新建或完结的服务申请单无法分配服务商").toString();
         }
+        ArrayList<String> sqllist = new ArrayList<>();
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_serviceorder");
         updateSQL.setUniqueid(sa_serviceorderid);
         updateSQL.setSiteid(siteid);
@@ -243,10 +283,12 @@ public class serviceorder extends Controller {
         updateSQL.setValue("refuseremarks", "");
         updateSQL.setDateValue("allocationdate");
         updateSQL.setValue("allocationby", username);
-
-        dbConnect.runSqlUpdate(updateSQL.getSQL());
-        dbConnect.runSqlUpdate(
-                DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "手工分配", "服务申请单手工分配成功").getSQL());
+        if(rows.get(0).getString("status").equals("待服务") || rows.get(0).getString("status").equals("服务中")){
+            sqllist.add("update sa_workorder set status='作废' where sa_serviceorderid ="+sa_serviceorderid);
+        }
+        sqllist.add(updateSQL.getSQL());
+        sqllist.add(DataContrlLog.createLog(this, "sa_serviceorder", sa_serviceorderid, "手工分配", "服务申请单手工分配成功").getSQL());
+        dbConnect.runSqlUpdate(sqllist);
         return getSucReturnObject().toString();
     }
 

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

@@ -256,6 +256,15 @@ public class aftersalesmag extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t4", "t4.sa_agentsid=t6.sa_agentsid and t4.siteid=t6.siteid", "agentnum", "sa_agentsid");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t5", "t5.sys_enterpriseid=t4.sys_enterpriseid and t5.siteid=t4.siteid", "enterprisename", "abbreviation", "sys_enterpriseid");
         querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t7", "t6.sa_customersid=t7.sa_customersid and t6.siteid=t7.siteid", "name", "phonenumber", "province", "city", "county", "address");
+        querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t8", "t8.agentnum=t6.toagentnum and t8.siteid=t6.siteid");
+        querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t9", "t9.sys_enterpriseid=t8.sys_enterpriseid and t9.siteid=t8.siteid");
+
+        querySQL.addQueryFields("sa_agentsid_service","t8.sa_agentsid");
+        querySQL.addQueryFields("agentnum_service","t8.agentnum");
+        querySQL.addQueryFields("enterprisename_service","t9.enterprisename");
+        querySQL.addQueryFields("abbreviation_service","t9.abbreviation");
+        querySQL.addQueryFields("sys_enterpriseid_service","t9.sys_enterpriseid");
+
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t6.sa_customersid", sa_customersid);
         querySQL.setWhere(where.toString());

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

@@ -48,7 +48,7 @@ public class serviceorder extends Controller {
         String tableName = "sa_serviceorder";
         Long sa_serviceorderid = content.getLong("sa_serviceorderid");
         String servicetype = content.getString("servicetype"); //服务分类
-        if (content.containsKey("sys_enterpriseid")) {
+        if (sys_enterpriseid<=0) {
             sys_enterpriseid = content.getLong("sys_enterpriseid");
         }
         String remarks = content.getStringValue("remarks");
@@ -867,7 +867,7 @@ public class serviceorder extends Controller {
 
 //    private String sendMessage_0(String phone, String verificationCode) throws Exception {
 //        HttpURLRest rest = new HttpURLRest("http://smssh1.253.com/msg/v1/send/json");
-//        rest.addHeader("Content-type", "application/json");
+//        rest.addHeader("Content-type", "applica分配tion/json");
 //        JSONObject jsonObject = new JSONObject();
 //        jsonObject.put("account", "N3147701");
 //        jsonObject.put("password", "4ClGyab6fv6a87");