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

src/apps/afterserviceorder/afterserviceorder.java

@@ -1,5 +1,6 @@
 package afterserviceorder;
 
+import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -8,6 +9,7 @@ import baseclass.tools.GetFieldsName;
 import openapi.base.SQLFactory;
 import openapi.base.data.Rows;
 import openapi.base.data.db.DBConnect;
+import openapi.restcontroller.housekeeperpublic.tools.HttpURLRest;
 import p2.p2server.P2Server;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSet;
@@ -153,6 +155,35 @@ public class afterserviceorder extends PaoCust {
         if(issubmit){
             if(!getString("fstatus").equals("新建"))throw new P2AppException("","非新建不可提交");
             setValue("fstatus","待处理",11l);
+            try {
+                PaoSetRemote hyworker = P2Server.getP2Server().getPaoSet("HYWORKER", P2Server.getP2Server().getSystemUserInfo());
+                hyworker.setWhere("ROLE='服务主管'");
+                hyworker.reset();
+                PaoSetRemote tagents =getPaoSet("TAGENTS");
+                String fagentshortname = tagents.getPao(0).getString("FAGENTSHORTNAME");
+                int size = hyworker.count();
+                while (size>0){
+                    String phone = hyworker.getPao(size-1).getString("WORKPHONE");
+                    HttpURLRest rest = new HttpURLRest("http://smssh1.253.com/msg/v1/send/json");
+                    rest.addHeader("Content-type", "application/json");
+                    org.json.JSONObject jsonObject = new org.json.JSONObject();
+                    jsonObject.put("account", "N3147701");
+                    jsonObject.put("password", "4ClGyab6fv6a87");
+                    jsonObject.put("msg", "【Banninger】服务单号：" + getString("SERVICENUM") + "已指派请处理，客户名称："+fagentshortname+",提交人："+getString("SUBMITBY")+"，备注："+getString("FNOTES"));
+                    jsonObject.put("phone", phone);
+                    rest.addRawBody(jsonObject.toString());
+                    String s = rest.post();
+                    PaoSetRemote verCodehistory = P2Server.getP2Server().getPaoSet("VerCodehistory", P2Server.getP2Server().getSystemUserInfo());
+                    PaoRemote remote = verCodehistory.addAtEnd();
+                    remote.setValue("phone", phone);
+                    remote.setValue("msg", "【Banninger】服务单号：" + getString("SERVICENUM") + "已指派请处理，客户名称："+fagentshortname+",提交人："+getString("SUBMITBY")+"，备注："+getString("FNOTES"));
+                    remote.setValue("content", s);
+                    verCodehistory.save();
+                    size--;
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
     }
 }

src/apps/ficashbill/ficashbill.java

@@ -3,6 +3,7 @@ package ficashbill;
 import baseclass.PaoCust;
 import baseclass.tools.GetFieldsName;
 import baseclass.tools.Math;
+import p2.p2server.P2Server;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSet;
 import p2.pao.PaoSetRemote;
@@ -613,5 +614,28 @@ public class ficashbill extends PaoCust {
         pao.setValue("famount", -funwriteoffamount);
         return pao.getUniqueIDValue();
     }
+    @Override
+    public PaoSetRemote fieldGetlist(Object paoField, PaoSetRemote list, String fieldname) throws P2Exception {
+        if ("FAGENTNUM".equals(fieldname)) {
+            PaoSetRemote users = P2Server.getP2Server().getPaoSet("PP_USERS", P2Server.getP2Server().getSystemUserInfo());
+            PaoSetRemote tagentsales = P2Server.getP2Server().getPaoSet("tagentsales", P2Server.getP2Server().getSystemUserInfo());
+            users.setWhere("fusertype='ÏúÊÛÖúÀí' and hrid = '"+getUserName()+"'");
+            String fagentstr = "";
+            if(!users.isEmpty()){
+                tagentsales.setWhere("fsalenum='"+getUserName()+"' and fagentnum is not null");
+                tagentsales.reset();
+                int size = tagentsales.count();
+                System.out.println("size="+size);
+                while (size>0){
+                    String fagentnum = tagentsales.getPao(size-1).getString("fagentnum");
+                    fagentstr +="'"+fagentnum+"',";
+                    size--;
+                }
+                fagentstr = fagentstr.substring(0,fagentstr.length()-1);
 
+            }
+            list.setWhere("fagentnum in(" +fagentstr +")");
+        }
+        return super.fieldGetlist(paoField, list, fieldname);
+    }
 }

src/apps/hyworkorder/hyworkorder.java

@@ -5,6 +5,7 @@ import baseclass.tools.GetFieldsName;
 import openapi.base.data.Row;
 import openapi.base.data.Rows;
 import openapi.base.data.db.DBConnect;
+import openapi.restcontroller.housekeeperpublic.tools.HttpURLRest;
 import p2.p2server.P2Server;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSet;
@@ -12,6 +13,7 @@ import p2.pao.PaoSetRemote;
 import p2.util.P2AppException;
 import p2.util.P2Exception;
 
+import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
@@ -181,6 +183,37 @@ public class hyworkorder extends PaoCust {
 				PaoRemote remote = paoSet.addAtEnd();
 				remote.setValue("hyworkernum", getString("PROJECTLEADER"), 2l);
 			}
+			try {
+			    PaoSetRemote hyworker = P2Server.getP2Server().getPaoSet("hyworker", P2Server.getP2Server().getSystemUserInfo());
+			    PaoSetRemote tagents = P2Server.getP2Server().getPaoSet("tagents", P2Server.getP2Server().getSystemUserInfo());
+			    PaoSetRemote afterserviceorder = P2Server.getP2Server().getPaoSet("AFTERSERVICEORDER", P2Server.getP2Server().getSystemUserInfo());
+			    afterserviceorder.setWhere("SERVICENUM='"+getString("SERVERNUM")+"'");
+			    tagents.setWhere("FAGENTNUM='"+getString("FAGENTNUM")+"'");
+			    hyworker.setWhere("HYWORKERNUM ='" + getString("PROJECTLEADER") + "'");
+			    hyworker.reset();
+			    if(!hyworker .isEmpty()){
+			        String submitby = afterserviceorder.getPao(0).getString("SUBMITBY");
+			        String phone = hyworker.getPao(0).getString("WORKPHONE");
+			        String fagentshortname = tagents.getPao(0).getString("FAGENTSHORTNAME");
+			        HttpURLRest rest = new HttpURLRest("http://smssh1.253.com/msg/v1/send/json");
+			        rest.addHeader("Content-type", "application/json");
+			        org.json.JSONObject jsonObject = new org.json.JSONObject();
+			        jsonObject.put("account", "N3147701");
+			        jsonObject.put("password", "4ClGyab6fv6a87");
+			        jsonObject.put("msg", "【Banninger】工单号：" + getString("FWORKNUM") + "已指派请处理，客户名称："+fagentshortname+",提交人："+submitby+"，备注："+getString("FNOTES"));
+			        jsonObject.put("phone", phone);
+			        rest.addRawBody(jsonObject.toString());
+			        String s = rest.post();
+			        PaoSetRemote verCodehistory = P2Server.getP2Server().getPaoSet("VerCodehistory", P2Server.getP2Server().getSystemUserInfo());
+			        PaoRemote remote = verCodehistory.addAtEnd();
+			        remote.setValue("phone", phone);
+			        remote.setValue("msg", "【Banninger】工单号：" + getString("FWORKNUM") + "已指派请处理，客户名称："+fagentshortname+",提交人："+submitby+"，备注："+getString("FNOTES"));
+			        remote.setValue("content", s);
+			        verCodehistory.save();
+			    }
+			} catch (IOException e) {
+			    e.printStackTrace();
+			}
 		}
 
 	}

