经销商增加字段及工单服务申请单添加字段及搜索

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商修改.sql

@@ -19,6 +19,7 @@ set changeuserid=$changeuserid$,
     paymans=$paymans$,
     regiontype=$regiontype$,
     u8subject=$u8subject$,
-    recommendedservice=$recommendedservice$
+    recommendedservice=$recommendedservice$,
+    servicetype=$servicetype$
 where siteid = $siteid$
   and sa_agentsid = $sa_agentsid$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商列表查询.sql

@@ -27,7 +27,8 @@ select t1.sys_enterpriseid,
        t1.delivery,
        t1.salearea,
        t1.paymans,
-       t1.regiontype
+       t1.regiontype,
+       t1.servicetype
 from sa_agents t1
          inner join sys_enterprise t2 on t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid
 where t1.siteid = $siteid$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商新增.sql

@@ -1,7 +1,7 @@
 insert into sa_agents(siteid, sa_agentsid, sys_enterpriseid, createby, createdate, changeuserid,
                       changeby, changedate, agentnum, type, parentid,
                       signdate, status, isservice,priceadjustment,entity,submitautocheck,presalesphonenumber,aftersalesphonenumber
-    ,islimitaccessories,islimitorder,signingstate,delivery,salearea,paymans,regiontype,u8subject,recommendedservice)
+    ,islimitaccessories,islimitorder,signingstate,delivery,salearea,paymans,regiontype,u8subject,recommendedservice,servicetype)
 select $siteid$,
        $sa_agentsid$,
        $sys_enterpriseid$,
@@ -29,4 +29,5 @@ select $siteid$,
        $paymans$,
        $regiontype$,
        $u8subject$,
-       $recommendedservice$
+       $recommendedservice$,
+       $servicetype$

src/custom/restcontroller/webmanage/sale/agents/SQL/经销商详情查询.sql

@@ -35,6 +35,7 @@ select t1.sys_enterpriseid,
        t2.paymans,
        t2.regiontype,
        t2.toagentnum,
+       t2.servicetype,
        (SELECT enterprisename  FROM sys_enterprise WHERE sys_enterpriseid = (SELECT sys_enterpriseid FROM sa_agents WHERE sa_agentsid = t2.parentid)) parent_enterprisename,
        t4.erpagentnum,
        t2.isservice,

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

@@ -67,7 +67,7 @@ public class agents extends Controller {
 //        sqlFactory.addParameter("siteid", siteid);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents", "sys_enterpriseid", "isservice",
-                "sa_agentsid","agentnum","priceadjustment","type","signdate","createby","createdate","islimitaccessories","islimitorder","signingstate","delivery","salearea","paymans","regiontype","u8subject");
+                "sa_agentsid","agentnum","priceadjustment","type","signdate","createby","createdate","islimitaccessories","islimitorder","signingstate","delivery","salearea","paymans","regiontype","u8subject","recommendedservice","servicetype");
         querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid","enterprisename","abbreviation"
                 ,"contact","address","phonenumber","province","city","county","grade","saleclassauth");
@@ -286,7 +286,7 @@ public class agents extends Controller {
         String regiontype = content.getStringValue("regiontype");
         String u8subject = content.getStringValue("u8subject");
         String recommendedservice = content.getStringValue("recommendedservice");
-
+        String servicetype = content.getStringValue("servicetype");
 
         if (parentid != 0 && dbConnect.runSqlQuery("select * from sa_agents where siteid='" + siteid + "' and sa_agentsid=" + parentid).isEmpty()) {
             return getErrReturnObject().setErrMsg("指定的上级商户不存在").toString();
@@ -343,6 +343,7 @@ public class agents extends Controller {
         sqlFactory.addParameter("regiontype",regiontype);
         sqlFactory.addParameter("u8subject",u8subject);
         sqlFactory.addParameter("recommendedservice",recommendedservice);
+        sqlFactory.addParameter("servicetype",servicetype);
 
 
         sqllist.add(sqlFactory.getSQL());

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

@@ -560,6 +560,10 @@ public class serviceorder extends Controller {
                 where.append(" and t1.status = '服务中' ");
             }
 
+            if (whereObject.containsKey("initiator") && !"".equals(whereObject.getString("initiator"))) {
+                where.append(" and t1.initiator ='").append(whereObject.getString("initiator")).append("'");
+            }
+
         }
         SQLFactory sqlFactory = new SQLFactory(this, "服务申请单列表查询");
         sqlFactory.addParameter("siteid", siteid);

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

@@ -19,6 +19,7 @@ select  t1.*,
 		t8.itemid,
 		t8.sku,
 		t8.cardno,
+        t8.warrantystatus,
 		t9.itemno,
 		t9.itemname,
 		t9.model,
@@ -27,7 +28,10 @@ select  t1.*,
         t10.abbreviation serviceabbreviation,
         t10.phonenumber servicephonenumber,
         t11.agentnum serviceagentnum,
-        t2.createuserid serviceordercreateuserid
+        t2.createuserid serviceordercreateuserid,
+        t2.createby serviceordercreateby,
+        t2.submitby serviceordersubmitby,
+        t2.isallowance
         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

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

@@ -518,6 +518,14 @@ public class workorder extends Controller {
 
             }
 
+            if (whereObject.containsKey("isonlinesales") && !"".equals(whereObject.getString("isonlinesales"))) {
+                where.append(" and t2.isonlinesales ='").append(whereObject.getBoolean("isonlinesales")).append("'");
+            }
+            if (whereObject.containsKey("initiator") && !"".equals(whereObject.getString("initiator"))) {
+                where.append(" and t2.initiator ='").append(whereObject.getString("initiator")).append("'");
+            }
+
+
         }
         SQLFactory sqlFactory = new SQLFactory(this, "服务工单列表查询");
         sqlFactory.addParameter("siteid", siteid);