Merge remote-tracking branch 'origin/ht' into ht

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java

@@ -166,7 +166,7 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer
             hrparam.put("AccessToken", hrtoken);
             hrparam.put("LogonInfo", "LoginName=" + hrloginname + "&BusinessUnit=0&LogonRegion=zh-CN&ExpiredDate=" + hu.getExpiredDate() + "&ServiceCode=createleave");
             JSONObject data = new JSONObject();
-            data.put("formno", requestid);
+            data.put("formno", getForm(requestid));
             JSONArray detail = new JSONArray();
             JSONObject jo = new JSONObject();
             jo.put("Employeeid", GH);
@@ -260,6 +260,13 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer
         }
     }
 
+    private static String getForm(String requestid){
+        String newform = "";
+        if(requestid.length()>8){
+            newform = "1"+requestid.substring(requestid.length()-8);
+        }
+        return newform;
+    }
     Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
         if (key != null && !key.isEmpty()) {
             map.put(key, value);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GNCC_Action.java

@@ -372,7 +372,7 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles
                 JSONObject hrparam = new JSONObject();
                 hrparam.put("AccessToken", hrtoken);
                 JSONObject data = new JSONObject();
-                data.put("formno", reid);
+                data.put("formno", getForm(reid));
                 JSONArray detail = new JSONArray();
                 JSONObject jo = new JSONObject();
                 jo.put("Employeeid", errandEmpNum);
@@ -491,7 +491,7 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles
                 if ("0".equals(sfytshr)) {
                     hrparam.put("LogonInfo", "LoginName=" + hrloginname + "&BusinessUnit=0&LogonRegion=zh-CN&ExpiredDate=" + hu.getExpiredDate() + "&ServiceCode=applyformleave");
                     data = new JSONObject();
-                    data.put("formno", reid);
+                    data.put("formno", getForm(reid));
                     data.put("reason", "审批完成归档");
                     hrparam.put("Data", data);
                 } else {
@@ -825,4 +825,12 @@ public class ZOA_SL_GNCC_Action extends BaseBean implements Action, EsbServerles
         }
         return map;
     }
+
+    private static String getForm(String requestid){
+        String newform = "";
+        if(requestid.length()>8){
+            newform = "1"+requestid.substring(requestid.length()-8);
+        }
+        return newform;
+    }
 }

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java

@@ -482,12 +482,12 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles
                 JSONObject data = new JSONObject();
                 if ("0".equals(sfytshr)) {
                     hrparam.put("LogonInfo", "LoginName=" + hrloginname + "&BusinessUnit=0&LogonRegion=zh-CN&ExpiredDate=" + hu.getExpiredDate() + "&ServiceCode=applyformleave");
-                    data.put("formno", reid);
+                    data.put("formno", getForm(reid));
                     data.put("reason", "审批完成归档");
                     hrparam.put("Data", data);
                 } else {
                     hrparam.put("LogonInfo", "LoginName=" + hrloginname + "&BusinessUnit=0&LogonRegion=zh-CN&ExpiredDate=" + hu.getExpiredDate() + "&ServiceCode=createleave");
-                    data.put("formno", reid);
+                    data.put("formno", getForm(reid));
                     data.put("detail", detail);
                     hrparam.put("Data", data);
                 }
@@ -844,4 +844,12 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles
         }
         return map;
     }
+
+    private static String getForm(String requestid){
+        String newform = "";
+        if(requestid.length()>8){
+            newform = "1"+requestid.substring(requestid.length()-8);
+        }
+        return newform;
+    }
 }