src/apps/twriteoffbill/twriteoffbill.java

@@ -4,6 +4,7 @@ import baseclass.PaoCust;
 import baseclass.tools.Math;
 import openapi.base.data.Rows;
 import openapi.base.data.db.DBConnect;
+import p2.p2server.P2Server;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSet;
 import p2.pao.PaoSetRemote;
@@ -222,4 +223,29 @@ public class twriteoffbill extends PaoCust {
             setValue("fwriteoffamount", getDouble(fieldname), 11L);
         }
     }
+    @Override
+    public PaoSetRemote fieldGetlist(Object paoField, PaoSetRemote list, String fieldname) throws P2Exception {
+        if ("FAGENTNUM".equals(fieldname)) {
+            PaoSetRemote users = P2Server.getP2Server().getPaoSet("PP_USERS", P2Server.getP2Server().getSystemUserInfo());
+            PaoSetRemote tagentsales = P2Server.getP2Server().getPaoSet("tagentsales", P2Server.getP2Server().getSystemUserInfo());
+            users.setWhere("fusertype='ÏúÊÛÖúÀí' and hrid = '"+getUserName()+"'");
+            String fagentstr = "";
+            if(!users.isEmpty()){
+                tagentsales.setWhere("fsalenum='"+getUserName()+"' and fagentnum is not null");
+                tagentsales.reset();
+                int size = tagentsales.count();
+                System.out.println("size="+size);
+                while (size>0){
+                    String fagentnum = tagentsales.getPao(size-1).getString("fagentnum");
+                    fagentstr +="'"+fagentnum+"',";
+                    size--;
+                }
+                fagentstr = fagentstr.substring(0,fagentstr.length()-1);
+
+            }
+            list.setWhere("fagentnum in(" +fagentstr +")");
+        }
+        return super.fieldGetlist(paoField, list, fieldname);
+    }
+    
 }