海盐优化2021年12月18日11:18:26

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/Afterserviceorder.java

@@ -62,11 +62,45 @@ public class Afterserviceorder extends Controller {
         }
         return getReturnObject_err("缺少where参数").toString();
     }
+    /**服务单列表**/
+    public String list_worker(){
+        if(StringUtils.isBlank(hrid))return getReturnObject_err("hrid为空").toString();
+        //if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
+        if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
+        JSONObject where = content.getJSONObject("where");
+        String wherestr="1=1";
+        if(where!=null){
+            DBConnect dbConnect=new DBConnect();
+            if(where.containsKey("fstatus")&&!StringUtils.isBlank(where.getString("fstatus"))){
+                wherestr+=" and fstatus = '"+where.getString("fstatus")+"'";
+            }
+            if(where.containsKey("ftype")&&!StringUtils.isBlank(where.getString("ftype"))){
+                wherestr+=" and ftype = '"+where.getString("ftype")+"'";
+            }
+            if(where.containsKey("startdate")&&!StringUtils.isBlank(where.getString("startdate"))){
+                wherestr+=" and t.createdate >= '"+where.getString("startdate")+"'";
+            }
+            if(where.containsKey("enddate")&&!StringUtils.isBlank(where.getString("enddate"))){
+                wherestr+=" and t.createdate <= '"+where.getString("enddate")+"'";
+            }
+
+            SQLFactory factory=new SQLFactory(this,"服务主管售后单列表查询",pageSize,pageNumber,"case when t.fstatus='新建' then 1\n" +
+                    "when t.fstatus='待处理' then 2\n" +
+                    "when t.fstatus='进行中' then 3\n" +
+                    "when t.fstatus='已完成' then 4 else 5 end,t.createdate desc");
+            //factory.addParameter("fagentnum",fagentnum);
+            factory.addParameter("siteid",siteid);
+            factory.addParameter_SQL("where",wherestr);
+            Rows rows = dbConnect.runSqlQuery(factory.getSQL());
+            return getReturnObject_suc_page(rows,false,0).toString();
+        }
+        return getReturnObject_err("缺少where参数").toString();
+    }
 
     /**服务单详情**/
     public String detail(){
         if(StringUtils.isBlank(hrid))return getReturnObject_err("hrid为空").toString();
-        if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
+        //if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
         if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
         JSONObject where = content.getJSONObject("where");
         String wherestr="1=1";
@@ -115,7 +149,7 @@ public class Afterserviceorder extends Controller {
     /**服务单关联物料**/
     public String titem(){
         if(StringUtils.isBlank(hrid))return getReturnObject_err("hrid为空").toString();
-        if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
+        //if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
         if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
         JSONObject where = content.getJSONObject("where");
         String wherestr="1=1";
@@ -136,7 +170,7 @@ public class Afterserviceorder extends Controller {
     /**服务单关联工单**/
     public String hyworkorder(){
         if(StringUtils.isBlank(hrid))return getReturnObject_err("hrid为空").toString();
-        if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
+        //if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
         if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
         JSONObject where = content.getJSONObject("where");
         String wherestr="1=1";

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/SQL/服务主管售后单列表查询.sql

@@ -0,0 +1,8 @@
+select t.servicenum,convert(varchar,t.createdate,120)createdate,t.fsonum,t.fnotes,t.fstatus,t.Afterserviceordeid ownerid,
+       t.fprovince,
+       t.fcity,
+       t.fcounty,
+       t.faddress,
+       t.backreason
+       from Afterserviceorder t
+where t.siteid=$siteid$ and $where$

src/rest/openapi/restcontroller/hyworkorder/webapp/workorder/HyWorkOrder.java

@@ -126,11 +126,11 @@ public class HyWorkOrder extends Controller {
 						String[] from_nodes = { "frownum", "oneprocessname", "twoprocessname", "operating",
 								"operatingtime", "fnotes", "ownerid", "supid", "ischilden", "isconfirm", "fisupload",
 								"fisaddtitem", "fiscomplete", "fisOperator", "fistext", "fisconfirmation",
-								"fiscontract" };
+								"fiscontract","confirmation" };
 						String[] to_nodes = { "frownum", "oneprocessname", "twoprocessname", "operating",
 								"operatingtime", "fnotes", "hyordernodeid", "supid", "ischilden", "isconfirm",
 								"fisupload", "fisaddtitem", "fiscomplete", "fisOperator", "fistext", "fisconfirmation",
-								"fiscontract" };
+								"fiscontract","confirmation"};
 						for (int i = 0; i < ordernode.count(); i++) {
 
 							PaoRemote pao = ordernode.getPao(i);