Merge remote-tracking branch 'Gogs/develop' into develop

src/apps/afterserviceorder/afterserviceorder.java

@@ -64,6 +64,7 @@ public class afterserviceorder extends PaoCust {
         remote.setValue("FADDRESS",getString("FADDRESS"),11l);
         remote.setValue("scenefname",getString("scenefname"),11l);
         remote.setValue("scenephone",getString("scenephone"),11l);
+        remote.setValue("errormsg",getString("error_msg"),11l);
         hyworkorder.save();
         return remote.getUniqueIDValue();
     }

src/apps/hyworkorder/hyworkorder.java

@@ -328,7 +328,6 @@ public class hyworkorder extends PaoCust {
         Vector<PaoRemote> selection = paoSet.getSelection();
         Iterator<PaoRemote> iterator = selection.iterator();
         PaoSetRemote HYWORKORDER_TEAM = getPaoSet("HYWORKORDER_TEAM");
-        System.out.println("hahahah");
         while(iterator.hasNext()){
             PaoRemote next = iterator.next();
             PaoRemote remote = HYWORKORDER_TEAM.addAtEnd();

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

@@ -48,10 +48,10 @@ public class Afterserviceorder extends Controller {
                 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.servicenum desc");
+            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);
@@ -86,7 +86,7 @@ public class Afterserviceorder extends Controller {
                 tattachment.setOrderBy("tattachmentid desc");
                 tattachment.reset();
                 if(!tattachment.isEmpty()){
-                    Rows rows_url = dbConnect.runSqlQuery("select fobsurl,postfix,type,fdocument from tattachment where ownertable='AFTERSERVICEORDER' and ownerid=" + row.getInteger("ownerid"));
+                    Rows rows_url = dbConnect.runSqlQuery("select fobsurl,postfix,type,fdocument,tattachmentid from tattachment where ownertable='AFTERSERVICEORDER' and ownerid=" + row.getInteger("ownerid"));
                     row.put("url",rows_url);
                 }else{
                     row.put("url",new Rows());

src/rest/openapi/restcontroller/hyworkorder/web/afterserviceorder/SQL/服务单关联工单.sql

@@ -1,4 +1,5 @@
-select t1.fworknum,t1.ftype,t1.fstatus,CONVERT(varchar,t1.createdate,120)createdate,t1.progress,t1.fnotes
+select t1.fworknum,t1.ftype,t1.fstatus,CONVERT(varchar,t1.createdate,120)createdate,t1.progress,t1.fnotes,t1.fprovince,
+       t1.fcity,t1.fcount,t1.faddress
 from Afterserviceorder t
 join hyWorkorder t1 on t.Servicenum=t1.servernum
 where t.servicenum=$servicenum$

src/rest/openapi/restcontroller/hyworkorder/webapp/titem/SQL/服务物料查询.sql

@@ -1 +1,2 @@
-select fitemno,fitemname,fmodel,fspec,fnotes from hyservicetitem where fstatus='ÆôÓÃ'
+select fitemno,fitemname,fmodel,fspec,fnotes from hyservicetitem
+where fstatus='ÆôÓÃ' and $where$

src/rest/openapi/restcontroller/hyworkorder/webapp/titem/titem.java

@@ -28,9 +28,23 @@ public class titem extends Controller {
         if(where!=null){
             DBConnect dbConnect=new DBConnect();
             SQLFactory factory=new SQLFactory(this,"·þÎñÎïÁϲéѯ",pageSize,pageNumber,"fitemno");
+
+            if(where.containsKey("fitemname")&&!StringUtils.isBlank(where.getString("fitemname"))){
+                wherestr+=" and (t.fitemname like '%"+where.getString("fitemname")+"%' " +
+                        "or t.fitemno like '%"+where.getString("fitemname")+"%' "+
+                        "or t.fmodel like '%"+where.getString("fitemname")+"%' "+
+                        "or t.fspec like '%"+where.getString("fitemname")+"%' )";
+            }
+
+            factory.addParameter("where",wherestr);
             Rows rows = dbConnect.runSqlQuery(factory.getSQL());
+
             return getReturnObject_suc_page(rows,false,0).toString();
         }
         return getReturnObject_err("ȱÉÙwhere²ÎÊý").toString();
     }
+
+
+
+
 }

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

@@ -15,6 +15,7 @@ import openapi.base.restful.WebClientRest;
 import ordernode.ordernode;
 import org.apache.commons.lang.StringUtils;
 import org.apache.cxf.ws.security.wss4j.policyvalidators.UsernameTokenPolicyValidator;
+import org.sqlite.core.DB;
 import org.sqlite.date.DateFormatUtils;
 import p2.p2server.P2Server;
 import p2.pao.*;
@@ -691,7 +692,7 @@ public class HyWorkOrder extends Controller {
 //        if(StringUtils.isBlank(fagentnum))return getReturnObject_err("fagentnum为空").toString();
         if(StringUtils.isBlank(siteid))return getReturnObject_err("siteid为空").toString();
         JSONObject where = content.getJSONObject("where");
-        String s[] = {"fworknum","fisscenefname","fistitem","fisperiod","fiserror"};
+        String s[] = {"fworknum","fisscenefname","fistitem","fiserror"};
         for (String s1 : s) {
             if (!where.containsKey(s1) && !StringUtils.isBlank(where.getString(s1)))
                 return getReturnObject_err("缺少" + s1 + "参数").toString();
@@ -706,7 +707,7 @@ public class HyWorkOrder extends Controller {
                     PaoRemote pao = workorder.getPao(0);
                     pao.setValue("fisscenefname",where.getBoolean("fisscenefname"),11l);
                     pao.setValue("fistitem",where.getBoolean("fistitem"),11l);
-                    pao.setValue("fisperiod",where.getBoolean("fisperiod"),11l);
+//                    pao.setValue("fisperiod",where.getBoolean("fisperiod"),11l);
                     pao.setValue("fiserror",where.getBoolean("fiserror"),11l);
                     if(where.containsKey("repairprice")){
                         pao.setValue("repairprice",where.getDouble("repairprice"),11l);
@@ -714,7 +715,15 @@ public class HyWorkOrder extends Controller {
                     if(where.containsKey("errormsg")){
                         pao.setValue("errormsg",where.getString("errormsg"),11l);
                     }
-
+                    if(where.containsKey("scenefname")){
+                        pao.setValue("scenefname",where.getString("scenefname"),11l);
+                    }
+                    if(where.containsKey("scenephone")){
+                        pao.setValue("scenephone",where.getString("scenephone"),11l);
+                    }
+                    if(where.containsKey("ftext")){
+                        pao.setValue("ftext",where.getString("ftext"),11l);
+                    }
                     workorder.save();
                     return getReturnObject_suc().toString();
                 }
@@ -725,8 +734,21 @@ public class HyWorkOrder extends Controller {
         }
         return getReturnObject_err("缺少where参数").toString();
     }
-
-
+    /**工单开始前详情**/
+    public String beforesatrtlist(){
+        JSONObject where = content.getJSONObject("where");
+        String s[] = {"fworknum"};
+        for (String s1 : s) {
+            if (!where.containsKey(s1) && !StringUtils.isBlank(where.getString(s1)))
+                return getReturnObject_err("缺少" + s1 + "参数").toString();
+        }
+        DBConnect dbConnect=new DBConnect();
+        SQLFactory factory=new SQLFactory(this,"工单开始前确认");
+        factory.addParameter("fworknum",where.getString("fworknum"));
+        Rows rows = dbConnect.runSqlQuery(factory.getSQL());
+        if(rows.isEmpty())return getReturnObject_err("没有此工单").toString();
+        return getReturnObject_suc(rows.get(0),false).toString();
+    }
 
 
     /**查询现场联系人，手机号，地址**/

src/rest/openapi/restcontroller/wechatapp/system/docManage.java

@@ -477,7 +477,15 @@ public class docManage extends Controller {
             tattachment.setValue("fobsurl", obsurl);
             if(!StringUtils.isBlank(type)) tattachment.setValue("type", type);
             tattachmentSet.save();
-            return getReturnObject_suc().toString();
+
+
+            Row row=new Row();
+            row.put("fdocument",uploadfile.getFileName());
+            row.put("fobsurl",obsurl);
+            row.put("tattachmentid",tattachment.getUniqueIDValue());
+            row.put("postfix",ftype);
+            row.put("type",type);
+            return getReturnObject_suc(row,false).toString();
 //            tattachment.setValue("docinfoid", docinfo.getUniqueIDValue());
 
         }