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

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/easoa/DelayDateService.java

@@ -23,6 +23,7 @@ public class DelayDateService extends BaseBean {
     public String[] callService(SyncDelayDateInfo param) {
 //        String url = Util.null2String(I18nContextUtil.getBean(Environment.class).getProperty("hteasoasync.DelayDateSync")).trim();
         String url = configProp.getDelayDateSync();
+        logger_cf6b843f.info("url = " + url );
         String[] str = new String[2];
         try {
             logger_cf6b843f.info(String.valueOf("DelayDateService--start"));
@@ -32,6 +33,7 @@ public class DelayDateService extends BaseBean {
             DelayDateSyncService req = new DelayDateSyncService();
             req.setSyncDelayDateInfo(param);
             DelayDateSyncServiceResponse res = stub.delayDateSyncService(req);
+            logger_cf6b843f.info(String.valueOf("res"));
             DelayDateSyncServiceStub.ResultInfo resultInfo = res.get_return();
             str[0] = resultInfo.getIstat();
             str[1] = resultInfo.getSrmsage();

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java

@@ -278,6 +278,7 @@ public class BillFieldUtil {
 	 * @return
 	 */
 	public String getTablename(String wfid) {
+		logger_6c507bbc.info("getTablename start " + wfid);
 		String tbname = "";
 		String fmid = "";
 		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);

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

@@ -56,7 +56,8 @@ public class CheckEmailAction extends BaseBean implements Action, EsbServerlessR
             try {
                 BillFieldUtil unit = new BillFieldUtil();
                 String wfid = request.getWorkflowid();
-                String tablename = unit.getTablename(wfid);
+//                String tablename = unit.getTablename(wfid);
+                String tablename = request.getRequestManager().getBillTableName();
                 // 用户工号
                 String yhgh = "";
                 // 系统ID

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

@@ -46,7 +46,8 @@ public class CheckSystemAction extends BaseBean implements Action, EsbServerless
             try {
                 BillFieldUtil unit = new BillFieldUtil();
                 String wfid = request.getWorkflowid();
-                String tablename = unit.getTablename(wfid);
+//                String tablename = unit.getTablename(wfid);
+                String tablename = request.getRequestManager().getBillTableName();
                 // 用户工号
                 String yhgh = "";
                 // 系统ID