config

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/crmoa/CRM_syncUnFreezeTimes.java

@@ -33,7 +33,7 @@ public class CRM_syncUnFreezeTimes extends BaseBean {
     }
 
     @Autowired
-    private ConfigProp configProp;
+    private ConfigProp configProp;  //注入
 
     public String[] call() throws RemoteException {
         String[] as = new String[3];

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

@@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class CallEasServices extends BaseBean {
     @Autowired
-    private ConfigProp configProp;
+    private ConfigProp configProp; //注入
 
     private static final org.slf4j.Logger logger_814f159c = LoggerFactory.getLogger(CallEasServices.class);
 

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

@@ -10,7 +10,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.file.Prop;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+@Component
 public class CallTravelApplyService {
 
     private static final org.slf4j.Logger logger_ec0d40fa = LoggerFactory.getLogger(CallTravelApplyService.class);
@@ -22,7 +24,7 @@ public class CallTravelApplyService {
     }
 
     @Autowired
-    private ConfigProp configProp;
+    private ConfigProp configProp;  //注入
 
     public String[] call() throws RemoteException {
         String[] result = new String[5];

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

@@ -52,3 +52,5 @@ public class EAS_YszxfpApplyResult extends BaseBean {
         return result;
     }
 }
+
+

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

@@ -21,7 +21,7 @@ public class FeeApplicationService extends BaseBean {
 
     private static final org.slf4j.Logger logger_2817d3b0 = LoggerFactory.getLogger(FeeApplicationService.class);
     @Autowired
-    private ConfigProp configProp;
+    private ConfigProp configProp; //注入
     public CostStandardSynchronizationServiceResponse call(CostStandardHead param) throws Exception {
 //        String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.FeeApplication")).trim();
         String url = configProp.getFeeApplication();
@@ -35,6 +35,8 @@ public class FeeApplicationService extends BaseBean {
         auth.setUsername(configProp.getPo_user());
         auth.setPassword(configProp.getPo_password());
 
+        logger_2817d3b0.info(String.valueOf("getPo_user" + configProp.getPo_user()));
+        logger_2817d3b0.info(String.valueOf("getPo_password" + configProp.getPo_password()));
         stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth);
         CostStandardSynchronizationService req = new CostStandardSynchronizationService();
         CostStandardSynchronization info = new CostStandardSynchronization();

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

@@ -1,65 +0,0 @@
-package com.weaver.seconddev.interfaces.easoa;
-
-import com.weaver.seconddev.interfaces.prop.ConfigProp;
-import org.apache.axis2.transport.http.HttpTransportProperties;
-import  com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.InternalBorrowing;
-import  com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.InternalBorrowingService;
-import  com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.InternalBorrowingSynchronization;
-import  com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.ResultInfo;
-import  com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.ResultInfoLines;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import java.lang.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-
-public class InterLoanService extends BaseBean {
-
-    private static final org.slf4j.Logger logger_9c1a93c4 = LoggerFactory.getLogger(InterLoanService.class);
-    @Autowired
-    private ConfigProp configProp;
-    public String[] call(InternalBorrowing[] info) {
-        String[] str = new String[2];
-//        String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.InterLoan")).trim();
-        String url = configProp.getInterLoan();
-        try {
-            logger_9c1a93c4.info(String.valueOf("调用报账系统内部借款接口开始"));
-            SI_InterLoanApplicationSync_OUTServiceStub stub = new SI_InterLoanApplicationSync_OUTServiceStub(url);
-            stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.CHUNKED, Boolean.FALSE);
-            stub._getServiceClient().getOptions().setTimeOutInMilliSeconds(300000);
-            HttpTransportProperties.Authenticator auth = new HttpTransportProperties.Authenticator();
-//            auth.setUsername(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_user")).trim());
-//            auth.setPassword(Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.po_password")).trim());
-
-            auth.setUsername(configProp.getPo_user());
-            auth.setPassword(configProp.getPo_password());
-            stub._getServiceClient().getOptions().setProperty(org.apache.axis2.transport.http.HTTPConstants.AUTHENTICATE, auth);
-            InternalBorrowingService res = new InternalBorrowingService();
-            InternalBorrowingSynchronization param = new InternalBorrowingSynchronization();
-            param.setITFID("HT01BZ023");
-            param.setSENDID("");
-            param.setSYSID("SYS006");
-            param.setInternalBorrowing(info);
-            res.setInternalBorrowingSynchronization(param);
-            SI_InterLoanApplicationSync_OUTServiceStub.InternalBorrowingServiceResponse rep = stub.sI_InterLoanApplicationSync_OUT(res);
-            ResultInfo result = rep.get_return();
-            str[0] = result.getISTAT();
-            if ("1".equals(str[0])) {
-                str[1] = result.getMESSAGE();
-            } else {
-                ResultInfoLines[] lines = rep.get_return().getResultInfoLinesArr();
-                str[1] = lines[0].getMESSAGE();
-            }
-            logger_9c1a93c4.info(String.valueOf("调用报账系统内部借款接口返回结果：" + str[0] + "--" + str[1]));
-            logger_9c1a93c4.info(String.valueOf("调用报账系统内部借款接口结束"));
-        } catch (Exception e) {
-            str[0] = "0";
-            str[1] = e.toString();
-            logger_9c1a93c4.info(String.valueOf("调用报账系统内部借款接口出错：" + e.toString()));
-        }
-        return str;
-    }
-}

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/MesAccountService.java

@@ -12,7 +12,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
 
+@Component
 public class MesAccountService extends BaseBean {
 
 	private static final Logger logger_8f904fbd = LoggerFactory.getLogger(MesAccountService.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/eipoa/PortalPlanService.java

@@ -10,7 +10,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
 
+@Component
 public class PortalPlanService extends BaseBean {
 
 	private static final Logger logger_c9c5c87a = LoggerFactory.getLogger(PortalPlanService.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/gdwmsoa/ZMES_OA_SUBMIT_SERVICE.java

@@ -9,7 +9,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+@Component
 public class ZMES_OA_SUBMIT_SERVICE extends BaseBean {
 
     private static final org.slf4j.Logger logger_b6665baf = LoggerFactory.getLogger(ZMES_OA_SUBMIT_SERVICE.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/ApprovalResultService.java

@@ -11,7 +11,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+@Component
 public class ApprovalResultService extends BaseBean {
 
     private static final org.slf4j.Logger logger_ff0d1f05 = LoggerFactory.getLogger(ApprovalResultService.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3CustomerService.java

@@ -1,5 +1,6 @@
 package com.weaver.seconddev.interfaces.k3;
 
+import com.alibaba.csp.sentinel.command.annotation.CommandMapping;
 import com.weaver.common.i18n.tool.util.I18nContextUtil;
 import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,10 +10,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
 /**
  * k3cloud客户
  */
+@Component
 public class CallK3CustomerService extends BaseBean {
 
     private static final org.slf4j.Logger logger_1a80d0a1 = LoggerFactory.getLogger(CallK3CustomerService.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallK3SupplierServices.java

@@ -9,10 +9,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
 /**
  * k3cloud供应商
  */
+@Component
 public class CallK3SupplierServices extends BaseBean {
 
     private static final org.slf4j.Logger logger_8469efe0 = LoggerFactory.getLogger(CallK3SupplierServices.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/CallPORequestService.java

@@ -9,7 +9,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+@Component
 public class CallPORequestService extends BaseBean {
 
     private static final org.slf4j.Logger logger_7febacb3 = LoggerFactory.getLogger(CallPORequestService.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/k3/TransferBillService.java

@@ -13,7 +13,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+@Component
 public class TransferBillService extends BaseBean {
 
 	private static final org.slf4j.Logger logger_8574e473 = LoggerFactory.getLogger(TransferBillService.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oactrip/OaCtrip.java

@@ -20,7 +20,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.file.Prop;
 import com.weaver.verupgrade.general.BaseBean;
+import org.springframework.stereotype.Component;
 
+@Component
 public class OaCtrip extends BaseBean {
 
 	private static final org.slf4j.Logger logger_359344e8 = LoggerFactory.getLogger(OaCtrip.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/CallMesChuMenZhengService.java

@@ -10,7 +10,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+
+@Component
 public class CallMesChuMenZhengService extends BaseBean {
 
 	private static final org.slf4j.Logger logger_742486d = LoggerFactory.getLogger(CallMesChuMenZhengService.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/oames/ReturnMesWLPS_SYService.java

@@ -12,7 +12,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+@Component
 public class ReturnMesWLPS_SYService extends BaseBean {
 	@Autowired
 	private ConfigProp configProp;

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/pmoa/PMService.java

@@ -17,7 +17,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+@Component
 public class PMService extends BaseBean {
     @Autowired
     private ConfigProp configProp;

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/scfoa/GetApproveResult.java

@@ -17,10 +17,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
 /**
  * oa审批结果返回 oa->scf
  */
+@Component
 public class GetApproveResult extends BaseBean {
 
     private static final org.slf4j.Logger logger_8692c990 = LoggerFactory.getLogger(GetApproveResult.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckMallServices.java

@@ -20,7 +20,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.Util;
 import com.weaver.verupgrade.general.BaseBean;
+import org.springframework.stereotype.Component;
 
+@Component
 public class CallSrmCheckMallServices extends BaseBean {
 
 	private static final org.slf4j.Logger logger_a0ca618e = LoggerFactory.getLogger(CallSrmCheckMallServices.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/CallSrmCheckPriceServices.java

@@ -20,7 +20,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.Util;
 import com.weaver.verupgrade.general.BaseBean;
+import org.springframework.stereotype.Component;
 
+@Component
 public class CallSrmCheckPriceServices extends BaseBean {
 
 	private static final org.slf4j.Logger logger_dac3f14b = LoggerFactory.getLogger(CallSrmCheckPriceServices.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVenMatExtService.java

@@ -11,7 +11,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+@Component
 public class OaSrmVenMatExtService extends BaseBean {
 
     private static final org.slf4j.Logger logger_333d882d = LoggerFactory.getLogger(OaSrmVenMatExtService.class);

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/OaSrmVendorPropmtionServiceServiceStub.java

@@ -17,7 +17,6 @@
 //import weaver.file.Prop;
 
 import com.weaver.seconddev.interfaces.prop.ConfigProp;
-import com.weaver.seconddev.interfaces.workflow.action.prop.TestProp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

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

@@ -24,7 +24,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
+@Component
 public class CallDTtripService extends BaseBean {
 
     private static final org.slf4j.Logger logger_a99d9846 = LoggerFactory.getLogger(CallDTtripService.class);

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

@@ -1,5 +1,6 @@
 package com.weaver.seconddev.interfaces.swfa.sl;
 
+import com.alibaba.csp.sentinel.command.annotation.CommandMapping;
 import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import net.sf.json.JSONObject;
 import java.io.UnsupportedEncodingException;
@@ -22,11 +23,14 @@ import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.conn.RecordSet;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
 /**
  * Webs ???ò??????
  * @author Administrator
  */
+
+@Component
 public class CallSLServices extends BaseBean {
 
 	private static final org.slf4j.Logger logger_6fef4f91 = LoggerFactory.getLogger(CallSLServices.class);

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

@@ -1,207 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.weaver.seconddev.interfaces.prop.ConfigProp;
-import org.apache.commons.lang.StringUtils;
-import com.weaver.seconddev.interfaces.eipoa.PortalPlanService ;
-import com.weaver.seconddev.interfaces.eipoa.SI_HTPortalPlan_OUTServiceStub.InsertPlan;
-import com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import org.springframework.core.env.Environment;
-import java.lang.*;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.hrm.company.SubCompanyComInfo;
-import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-@org.springframework.stereotype.Service("workflow_action_AccommodationAction")
-public class AccommodationAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    @Autowired
-    private ConfigProp configProp;
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_ee887589 = LoggerFactory.getLogger(AccommodationAction.class);
-
-    @Override
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            String requestid = requestinfo.getRequestid();
-            String workflowid = requestinfo.getWorkflowid();
-            try {
-                logger_ee887589.info(String.valueOf(requestid + "-AccommodationAction-start"));
-                Map<String, String> map = new HashMap<String, String>();
-                Property[] properties = requestinfo.getMainTableInfo().getProperty();
-                for (int i = 0; i < properties.length; i++) {
-                    String name = properties[i].getName().toUpperCase();
-                    String value = Util.null2String(properties[i].getValue());
-                    map.put(name, value);
-                }
-                BillFieldUtil util = new BillFieldUtil();
-                SubCompanyComInfo com = I18nContextUtil.getBean(SubCompanyComInfo.class);
-                ResourceComInfo res = I18nContextUtil.getBean(ResourceComInfo.class);
-                String sqr = map.get("SQR");
-                String ptry = map.get("PTRY");
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                String itemId = "SYS006" + util.getWorkcode(sqr) + sdf.parse(map.get("SQRQ") + " 08:00:00").getTime() + requestid;
-                // 测试环境-101，正式环境-41
-                String type = "41";
-//                String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.pc_url")).trim();
-                String url = configProp.getPc_url();
-                String startDate = map.get("JDRQ") + " 00:00:00";
-                String endDate = map.get("JDRQ") + " 23:59:59";
-                String fromName = util.getName(sqr);
-                RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                StringBuilder content = new StringBuilder();
-                String jcdd = "";
-                String ptryxm = res.getLastnames(ptry);
-                if ("0".equals(map.get("SFXDSJZXPT"))) {
-                    ptryxm = res.getLastnames(map.get("PTRY1")) + "," + ptryxm;
-                }
-                // 测试环境-"59573",正式环境-Util.null2String(this.getPropValue("htportaloaUrl", "JCZS_ycsdid")).trim()
-//                String title = com.getSubCompanyname(map.get("SQDW")) + "，" + map.get("ZRS") + "人，" + ptryxm + "，" + util.getselectName(map.get("YCSD"), Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_ycsdid")).trim()).trim();
-                String title = com.getSubCompanyname(map.get("SQDW")) + "，" + map.get("ZRS") + "人，" + ptryxm + "，" + configProp.getJCZS_ycsdid();
-                if (!"1".equals(map.get("JDLB"))) {
-                    content.append("就餐地点：");
-                    if ("0".equals(map.get("DYJCCS"))) {
-                        if ("0".equals(map.get("JDQY"))) {
-                            jcdd = "吴江园区接待餐厅";
-                        } else if ("1".equals(map.get("JDQY"))) {
-                            jcdd = "亨通凯莱";
-                        } else if ("2".equals(map.get("JDQY"))) {
-                            jcdd = "常熟园区接待餐厅";
-                        }
-                    } else {
-                        String poolname = CONN_TYPE.workflow.getType();
-                        // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                        rs.executeSql("select jdmc from formtable_main_211 where id=" + map.get("JCCS"), poolname);
-                        if (rs.next()) {
-                            jcdd = rs.getString("jdmc");
-                        }
-                    }
-                    content.append(jcdd);
-                    if ("0".equals(map.get("YCSD"))) {
-                        content.append("，午餐" + map.get("WUCRS") + "人；");
-                        startDate = map.get("JDRQ") + " 11:30:00";
-                        endDate = map.get("JDRQ") + " 13:30:59";
-                    } else if ("1".equals(map.get("YCSD"))) {
-                        content.append("，晚餐：" + map.get("WANCRS") + "人；");
-                        startDate = map.get("JDRQ") + " 17:30:00";
-                        endDate = map.get("JDRQ") + " 21:00:59";
-                    } else {
-                        content.append("，午餐：" + map.get("WUCRS") + "人，晚餐：" + map.get("WANCRS") + "人；");
-                        startDate = map.get("JDRQ") + " 11:30:00";
-                        endDate = map.get("JDRQ") + " 21:00:59";
-                    }
-                    // getPropValue("htportaloaUrl","JCZS_jdbzid")
-                    // 接待等级
-//                    title = title + "，" + util.getselectName(map.get("JDBZ"), I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_jdbzid")).substring(0, 1);
-                    title = title + "，" + util.getselectName(map.get("JDBZ"),configProp.getJCZS_jdbzid() ).substring(0, 1);
-                }
-                // 包厢号
-                String jcbx = map.get("JCBX");
-                if (jcbx != null && !jcbx.equals("")) {
-                    title = title + "，" + jcbx;
-                }
-                String pc_url = "/workflow/request/ViewRequest.jsp?requestid=" + requestid + "&_workflowid=" + workflowid + "&_workflowtype=&isovertime=0";
-                String mobile_url = "/mobile/plugin/1/view.jsp?requestid=" + requestid + "&_workflowid=" + workflowid + "&_workflowtype=&isovertime=0";
-                String otherids = "";
-                if ("0".equals(map.get("JDQY"))) {
-//                    otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_WJYQTZR")).trim();
-                    otherids = configProp.getJCZS_WJYQTZR();
-                } else if ("1".equals(map.get("JDQY"))) {
-//                    otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_QDYQTZR")).trim();
-                    otherids = configProp.getJCZS_QDYQTZR();
-                } else if ("2".equals(map.get("JDQY"))) {
-//                    otherids = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htportaloaUrl.JCZS_CSYQTZR")).trim();
-                    otherids =configProp.getJCZS_CSYQTZR();
-                }
-                String userid = "";
-                if (!"".equals(otherids)) {
-                    userid = getWorkcode(sqr + "," + ptry + "," + otherids, util);
-                } else {
-                    userid = getWorkcode(sqr + "," + ptry, util);
-                }
-                Map<String, String> info = new HashMap<String, String>();
-                info.put("systemId", "SYS006");
-                info.put("password", "123456");
-                info.put("itemId", itemId);
-                info.put("userId", userid);
-                info.put("title", title);
-                info.put("url", url + URLEncoder.encode(pc_url));
-                info.put("type", type);
-                info.put("startDate", startDate);
-                info.put("endDate", endDate);
-                info.put("status", "0");
-                info.put("priority", "0");
-                info.put("formName", fromName);
-                info.put("mobileUrl", url + URLEncoder.encode(mobile_url));
-                info.put("category", "就餐住宿");
-                info.put("source", "1");
-                info.put("content", content.toString());
-                PortalPlanService service = new PortalPlanService();
-                InsertPlan insertData = JSONObject.parseObject(JSON.toJSONString(info), InsertPlan.class);
-                String[] str = service.insertPlan(insertData);
-                logger_ee887589.info(requestid + "-AccommodationAction-传值[" + JSON.toJSONString(info) + "]");
-                logger_ee887589.info(String.valueOf(requestid + "-AccommodationAction-end-返回值：[" + str[0] + "-" + str[1] + "]"));
-            } catch (Exception e) {
-                logger_ee887589.info(String.valueOf(requestid + "-AccommodationAction-error:" + e.toString()));
-            }
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_ee887589.error("AccommodationAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager()));
-        }
-    }
-
-    public String getWorkcode(String ids, BillFieldUtil util) {
-        String[] arr = ids.split(",");
-        HashSet<String> set = new HashSet<String>();
-        for (int i = 0; i < arr.length; i++) {
-            if (!"".equals(arr[i])) {
-                set.add(util.getWorkcode(arr[i]));
-            }
-        }
-        return StringUtils.join(set.toArray(), ";");
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -1,175 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import java.util.HashMap;
-import java.util.Map;
-import  com.weaver.seconddev.interfaces.srmoa.CallVdDlvApplyServices;
-import  com.weaver.seconddev.interfaces.srmoa.VdDlvApplyHandlerServiceServiceStub;
-import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import java.lang.*;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import com.weaver.verupgrade.common.DateUtil;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.hrm.company.DepartmentComInfo;
-import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-@org.springframework.stereotype.Service("workflow_action_AddSupplyToSrmAction")
-public class AddSupplyToSrmAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_2cba8638 = LoggerFactory.getLogger(AddSupplyToSrmAction.class);
-
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            logger_2cba8638.info(String.valueOf("do AddSupplyToSrmAction on request:" + request.getRequestid()));
-            try {
-                // 获取主表数据
-                String requestid = request.getRequestid();
-                ResourceComInfo resourcecominfo = I18nContextUtil.getBean(ResourceComInfo.class);
-                DepartmentComInfo departmentComInfo = I18nContextUtil.getBean(DepartmentComInfo.class);
-                Map<String, String> map = new HashMap<String, String>();
-                // 表单名称
-                String tablename = request.getRequestManager().getBillTableName();
-                RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                String state = "E";
-                String message = "";
-                Property[] aproperty = request.getMainTableInfo().getProperty();
-                for (int i = 0; i < aproperty.length; i++) {
-                    String name = aproperty[i].getName().toUpperCase();
-                    String value = Util.null2String(aproperty[i].getValue());
-                    map.put(name, value);
-                }
-                String xsxx = String.valueOf(map.get("XSXX"));
-                String val = BillFieldUtil.getselectName(xsxx, "37482");
-                logger_2cba8638.info(String.valueOf("AddSupplyToSrmAction--线上/线下供应商:" + val));
-                if (val.length() > 1) {
-                    val = val.substring(0, 1);
-                }
-                if (val.equals("0")) {
-                    // 流程编号
-                    String lcbh = String.valueOf(map.get("LCBH"));
-                    // 公司编码
-                    String sqdwbm = String.valueOf(map.get("SQDWBM"));
-                    // 公司名称
-                    String sqdw = String.valueOf(map.get("SQDW"));
-                    // 供应商编码
-                    String gysbm = String.valueOf(map.get("GYSBM"));
-                    // 供应商名称
-                    String gysmc = String.valueOf(map.get("GYSMC"));
-                    // String lcbh = String.valueOf(map.get("LCBH"));//开发类型
-                    // 申请人
-                    String sqr = String.valueOf(map.get("SQR"));
-                    // 申请人工号
-                    String gh = String.valueOf(map.get("GH"));
-                    // 主供品类
-                    String gycpmc = String.valueOf(map.get("GYCPMC"));
-                    // User usr = request.getRequestManager().getUser();//获取当前操作用户对象 审核人
-                    // 审核时间
-                    String date = DateUtil.getFullDate();
-                    // 引入后预计达到的目的
-                    String yrhyqdddxg = String.valueOf(map.get("YRHYQDDDXG"));
-                    // 申请原因
-                    String yryy = String.valueOf(map.get("YRYY"));
-                    // 预计年度将本金额
-                    String yjndcbjsje = String.valueOf(map.get("YJNDCBJSJE"));
-                    // 现场审核 	0：不需要；1：需要；
-                    int xcsh = 0;
-                    if ("0".equals(String.valueOf(map.get("XCSH")))) {
-                        xcsh = 1;
-                    }
-                    if ("1".equals(String.valueOf(map.get("XCSH")))) {
-                        xcsh = 0;
-                    }
-                    // 申请部门
-                    String sqbm = String.valueOf(map.get("SQBM"));
-                    // 现有合格供应商
-                    String xyhggys = String.valueOf(map.get("XYHGGYS"));
-                    VdDlvApplyHandlerServiceServiceStub.DlvApplyIn dlvapplyin = new VdDlvApplyHandlerServiceServiceStub.DlvApplyIn();
-                    dlvapplyin.setRequestId(Integer.parseInt(requestid));
-                    dlvapplyin.setApplyNo(lcbh);
-                    dlvapplyin.setCompanyCode(sqdwbm);
-                    dlvapplyin.setCompanyName(sqdw);
-                    dlvapplyin.setVendorCode(gysbm);
-                    dlvapplyin.setVendorName(gysmc);
-                    dlvapplyin.setApplyer(resourcecominfo.getResourcename(sqr));
-                    dlvapplyin.setEmpNo(gh);
-                    dlvapplyin.setCategoryName(gycpmc);
-                    dlvapplyin.setCheckUserName(resourcecominfo.getResourcename(request.getLastoperator()));
-                    dlvapplyin.setCheckTime(date);
-                    dlvapplyin.setApplyReason(yryy);
-                    dlvapplyin.setExpectedMoney(yjndcbjsje);
-                    dlvapplyin.setExpectedPurpose(yrhyqdddxg);
-                    // 提交标记(0：校验； 1：提交)
-                    dlvapplyin.setSubmitFlag(1);
-                    dlvapplyin.setDept(departmentComInfo.getDepartmentName(sqbm));
-                    dlvapplyin.setVendors(xyhggys);
-                    dlvapplyin.setInspectFlag(xcsh);
-                    CallVdDlvApplyServices service = new CallVdDlvApplyServices();
-                    service.setOainputvendor(dlvapplyin);
-                    String[] result = service.call();
-                    state = result[0];
-                    message = result[1] == null ? "" : result[1].replace("'", "");
-                } else {
-                    state = "S";
-                    message = "线下供应商!!!";
-                }
-                // 把返回的值存到流程中
-                String sql = (new StringBuilder()).append("update ").append(tablename).append(" set sta ='").append(state).append("', meg = '").append(message).append("' where requestId = ").append(requestid).toString();
-                logger_2cba8638.info(String.valueOf((new StringBuilder()).append("logsql:").append(sql).toString()));
-                String poolname = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql(sql, poolname);
-                if (!"S".equals(state)) {
-                    request.getRequestManager().setMessageid("ERROR");
-                    request.getRequestManager().setMessagecontent(message);
-                    return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-                }
-            } catch (Exception e) {
-                logger_2cba8638.info(String.valueOf(e.getMessage()));
-                request.getRequestManager().setMessageid("AddSupplyToSrmAction ERROR");
-                request.getRequestManager().setMessagecontent(e.getMessage());
-                return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-            }
-            logger_2cba8638.info(String.valueOf("do AddSupplyToSrmAction success!"));
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_2cba8638.error("AddSupplyToSrmAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -1,161 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import java.util.HashMap;
-import java.util.Map;
-import  com.weaver.seconddev.interfaces.srmoa.CallVdDlvApplyServices;
-import  com.weaver.seconddev.interfaces.srmoa.VdDlvApplyHandlerServiceServiceStub;
-import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import java.lang.*;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import com.weaver.verupgrade.common.DateUtil;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.hrm.company.DepartmentComInfo;
-import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-@org.springframework.stereotype.Service("workflow_action_AddSupplyToSrmCheckAction")
-public class AddSupplyToSrmCheckAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_75ae129c = LoggerFactory.getLogger(AddSupplyToSrmCheckAction.class);
-
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            logger_75ae129c.info(String.valueOf("do AddSupplyToSrmCheckAction on request:" + request.getRequestid()));
-            try {
-                // 获取主表数据
-                String requestid = request.getRequestid();
-                ResourceComInfo resourcecominfo = I18nContextUtil.getBean(ResourceComInfo.class);
-                DepartmentComInfo departmentComInfo = I18nContextUtil.getBean(DepartmentComInfo.class);
-                String state = "E";
-                String message = "";
-                Map<String, String> map = new HashMap<String, String>();
-                Property[] aproperty = request.getMainTableInfo().getProperty();
-                for (int i = 0; i < aproperty.length; i++) {
-                    String name = aproperty[i].getName().toUpperCase();
-                    String value = Util.null2String(aproperty[i].getValue());
-                    map.put(name, value);
-                }
-                String xsxx = String.valueOf(map.get("XSXX"));
-                String val = BillFieldUtil.getselectName(xsxx, "37482");
-                logger_75ae129c.info(String.valueOf("AddSupplyToSrmCheckAction--线上/线下供应商:" + val));
-                if (val.length() > 1) {
-                    val = val.substring(0, 1);
-                }
-                if (val.equals("0")) {
-                    // 流程编号
-                    String lcbh = String.valueOf(map.get("LCBH"));
-                    // 公司编码
-                    String sqdwbm = String.valueOf(map.get("SQDWBM"));
-                    // 公司名称
-                    String sqdw = String.valueOf(map.get("SQDW"));
-                    // 供应商编码
-                    String gysbm = String.valueOf(map.get("GYSBM"));
-                    // 供应商名称
-                    String gysmc = String.valueOf(map.get("GYSMC"));
-                    // 申请人
-                    String sqr = String.valueOf(map.get("SQR"));
-                    // 申请人工号
-                    String gh = String.valueOf(map.get("GH"));
-                    // 主供品类
-                    String gycpmc = String.valueOf(map.get("GYCPMC"));
-                    // 审核时间
-                    String date = DateUtil.getFullDate();
-                    // 引入后预计达到的目的
-                    String yrhyqdddxg = String.valueOf(map.get("YRHYQDDDXG"));
-                    // 申请原因
-                    String yryy = String.valueOf(map.get("YRYY"));
-                    // 预计年度将本金额
-                    String yjndcbjsje = String.valueOf(map.get("YJNDCBJSJE"));
-                    // 现场审核 	0：不需要；1：需要；
-                    int xcsh = 0;
-                    if ("0".equals(String.valueOf(map.get("XCSH")))) {
-                        xcsh = 1;
-                    }
-                    if ("1".equals(String.valueOf(map.get("XCSH")))) {
-                        xcsh = 0;
-                    }
-                    // 申请部门
-                    String sqbm = String.valueOf(map.get("SQBM"));
-                    // 现有合格供应商
-                    String xyhggys = String.valueOf(map.get("XYHGGYS"));
-                    VdDlvApplyHandlerServiceServiceStub.DlvApplyIn dlvapplyin = new VdDlvApplyHandlerServiceServiceStub.DlvApplyIn();
-                    dlvapplyin.setRequestId(Integer.parseInt(requestid));
-                    dlvapplyin.setApplyNo(lcbh);
-                    dlvapplyin.setCompanyCode(sqdwbm);
-                    dlvapplyin.setCompanyName(sqdw);
-                    dlvapplyin.setVendorCode(gysbm);
-                    dlvapplyin.setVendorName(gysmc);
-                    dlvapplyin.setApplyer(resourcecominfo.getResourcename(sqr));
-                    dlvapplyin.setEmpNo(gh);
-                    dlvapplyin.setCategoryName(gycpmc);
-                    dlvapplyin.setCheckUserName(resourcecominfo.getResourcename(request.getLastoperator()));
-                    dlvapplyin.setCheckTime(date);
-                    dlvapplyin.setApplyReason(yryy);
-                    dlvapplyin.setExpectedMoney(yjndcbjsje);
-                    dlvapplyin.setExpectedPurpose(yrhyqdddxg);
-                    // 提交标记(0：校验； 1：提交)
-                    dlvapplyin.setSubmitFlag(0);
-                    dlvapplyin.setDept(departmentComInfo.getDepartmentName(sqbm));
-                    dlvapplyin.setVendors(xyhggys);
-                    dlvapplyin.setInspectFlag(xcsh);
-                    CallVdDlvApplyServices service = new CallVdDlvApplyServices();
-                    service.setOainputvendor(dlvapplyin);
-                    String[] result = service.call();
-                    state = result[0];
-                    message = result[1];
-                } else {
-                    state = "S";
-                }
-                if (!"S".equals(state)) {
-                    request.getRequestManager().setMessageid("ERROR");
-                    request.getRequestManager().setMessagecontent(message);
-                    return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-                }
-            } catch (Exception e) {
-                logger_75ae129c.info(String.valueOf(e.getMessage()));
-                request.getRequestManager().setMessageid("AddSupplyToSrmCheckAction ERROR");
-                request.getRequestManager().setMessagecontent(e.getMessage());
-                return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-            }
-            logger_75ae129c.info(String.valueOf("do AddSupplyToSrmCheckAction success!"));
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_75ae129c.error("AddSupplyToSrmCheckAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -224,7 +224,7 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer
                     return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", FAILURE_AND_CONTINUE, request.getRequestManager()));
                 }
                 // RecordSet rs = new RecordSet();
-                String sql = "update " + tablename + " set state='" + isTat + "',message='" + msg + "' where requestId=" + requestId;
+                String sql = "update e10_core_business.dbo." + tablename + " set state='" + isTat + "',message='" + msg + "' where requestId=" + requestId;
                 String poolname_c1 = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                 rs.executeSql(sql, poolname_c1);
@@ -233,7 +233,7 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer
                 request.getRequestManager().setMessagecontent("SRM接口返回错误信息：" + e.toString());
                 logger_336cd654.info(String.valueOf(requestId + "AddVenMatExtsToSrmAction-Request出错: " + e.toString()));
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                String sql = "update " + tablename + " set state='E',message='" + e.getMessage() + "' where requestId=" + requestId;
+                String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.getMessage() + "' where requestId=" + requestId;
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                 rs.executeSql(sql, poolname);

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

@@ -157,7 +157,7 @@ public class BlackListTempThawCheckAction extends BaseBean implements Action, Es
 
     public String getApplyCom(String id, String table) {
         RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-        String sql = "select lrhmddw from " + table + " where requestId=" + id;
+        String sql = "select lrhmddw from e10_core_business.dbo." + table + " where requestId=" + id;
         String poolname = CONN_TYPE.workflow.getType();
         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
         rs.executeSql(sql, poolname);

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

@@ -48,7 +48,7 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action,
             String roleid = "100502830000001498";
             String zjlx1 = "";
             String sqdw = "";
-            String sql = "select * from " + tablename + " where requestid=" + requestid;
+            String sql = "select * from e10_core_business.dbo." + tablename + " where requestid=" + requestid;
             String poolname = CONN_TYPE.workflow.getType();
             // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
             rs.executeSql(sql, poolname);
@@ -95,13 +95,13 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action,
                         str = "新增";
                         String poolname_jn = CONN_TYPE.workflow.getType();
                         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                        rs.executeSql("select user_id from auth_user_role as  HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_jn);
+                        rs.executeSql("select user_id from eteams.dbo.auth_user_role as  HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_jn);
                         if (!rs.next()) {
                             String poolname_k7 = CONN_TYPE.workflow.getType();
                             /* *TODO  检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整  https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
  TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
                             long generate = IdGenerator.generate();
-                            rs.executeSql("insert into auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + roleid + "," + xm + ",2,1)", poolname_k7,generate);
+                            rs.executeSql("insert into eteams.dbo.auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + roleid + "," + xm + ",2,1)", poolname_k7,generate);
                         }
                         if ("0".equals(zjlx1)) {
                             if ("".equals(xxhzj)) {
@@ -120,7 +120,7 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action,
                         str = "删除";
                         String poolname_8p = CONN_TYPE.workflow.getType();
                         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                        rs.executeSql("delete from HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_8p);
+                        rs.executeSql("delete from eteams.dbo.HrmRoleMembers where roleid=" + roleid + " and resourceid=" + xm, poolname_8p);
                         if ("0".equals(zjlx1)) {
                             if (("," + xxhzj + ",").indexOf("," + xm + ",") >= 0) {
                                 xxhzj = ("," + xxhzj + ",").replace(("," + xm + ","), ",");

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

@@ -111,7 +111,7 @@ public class CheckEmailAction extends BaseBean implements Action, EsbServerlessR
                     }
                 }
                 int num = 0;
-                String sql = "select count(id) as count from " + tablename + " where yhgh='" + yhgh + "' and lczt='1'";
+                String sql = "select count(id) as count from e10_core_business.dbo." + tablename + " where yhgh='" + yhgh + "' and lczt='1'";
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源

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

@@ -72,7 +72,7 @@ public class CheckSystemAction extends BaseBean implements Action, EsbServerless
                     }
                 }
                 int num = 0;
-                String sql = "select count(id) as count from " + tablename + " where yhgh='" + yhgh + "' and lczt='1' and xtid='" + sysid + "'";
+                String sql = "select count(id) as count from e10_core_business.dbo." + tablename + " where yhgh='" + yhgh + "' and lczt='1' and xtid='" + sysid + "'";
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源

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

@@ -97,9 +97,13 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer
                 } else if (name.equals("CCLB")) {
                     String poolname = "";
                     // TODO E10必须指定poolname数据源
-                    rdsd.executeSql("select classcode from ht_ATDATTENDANCECLASS where ID='" + value + "'", poolname);
+                    String sql = "select classcode from e10_common.dbo.ht_ATDATTENDANCECLASS where ID='" + value + "'";
+
+                    logger_fee0cda9.info("sql == " + sql );
+                    rdsd.executeSql(sql, poolname);
                     rdsd.next();
                     QJLB = Util.null2String(rdsd.getString("classcode"));
+                    logger_fee0cda9.info("QJLB == " + QJLB );
                 } else if (name.equals("KSRQ")) {
                     SQRQ = value;
                 } else if (name.equals("KSSJ")) {
@@ -167,7 +171,7 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer
                     CODE = "";
                     String poolname_lv = CONN_TYPE.workflow.getType();
                     // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                    rs.executeSql("select job_num from employee as  HrmResource where id = " + aa[i], poolname_lv);
+                    rs.executeSql("select job_num from eteams.dbo.employee as  HrmResource where id = " + aa[i], poolname_lv);
                     if (rs.next()) {
                         CODE = Util.null2String(rs.getString("workcode"));
                         jo = new JSONObject();
@@ -220,7 +224,7 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer
             if (str.length() > 150) {
                 str = str.substring(0, 150);
             }
-            String sql = "insert into chuchai_qingjia_log(id, requestId,gh,lbbh,kssj,jssj,message,state,qjss) values(? , '" + requestid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + QJSS + "')";
+            String sql = "insert into e10_common.dbo.chuchai_qingjia_log(id, requestId,gh,lbbh,kssj,jssj,message,state,qjss) values(? , '" + requestid + "','','A11','" + beginDateTime + "','" + endDateTime + "','" + str + "','" + hrstate + "','" + QJSS + "')";
             String poolname_bv = CONN_TYPE.workflow.getType();
             /* *TODO  检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整  https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
  TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/

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

@@ -123,7 +123,7 @@ public class CloseAccountAction extends BaseBean implements Action, EsbServerles
                         logger_ac56032a.info(String.valueOf(requestId + "---" + yhgh + "批量销户成功"));
                     }
                 }
-                sql_error = "update " + tablename + " set status='" + status + "',message='" + message + "' where requestId=" + requestId;
+                sql_error = "update e10_core_business.dbo." + tablename + " set status='" + status + "',message='" + message + "' where requestId=" + requestId;
                 logger_ac56032a.info("sql_error -- " + sql_error);
                 String poolname_1n = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
@@ -134,7 +134,7 @@ public class CloseAccountAction extends BaseBean implements Action, EsbServerles
                     request.getRequestManager().setMessagecontent("门户返回错误信息：" + message);
                 }
             } catch (Exception e) {
-                sql_error = "update " + tablename + " set status='E',message='" + e.toString() + "' where requestId=" + requestId;
+                sql_error = "update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where requestId=" + requestId;
                 logger_ac56032a.info("sql_error -- " + sql_error);
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源

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

@@ -12,7 +12,6 @@ import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
 import com.weaver.framework.client.annotation.WeaverConfigCenter;
 import com.weaver.framework.rpc.annotation.RpcReference;
 import com.weaver.seconddev.interfaces.prop.ConfigProp;
-import com.weaver.seconddev.interfaces.workflow.action.prop.TestProp;
 import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil;
 import com.weaver.teams.domain.user.SimpleEmployee;
 import com.weaver.verupgrade.conn.CONN_TYPE;
@@ -46,8 +45,6 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc
 
     @Autowired
     private CommonDevUtil commonDevUtil;
-    @Autowired
-    private TestProp testProp;
 
     @Autowired
     private ConfigProp configProp;
@@ -82,7 +79,7 @@ public class CustomTeAction extends BaseBean implements Action, EsbServerlessRpc
 //            String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("weaver-secondev-htportaloaUrl.accountUrl")).trim();
 
 
-            logger.error("url = " + testProp.getAccountUrl());
+//            logger.error("url = " + testProp.getAccountUrl());
 
             SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser();
 

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

@@ -87,7 +87,7 @@ public class DeleteSapGuidAction extends BaseBean implements Action, EsbServerle
                 String state = result[0];
                 String message = result[1];
                 // 把返回的值存到流程中
-                String sql = (new StringBuilder()).append("update ").append(tablename).append(" set sta ='").append(state).append("', meg = '").append(message).append("' where requestId = ").append(requestid).toString();
+                String sql = (new StringBuilder()).append("update e10_core_business.dbo.").append(tablename).append(" set sta ='").append(state).append("', meg = '").append(message).append("' where requestId = ").append(requestid).toString();
                 logger_5b06e417.info(String.valueOf((new StringBuilder()).append("logsql:").append(sql).toString()));
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源

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

@@ -37,6 +37,8 @@ public class EASIntermediaryCheckAction extends BaseBean implements Action, EsbS
             String requestid = request.getRequestid();
             try {
                 logger_1e13fc37.info(String.valueOf("EASIntermediaryCheckAction：--" + requestid));
+                logger_1e13fc37.info("requestIdTemp == " +requestIdTemp);
+                logger_1e13fc37.info("userIdTemp == " +userIdTemp);
                 Property[] properties = request.getMainTableInfo().getProperty();
                 Map<String, String> map = new HashMap<String, String>();
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
@@ -59,7 +61,7 @@ public class EASIntermediaryCheckAction extends BaseBean implements Action, EsbS
                     String jgywlx = map.get("YWLX");
                     // 有效性
                     String sfyx = map.get("yxx");
-                    String sql = "select mc,yxx,ywlx from uf_intermediaries where id='" + cwzjjgxz + "'";
+                    String sql = "select mc,yxx,ywlx from e10_common.dbo.uf_intermediaries where id='" + cwzjjgxz + "'";
 
                     logger_1e13fc37.info("sql == " + sql );
                     String poolname_cn = CONN_TYPE.workflow.getType();
@@ -84,7 +86,7 @@ public class EASIntermediaryCheckAction extends BaseBean implements Action, EsbS
                     String cwzjjgmcxz = map.get("CWZJJGMCXZ");
                     // 纳税识别号
                     String nssbhxz = map.get("NSSBHXZ");
-                    String check = "select id from uf_intermediaries where mc='" + cwzjjgmcxz + "' or nssbh='" + nssbhxz + "'";
+                    String check = "select id from e10_common.dbo.uf_intermediaries where mc='" + cwzjjgmcxz + "' or nssbh='" + nssbhxz + "'";
                     logger_1e13fc37.info("check == " + check );
                     String poolname = CONN_TYPE.workflow.getType();
                     // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源

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

@@ -45,6 +45,8 @@ public class EASIntermediarySyncAction extends BaseBean implements Action, EsbSe
             String requestid = request.getRequestid();
             try {
                 logger_c15112b8.info(String.valueOf(requestid + "调用报账系统中介机构同步接口开始"));
+                logger_c15112b8.info("requestIdTemp == " +requestIdTemp);
+                logger_c15112b8.info("userIdTemp == " +userIdTemp);
                 Property[] properties = request.getMainTableInfo().getProperty();
                 Map<String, String> map = new HashMap<String, String>();
                 BillFieldUtil util = new BillFieldUtil();
@@ -125,11 +127,11 @@ public class EASIntermediarySyncAction extends BaseBean implements Action, EsbSe
                 } else {
                     String sql = "";
                     if ("0".equals(sfba)) {
-                        sql = "update uf_intermediaries set mc='" + name + "',yxx=" + map.get("YXX") + ",ywlx=" + map.get("YWLX") + " where nssbh='" + sh + "'";
+                        sql = "update e10_common.dbo.uf_intermediaries set mc='" + name + "',yxx=" + map.get("YXX") + ",ywlx=" + map.get("YWLX") + " where nssbh='" + sh + "'";
                     } else {
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         String[] datetime = sdf.format(new Date()).split(" ");
-                        sql = "insert into uf_intermediaries(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,mc,ywlx,nssbh,lxr,lxfs,sfqy,yxx) values(122," + sqrid + ",0,'" + datetime[0] + "','" + datetime[1] + "','" + name + "'," + map.get("YWLXXZ") + ",'" + sh + "','" + lxr + "','" + lxfs + "',0,0)";
+                        sql = "insert into e10_common.dbo.uf_intermediaries(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,mc,ywlx,nssbh,lxr,lxfs,sfqy,yxx) values(122," + sqrid + ",0,'" + datetime[0] + "','" + datetime[1] + "','" + name + "'," + map.get("YWLXXZ") + ",'" + sh + "','" + lxr + "','" + lxfs + "',0,0)";
                         logger_c15112b8.info(String.valueOf("sql == "+sql));
                     }
                     RecordSet rs = I18nContextUtil.getBean(RecordSet.class);

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

@@ -51,6 +51,8 @@ public class EASJiuCanSynAction extends BaseBean implements Action, EsbServerles
                 Property[] properties = requestInfo.getMainTableInfo().getProperty();
                 requestID = requestInfo.getRequestid();
                 logger_6d6f68c.info(String.valueOf("EASJiuCanSynAction-start-" + requestID));
+                logger_6d6f68c.info("requestIdTemp == " +requestIdTemp);
+                logger_6d6f68c.info("userIdTemp == " +userIdTemp);
                 Map<String, String> mMap = new HashMap<String, String>();
                 for (int i = 0; i < properties.length; i++) {
                     String name = properties[i].getName().toUpperCase();

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

@@ -51,6 +51,8 @@ public class EASPhoneBillAction extends BaseBean implements Action, EsbServerles
             String tbsj = "";
             try {
                 logger_587b7053.info(String.valueOf(requestid + "调用报账系统话费接口同步数据开始"));
+                logger_587b7053.info("requestIdTemp == " +requestIdTemp);
+                logger_587b7053.info("userIdTemp == " +userIdTemp);
                 BillFieldUtil util = new BillFieldUtil();
                 Property[] properties = request.getMainTableInfo().getProperty();
                 CostStandardHead param = new CostStandardHead();

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

@@ -51,6 +51,8 @@ public class EASPhoneBillCheckAction extends BaseBean implements Action, EsbServ
             String tbsj = "";
             try {
                 logger_1e024161.info(String.valueOf(requestid + "调用报账系统话费接口校验数据开始"));
+                logger_1e024161.info("requestIdTemp == " +requestIdTemp);
+                logger_1e024161.info("userIdTemp == " +userIdTemp);
                 BillFieldUtil util = new BillFieldUtil();
                 Property[] properties = request.getMainTableInfo().getProperty();
                 CostStandardHead param = new CostStandardHead();

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

@@ -54,6 +54,8 @@ public class EASRobotAction extends BaseBean implements Action, EsbServerlessRpc
                 Property[] properties = requestInfo.getMainTableInfo().getProperty();
                 requestID = requestInfo.getRequestid();
                 logger_c5564c68.info(String.valueOf("EASRobotAction-start-" + requestID));
+                logger_c5564c68.info("requestIdTemp == " +requestIdTemp);
+                logger_c5564c68.info("userIdTemp == " +userIdTemp);
                 Map<String, String> mMap = new HashMap<String, String>();
                 for (int i = 0; i < properties.length; i++) {
                     String name = properties[i].getName().toUpperCase();
@@ -83,6 +85,7 @@ public class EASRobotAction extends BaseBean implements Action, EsbServerlessRpc
                     mJson.put("ifExecute", "N");
                 }
                 mJson.put("acceptTime", getCurrentDate());
+
                 JSONArray array = new JSONArray();
                 array.add(mJson);
                 logger_c5564c68.info(requestID + "调用EAS接口请求数据：=====" + array.toString());
@@ -148,3 +151,4 @@ public class EASRobotAction extends BaseBean implements Action, EsbServerlessRpc
         return map;
     }
 }
+

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

@@ -32,6 +32,8 @@ public class EASTravellingChargesAction extends BaseBean implements Action, EsbS
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private FeeApplicationService service;
     private static final Logger logger_9dc11e4d = LoggerFactory.getLogger(EASTravellingChargesAction.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -49,6 +51,8 @@ public class EASTravellingChargesAction extends BaseBean implements Action, EsbS
             String tbsj = "";
             try {
                 logger_9dc11e4d.info(String.valueOf(requestid + "调用报账系统交通费接口同步数据开始"));
+                logger_9dc11e4d.info("requestIdTemp == " +requestIdTemp);
+                logger_9dc11e4d.info("userIdTemp == " +userIdTemp);
                 BillFieldUtil util = new BillFieldUtil();
                 Property[] properties = request.getMainTableInfo().getProperty();
                 CostStandardHead param = new CostStandardHead();
@@ -100,12 +104,15 @@ public class EASTravellingChargesAction extends BaseBean implements Action, EsbS
                         String valueq = Util.null2String(cq1.getValue());
                         if ("gsbh".equals(nameq)) {
                             line.setCompanyCode(valueq);
+                            logger_9dc11e4d.info("gsbh == " +valueq);
                         }
                         if ("xm".equals(nameq)) {
                             line.setEmployeeName(util.getName(valueq));
+                            logger_9dc11e4d.info("xm == " +valueq);
                         }
                         if ("gh".equals(nameq)) {
                             line.setEmployeeNumber(valueq);
+                            logger_9dc11e4d.info("gh == " +valueq);
                         }
                         if ("sfyx".equals(nameq)) {
                             String sfqy = "";
@@ -115,6 +122,7 @@ public class EASTravellingChargesAction extends BaseBean implements Action, EsbS
                                 sfqy = "N";
                             }
                             line.setEnabledFlag(sfqy);
+                            logger_9dc11e4d.info("sfyx == " +sfqy);
                         }
                         if ("ed".equals(nameq)) {
                             line.setUsableAmount(valueq);
@@ -123,9 +131,11 @@ public class EASTravellingChargesAction extends BaseBean implements Action, EsbS
                             if (!"".equals(valueq)) {
                                 line.setEfectiveDate(valueq.substring(0, 7));
                             }
+                            logger_9dc11e4d.info("sxrq == " +valueq);
                         }
                         if ("sjh".equals(nameq)) {
                             line.setMobliePhone(valueq);
+                            logger_9dc11e4d.info("sjh == " +valueq);
                         }
                         if ("sffg".equals(nameq)) {
                             String sffg = "";
@@ -135,15 +145,19 @@ public class EASTravellingChargesAction extends BaseBean implements Action, EsbS
                                 sffg = "N";
                             }
                             line.setIfCovered(sffg);
+                            logger_9dc11e4d.info("sffg == " +sffg);
                         }
                     }
                     lines[j] = line;
                 }
-                FeeApplicationService service = new FeeApplicationService();
+//                FeeApplicationService service = new FeeApplicationService();
                 param.setCostStandardLinesArr(lines);
                 CostStandardSynchronizationServiceResponse returnData = service.call(param);
                 String state = returnData.get_return().getISTAT();
+
                 String message = returnData.get_return().getMESSAGE();
+                logger_9dc11e4d.info("state == " +state);
+                logger_9dc11e4d.info("message == " +message);
                 if (!"1".equals(state)) {
                     ResultInfoLines[] info = returnData.get_return().getResultInfoLinesArr();
                     StringBuilder sb = new StringBuilder();

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

@@ -53,6 +53,8 @@ public class EASZhuSuSynAction extends BaseBean implements Action, EsbServerless
                 Property[] properties = requestInfo.getMainTableInfo().getProperty();
                 requestID = requestInfo.getRequestid();
                 logger_f451692d.info(String.valueOf("EASZhuSuSynAction-start-" + requestID));
+                logger_f451692d.info("requestIdTemp == " +requestIdTemp);
+                logger_f451692d.info("userIdTemp == " +userIdTemp);
                 Map<String, String> mMap = new HashMap<String, String>();
                 for (int i = 0; i < properties.length; i++) {
                     String name = properties[i].getName().toUpperCase();

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

@@ -2,8 +2,9 @@ package com.weaver.seconddev.interfaces.workflow.action;
 
 import java.util.ArrayList;
 import java.util.List;
-import  com.weaver.seconddev.interfaces.easoa.CallEasServices;
+
 import com.weaver.common.i18n.tool.util.I18nContextUtil;
+import com.weaver.seconddev.interfaces.easoa.CallEasServices;
 import com.weaver.verupgrade.conn.CONN_TYPE;
 import java.lang.*;
 import java.util.*;
@@ -47,6 +48,8 @@ public class EasQuerySourceBoeNumAction extends BaseBean implements Action, EsbS
         RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
         try {
             logger_3c7e784f.info(String.valueOf("do EasQuerySourceBoeNumAction on request:" + request.getRequestid()));
+            logger_3c7e784f.info("requestIdTemp == " +requestIdTemp);
+            logger_3c7e784f.info("userIdTemp == " +userIdTemp);
             try {
                 // 获取主表数据
                 // 申请类型 	1供应商、2报账单
@@ -200,7 +203,7 @@ public class EasQuerySourceBoeNumAction extends BaseBean implements Action, EsbS
                     } else {
                         RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
                         for (int n = 0; n < gysidArray.length; n++) {
-                            String sql = "select oid from uf_eas_vendor v INNER JOIN uf_eas_company c on v.companyId=c.oid where v.vendorId='" + gysidArray[n] + "'";
+                            String sql = "select oid from e10_common.dbo.uf_eas_vendor v INNER JOIN uf_eas_company c on v.companyId=c.oid where v.vendorId='" + gysidArray[n] + "'";
                             String poolname = CONN_TYPE.workflow.getType();
                             // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                             rs.executeSql(sql, poolname);

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

@@ -17,22 +17,27 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
 /**
  * oa->eas 报账系统，投资类合同报账单返回接口
  */
+@Component
 public class EasTzlbzdApproveResult extends BaseBean {
 
     private static final Logger logger_e942c7ec = LoggerFactory.getLogger(EasTzlbzdApproveResult.class);
     @Autowired
     private ConfigProp configProp;
     public String getApproveResult(JSONObject returnJson) {
+
+        logger_e942c7ec.info("EasTzlbzdApproveResult getApproveResult returnJson== " +returnJson);
         HttpPost post = null;
         String result = "E";
         try {
             HttpClient client = new DefaultHttpClient();
 //            String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("hteasoasync.getApproveResultUrl")).trim();
             String url = configProp.getApprovalResult();
+            logger_e942c7ec.info("url== " +url);
             post = new HttpPost(url);
             post.setHeader(HTTP.CONTENT_TYPE, "application/json; charset=UTF-8");
             post.setHeader("Accept", "application/json; charset=UTF-8");
@@ -51,6 +56,7 @@ public class EasTzlbzdApproveResult extends BaseBean {
                 post.releaseConnection();
             }
         }
+        logger_e942c7ec.info("EasTzlbzdApproveResult getApproveResult result== " +result);
         return result;
     }
 }

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

@@ -31,6 +31,9 @@ public class EasTzlbzdApproveResultAction extends BaseBean implements Action, Es
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private EasTzlbzdApproveResult mGetResult;
+
     private static final Logger logger_a0a49142 = LoggerFactory.getLogger(EasTzlbzdApproveResultAction.class);
 
     @Override
@@ -73,6 +76,8 @@ public class EasTzlbzdApproveResultAction extends BaseBean implements Action, Es
                 requestID = requestInfo.getRequestid();
                 // requestNum = requestInfo.getWorkflowid();
                 logger_a0a49142.info(String.valueOf("EasTzlbzdApproveResultAction--start--" + requestID));
+                logger_a0a49142.info("requestIdTemp == " +requestIdTemp);
+                logger_a0a49142.info("userIdTemp == " +userIdTemp);
                 Map<String, String> mMap = new HashMap<String, String>();
                 for (int i = 0; i < properties.length; i++) {
                     String name = properties[i].getName().toUpperCase();
@@ -100,7 +105,8 @@ public class EasTzlbzdApproveResultAction extends BaseBean implements Action, Es
                 // 请求id
                 mJson.put("requestID", requestID);
                 // mJson.put("OANumber",lcbh);//流程编号
-                EasTzlbzdApproveResult mGetResult = new EasTzlbzdApproveResult();
+//                EasTzlbzdApproveResult mGetResult = new EasTzlbzdApproveResult();
+                logger_a0a49142.info(String.valueOf("mJson：" + mJson));
                 String result = mGetResult.getApproveResult(mJson);
                 logger_a0a49142.info(String.valueOf("调用报账系统投资类报账单审批接口返回值：" + result));
                 if (!"E".equals(result)) {

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

@@ -17,16 +17,20 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.weaver.verupgrade.general.BaseBean;
 import com.weaver.verupgrade.general.Util;
+import org.springframework.stereotype.Component;
 
 /**
  * 投资类合同新增接口返回
  */
+@Component
 public class EasTzlhtApplyResult extends BaseBean {
 
     private static final Logger logger_4b97b171 = LoggerFactory.getLogger(EasTzlhtApplyResult.class);
     @Autowired
     private ConfigProp configProp;
     public String getApproveResult(JSONObject returnJson) {
+
+        logger_4b97b171.info("EasTzlhtApplyResult getApproveResult returnJson== " +returnJson);
         HttpPost post = null;
         String result = "E";
         try {
@@ -57,6 +61,7 @@ public class EasTzlhtApplyResult extends BaseBean {
                 post.releaseConnection();
             }
         }
+        logger_4b97b171.info("EasTzlhtApplyResult getApproveResult result== " +result);
         return result;
     }
 }

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

@@ -39,6 +39,8 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private EasTzlhtApplyResult mGetResult;
     // public String getFKFname(String var1) {
     // String var2 = "";
     // RecordSet var3 = new RecordSet();
@@ -80,6 +82,8 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
                 Property[] properties = requestInfo.getMainTableInfo().getProperty();
                 requestID = requestInfo.getRequestid();
                 logger_1cc47ce8.info(String.valueOf("EasTzlhtSubmitAction--start--" + requestID));
+                logger_1cc47ce8.info("requestIdTemp == " +requestIdTemp);
+                logger_1cc47ce8.info("userIdTemp == " +userIdTemp);
                 Map<String, String> mMap = new HashMap<String, String>();
                 for (int i = 0; i < properties.length; i++) {
                     String name = properties[i].getName().toUpperCase();
@@ -197,14 +201,14 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
                     RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
                     String poolname = CONN_TYPE.workflow.getType();
                     // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                    rs.executeSql("select bzzje from formtable_main_2605 where lcbh !='' and relationProjectId = " + projectBudget, poolname);
+                    rs.executeSql("select bzzje from e10_core_business.dbo.formtable_main_2605 where lcbh !='' and relationProjectId = " + projectBudget, poolname);
                     if (rs.next()) {
                         oldmoney = oldmoney.add(new BigDecimal(Util.null2String(rs.getString("bzzje"))));
                     }
                     RecordSet rs2 = I18nContextUtil.getBean(RecordSet.class);
                     String poolname_j5 = CONN_TYPE.workflow.getType();
                     // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                    rs2.executeSql("select useAmount from uf_eas_budget where relationProjectId = " + projectBudget, poolname_j5);
+                    rs2.executeSql("select useAmount from e10_common.dbo.uf_eas_budget where relationProjectId = " + projectBudget, poolname_j5);
                     if (rs2.next()) {
                         ysje = new BigDecimal(Util.null2String(rs2.getString("useAmount")));
                     }
@@ -371,6 +375,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
                 logger_1cc47ce8.info("调用投资类合同新增校验接口请求数据1：=====" + mJson.toString());
                 // long count=jdslist.stream().distinct().count();
                 long count = distinctBySetOrder(jdslist).size();
+                logger_1cc47ce8.info("count == "+ count);
                 if (count > 1) {
                     errorMsg = errorMsg + "付款条件明细表中只能选择一种阶段数！</br>";
                 }
@@ -384,6 +389,9 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
                 if (count2 != count3) {
                     errorMsg = errorMsg + "约束条件明细表与付款条件明细表不匹配！</br>";
                 }
+
+                logger_1cc47ce8.info("errorMsg == "+ errorMsg);
+                logger_1cc47ce8.info("projectCode == "+ projectCode);
                 if ("0000".equals(projectCode) && (projectBudget != null && !projectBudget.equals(""))) {
                     requestInfo.getRequestManager().setMessageid("ERROR");
                     requestInfo.getRequestManager().setMessagecontent("项目选择无的时候，项目预算不选！");
@@ -402,7 +410,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
                     // return  FAILURE_AND_CONTINUE;
                 } else {
                     // 调用接口
-                    EasTzlhtApplyResult mGetResult = new EasTzlhtApplyResult();
+//                    EasTzlhtApplyResult mGetResult = new EasTzlhtApplyResult();
                     String result = mGetResult.getApproveResult(mJson);
                     logger_1cc47ce8.info(String.valueOf("调用投资类合同新增校验接口返回值：" + result));
                     if (!"E".equals(result)) {
@@ -443,7 +451,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
         RecordSet var3 = I18nContextUtil.getBean(RecordSet.class);
         String poolname_9f = CONN_TYPE.workflow.getType();
         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-        var3.executeSql("select companycode from uf_eas_company where id = " + var1, poolname_9f);
+        var3.executeSql("select companycode from e10_common.dbo.uf_eas_company where id = " + var1, poolname_9f);
         if (var3.next()) {
             var2 = Util.null2String(var3.getString("companycode"));
         }
@@ -455,7 +463,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
         RecordSet var3 = I18nContextUtil.getBean(RecordSet.class);
         String poolname_du = CONN_TYPE.workflow.getType();
         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-        var3.executeSql("select oid from uf_eas_company where id = " + var1, poolname_du);
+        var3.executeSql("select oid from e10_common.dbo.uf_eas_company where id = " + var1, poolname_du);
         if (var3.next()) {
             var2 = Util.null2String(var3.getString("oid"));
         }
@@ -467,7 +475,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
         RecordSet var3 = I18nContextUtil.getBean(RecordSet.class);
         String poolname_0g = CONN_TYPE.workflow.getType();
         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-        var3.executeSql("select companyname from uf_eas_company where id = " + var1, poolname_0g);
+        var3.executeSql("select companyname from e10_common.dbo.uf_eas_company where id = " + var1, poolname_0g);
         if (var3.next()) {
             var2 = Util.null2String(var3.getString("companyname"));
         }
@@ -479,7 +487,7 @@ public class EasTzlhtSubmitAction extends BaseBean implements Action, EsbServerl
         RecordSet var3 = I18nContextUtil.getBean(RecordSet.class);
         String poolname_c3 = CONN_TYPE.workflow.getType();
         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-        var3.executeSql("select code from department as  HrmDepartment where id = " + var1, poolname_c3);
+        var3.executeSql("select code from eteams.dbo.department as  HrmDepartment where id = " + var1, poolname_c3);
         if (var3.next()) {
             var2 = Util.null2String(var3.getString("departmentcode"));
         }

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

@@ -37,6 +37,8 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private EasTzlhtApplyResult mGetResult;
     private static final Logger logger_197dffab = LoggerFactory.getLogger(EasTzlhtSyncAction.class);
 
     @Override
@@ -68,6 +70,8 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles
                 Property[] properties = requestInfo.getMainTableInfo().getProperty();
                 requestID = requestInfo.getRequestid();
                 logger_197dffab.info(String.valueOf("EasTzlhtSyncAction--start--" + requestID));
+                logger_197dffab.info("requestIdTemp == " +requestIdTemp);
+                logger_197dffab.info("userIdTemp == " +userIdTemp);
                 Map<String, String> mMap = new HashMap<String, String>();
                 for (int i = 0; i < properties.length; i++) {
                     String name = properties[i].getName().toUpperCase();
@@ -300,7 +304,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles
                 mJson.put("contractLines", mJSONArray1);
                 logger_197dffab.info("调用投资类合同新增同步接口请求数据1：=====" + mJson.toString());
                 // 调用接口
-                EasTzlhtApplyResult mGetResult = new EasTzlhtApplyResult();
+//                EasTzlhtApplyResult mGetResult = new EasTzlhtApplyResult();
                 String result = mGetResult.getApproveResult(mJson);
                 logger_197dffab.info(String.valueOf("调用投资类合同新增同步接口返回值：" + result));
                 if (!"E".equals(result)) {
@@ -340,7 +344,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles
         RecordSet var3 = I18nContextUtil.getBean(RecordSet.class);
         String poolname_kp = CONN_TYPE.workflow.getType();
         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-        var3.executeSql("select companycode from uf_eas_company where id = " + var1, poolname_kp);
+        var3.executeSql("select companycode from e10_common.dbo.uf_eas_company where id = " + var1, poolname_kp);
         if (var3.next()) {
             var2 = Util.null2String(var3.getString("companycode"));
         }
@@ -352,7 +356,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles
         RecordSet var3 = I18nContextUtil.getBean(RecordSet.class);
         String poolname_vt = CONN_TYPE.workflow.getType();
         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-        var3.executeSql("select oid from uf_eas_company where id = " + var1, poolname_vt);
+        var3.executeSql("select oid from e10_common.dbo.uf_eas_company where id = " + var1, poolname_vt);
         if (var3.next()) {
             var2 = Util.null2String(var3.getString("oid"));
         }
@@ -364,7 +368,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles
         RecordSet var3 = I18nContextUtil.getBean(RecordSet.class);
         String poolname_jy = CONN_TYPE.workflow.getType();
         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-        var3.executeSql("select companyname from uf_eas_company where id = " + var1, poolname_jy);
+        var3.executeSql("select companyname from e10_common.dbo.uf_eas_company where id = " + var1, poolname_jy);
         if (var3.next()) {
             var2 = Util.null2String(var3.getString("companyname"));
         }
@@ -376,7 +380,7 @@ public class EasTzlhtSyncAction extends BaseBean implements Action, EsbServerles
         RecordSet var3 = I18nContextUtil.getBean(RecordSet.class);
         String poolname_bg = CONN_TYPE.workflow.getType();
         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-        var3.executeSql("select code from department as  HrmDepartment where id = " + var1, poolname_bg);
+        var3.executeSql("select code from eteams.dbo.department as  HrmDepartment where id = " + var1, poolname_bg);
         if (var3.next()) {
             var2 = Util.null2String(var3.getString("departmentcode"));
         }

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

@@ -37,21 +37,27 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles
         Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
         Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
         RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
+        logger_b5430ca5.info("EasWhiteListAction start== ");
+        logger_b5430ca5.info("requestIdTemp == " +requestIdTemp);
+        logger_b5430ca5.info("userIdTemp == " +userIdTemp);
         try {
             String requestid = request.getRequestid();
             String tablename = "";
             String wfid = request.getWorkflowid();
             BillFieldUtil unit = new BillFieldUtil();
-            tablename = unit.getTablename(wfid);
+//            tablename = unit.getTablename(wfid);
+            tablename = request.getRequestManager().getBillTableName();
             int id = 0;
             try {
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                String sql = "select id from " + tablename + " where requestId='" + requestid + "'";
+                String sql = "select id from e10_core_business.dbo." + tablename + " where requestId='" + requestid + "'";
+                logger_b5430ca5.info("sql == "+sql);
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                 rs.executeSql(sql, poolname);
                 while (rs.next()) {
                     id = rs.getInt("id");
+                    logger_b5430ca5.info("id == "+id);
                 }
             } catch (Exception e) {
                 logger_b5430ca5.info(String.valueOf(e.toString()));
@@ -86,41 +92,53 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles
                 String value = Util.null2String(aproperty[i].getValue());
                 if (name.equals("MC")) {
                     mc = value;
+                    logger_b5430ca5.info("MC == "+mc);
                 }
                 if (name.equals("BMDLX")) {
                     type = value;
+                    logger_b5430ca5.info("type == "+type);
                 }
                 if (name.equals("BMDZT")) {
                     status = value;
+                    logger_b5430ca5.info("status == "+status);
                 }
                 if (name.equals("YHZH")) {
                     bankAccount = value;
+                    logger_b5430ca5.info("bankAccount == "+bankAccount);
                 }
                 if (name.equals("YHMC")) {
                     bankName = value;
+                    logger_b5430ca5.info("bankName == "+bankName);
                 }
                 if (name.equals("SHXYDM")) {
                     identityNumber = value;
+                    logger_b5430ca5.info("identityNumber == "+identityNumber);
                 }
                 if (name.equals("TBSJ")) {
                     rq = value;
+                    logger_b5430ca5.info("rq == "+rq);
                 }
                 if (name.equals("SJ")) {
                     sj = value;
+                    logger_b5430ca5.info("sj == "+sj);
                 }
                 if (name.equals("YXJZRQ")) {
                     if (!"".equals(value) && value != null) {
                         endTime = value + " 00:00:00";
                     }
+                    logger_b5430ca5.info("endTime == "+endTime);
                 }
                 if (name.equals("SQBMDYY")) {
                     reason = value;
+                    logger_b5430ca5.info("reason == "+reason);
                 }
                 if (name.equals("LCBH")) {
                     flowCode = value;
+                    logger_b5430ca5.info("flowCode == "+flowCode);
                 }
                 if (!"".equals(flowCode)) {
                     code = flowCode.trim().substring(flowCode.length() - 11, flowCode.length());
+                    logger_b5430ca5.info("code == "+code);
                 }
                 createTime = rq + " " + sj + ":00";
             }
@@ -164,10 +182,13 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles
                 result[3] = resultInfo.getSENDID();
                 result[4] = resultInfo.getSYSID();
                 RecordSet rs1 = I18nContextUtil.getBean(RecordSet.class);
-                String sql = "update " + tablename + " set state='" + result[0] + "',message='" + result[2] + "' where requestId='" + requestid + "'";
+                String sql = "update e10_core_business.dbo." + tablename + " set state='" + result[0] + "',message='" + result[2] + "' where requestId='" + requestid + "'";
+                logger_b5430ca5.info("sql = "+sql);
+
                 String poolname_x3 = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs1.executeSql(sql, poolname_x3);
+                boolean b = rs1.executeSql(sql, poolname_x3);
+                logger_b5430ca5.info("result = "+b);
             } catch (Exception e) {
                 logger_b5430ca5.info(String.valueOf("EasWhiteListAction调用接口报错 " + e.toString()));
             }

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

@@ -56,22 +56,30 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS
             BillFieldUtil unit = new  com.weaver.seconddev.interfaces.swfa.BillFieldUtil();
             try {
                 logger_59285be7.info(String.valueOf("EasYszxfpApplyResultAction--start--" + requestID));
+                logger_59285be7.info("requestIdTemp == " +requestIdTemp);
+                logger_59285be7.info("userIdTemp == " +userIdTemp);
                 Property[] properties = requestInfo.getMainTableInfo().getProperty();
                 requestID = requestInfo.getRequestid();
                 String wfid = requestInfo.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
-                String sql = "select sfdy from " + tablename + " where requestId =" + requestID;
+                tablename = requestInfo.getRequestManager().getBillTableName();
+                String sql = "select sfdy from e10_core_business.dbo." + tablename + " where requestId =" + requestID;
+                logger_59285be7.info("sql == " +sql);
                 String poolname_l4 = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
                 rs.executeSql(sql, poolname_l4);
                 if (rs.next()) {
                     int sfdy = rs.getInt("sfdy");
+                    logger_59285be7.info("sfdy == " +sfdy);
                     if (sfdy == 0) {
                         return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager()));
                     } else {
                         String poolname_r6 = CONN_TYPE.workflow.getType();
                         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                        rs.executeSql("update " + tablename + " set sfdy = 0 where requestId = " + requestID, poolname_r6);
+                        String sql2 = "update e10_core_business.dbo." + tablename + " set sfdy = 0 where requestId = " + requestID;
+                        logger_59285be7.info("sql2 == " +sql2);
+                        boolean b = rs.executeSql(sql2, poolname_r6);
+                        logger_59285be7.info("b == " +b);
                     }
                 }
                 Map<String, String> mMap = new HashMap<String, String>();
@@ -182,7 +190,10 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS
                         String poolname_so = CONN_TYPE.workflow.getType();
                         // 失败
                         // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                        rs.executeSql("update " + tablename + " set sfdy = 1 where requestId = " + requestID, poolname_so);
+                        String sql3 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where requestId = " + requestID;
+                        logger_59285be7.info("sql3"+sql3);
+                        boolean b = rs.executeSql(sql3, poolname_so);
+                        logger_59285be7.info("b2"+b);
                         logger_59285be7.info(String.valueOf(requestID + "报账系统返回错误信息：" + srMessage));
                         requestInfo.getRequestManager().setMessageid("ERROR");
                         requestInfo.getRequestManager().setMessagecontent("报账系统返回错误信息：" + srMessage);
@@ -191,12 +202,18 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS
                 } else {
                     String poolname_b5 = CONN_TYPE.workflow.getType();
                     // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                    rs.executeSql("update " + tablename + " set sfdy = 1 where requestId = " + requestID, poolname_b5);
+                    String sql4 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where requestId = " + requestID;
+                    logger_59285be7.info("sql4"+sql4);
+                    boolean b = rs.executeSql(sql4, poolname_b5);
+                    logger_59285be7.info("b3"+b);
                 }
             } catch (Exception e) {
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql("update " + tablename + " set sfdy = 1 where requestId = " + requestID, poolname);
+                String sql5 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where requestId = " + requestID;
+                logger_59285be7.info("sql5"+sql5);
+                boolean b = rs.executeSql(sql5, poolname);
+                logger_59285be7.info("b4"+b);
                 logger_59285be7.info(String.valueOf(requestID + "调用报账系统应收折现发票申请接口出错：" + e.toString()));
                 requestInfo.getRequestManager().setMessageid("ERROR");
                 requestInfo.getRequestManager().setMessagecontent("调用报账系统应收折现发票申请接口返回失败，请联系报账系统管理员！");

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

@@ -1,240 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import javax.xml.namespace.QName;
-import org.apache.axis.client.Call;
-import org.apache.axis.client.Service;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import java.util.Map;
-import java.util.HashMap;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.conn.RecordSetDataSource;
-import com.weaver.verupgrade.general.TimeUtil;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.soa.workflow.request.Cell;
-import com.weaver.verupgrade.soa.workflow.request.DetailTable;
-import com.weaver.verupgrade.soa.workflow.request.Row;
-
-@org.springframework.stereotype.Service("workflow_action_GangWeiXinZengAction")
-public class GangWeiXinZengAction implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_3bab3f4e = LoggerFactory.getLogger(GangWeiXinZengAction.class);
-
-    private Log log = LogFactory.getLog(GangWeiXinZengAction.class.getName());
-
-    public Log getLog() {
-        return log;
-    }
-
-    public void setLog(Log log) {
-        this.log = log;
-    }
-
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        // RecordSetDataSource rsds = new RecordSetDataSource("eHR_test");
-        // rsds.executeSql("select 员工GUID AS YGID from ht_psnaccount where 员工工号 ="+createrId);
-        // rsds.next();
-        // String  ApplyerID =  Util.null2String(rsds.getString("YGID"));
-        // int departmentId = Util.getIntValue(rs2.getString("id"));
-        // RecordSet rs3 = new RecordSet();
-        // rs3.executeSql("select * from HrmJobTitles where id="+XQGW);
-        // if (!rs3.next()){
-        // PositionStatus = "1";
-        // }
-        try {
-            log.info("do action on request:" + request.getRequestid());
-            String requestid = request.getRequestid();
-            String lastoperator = request.getLastoperator();
-            String creater = request.getCreatorid();
-            RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-            RecordSet rs2 = I18nContextUtil.getBean(RecordSet.class);
-            String workflowid = request.getWorkflowid();
-            String maintable = "";
-            String sql = "select b.tablename from wfp_base a,form b where a.formid = b.id and a.id = " + workflowid;
-            String createsqlString = "select id  from employee as  hrmresource where lastname ='" + creater + "'";
-            String poolname = CONN_TYPE.workflow.getType();
-            // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-            rs2.executeSql(createsqlString, poolname);
-            rs2.next();
-            String createrId = rs2.getString("id");
-            String poolname_xh = CONN_TYPE.workflow.getType();
-            // RecordSetDataSource rsds = new RecordSetDataSource("eHR_test");
-            // rsds.executeSql("select 员工GUID AS YGID from ht_psnaccount where 员工工号 ="+createrId);
-            // rsds.next();
-            // String  ApplyerID =  Util.null2String(rsds.getString("YGID"));
-            // int departmentId = Util.getIntValue(rs2.getString("id"));
-            /*        String creater = rs2.getString("departmentmark") + "_" + rs2.getString("lastname");
- TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
-            rs.executeSql(sql, poolname_xh);
-            while (rs.next()) {
-                maintable = rs.getString("tablename");
-            }
-            // 申请部门
-            String SQBM = "";
-            // 新增岗位名称
-            String SQGWMC = "";
-            // 申请岗位名称
-            String SQGWMC2 = "";
-            // 申请日期
-            String SQRQ = "";
-            // 需求原因
-            String SQYY = "";
-            // 是否新增岗位
-            String PositionStatus = "";
-            // 岗位序列GUID
-            String PositionAttID = "";
-            // 岗位类型GUID
-            String PositionTypeID = "";
-            String SQZWLX = "";
-            String SQZW = "";
-            String PositionID = "";
-            String DeptID = "";
-            // 获取表单主字段信息
-            Property[] properties = request.getMainTableInfo().getProperty();
-            for (int i = 0; i < properties.length; i++) {
-                // 主表数据
-                // 字段名
-                String name = properties[i].getName().toUpperCase();
-                // 值
-                String value = Util.null2String(properties[i].getValue());
-                if (name.equals("SQRQ")) {
-                    SQRQ = value;
-                    SQRQ = SQRQ.substring(0, 10);
-                } else if (name.equals("SQYY")) {
-                    SQYY = value;
-                } else if (name.equals("SQBM")) {
-                    SQBM = value;
-                    String poolname_li = CONN_TYPE.workflow.getType();
-                    // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                    rs.executeSql("select code from department as  HrmDepartment where id =" + SQBM, poolname_li);
-                    rs.next();
-                    DeptID = Util.null2String(rs.getString("departmentcode"));
-                } else if (name.equals("SQGWMC")) {
-                    SQGWMC = value;
-                } else if (name.equals("SQGWMC2")) {
-                    SQGWMC2 = value;
-                } else if (name.equals("SQZWLX1")) {
-                    // PositionAttID = value;
-                    SQZWLX = value;
-                } else if (name.equals("SQZW1")) {
-                    // PositionTypeID = value;
-                    SQZW = value;
-                }
-                log.info("main:" + requestid + "	" + name + "	" + value);
-            }
-            if (!SQGWMC2.equals("")) {
-                String poolname_i3 = CONN_TYPE.workflow.getType();
-                /*RecordSetDataSource rsds = new RecordSetDataSource("HR");
- TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
-                rs.executeSql("select code from position as  HrmJobTitles where id =" + SQGWMC2, poolname_i3);
-                // rsds.execute("select 岗位GUID AS GWGUID from ht_jobcode where 岗位ID ='"+SQGWMC1+"'");
-                // rsds.next();
-                rs.next();
-                PositionID = Util.null2String(rs.getString("jobtitlecode"));
-                PositionStatus = "0";
-                // RecordSet rs3 = new RecordSet();
-                // String sql3 = "select a.JobActivitiescode,b.jobgroupscode from (select JobActivitiescode,jobgroupid from HrmJobActivities where " +
-                // "id in (select  jobactivityid from HrmJobTitles where jobtitlecode='"+SQGWMC1+"' and jobdepartmentid ="+SQBM+"))a left join HrmJobGroups b on a.jobgroupid=b.id ";
-                // rs3.executeSql(sql3);
-                // rs3.next();
-                // PositionAttID = rs3.getString("JobActivitiescode");
-                // PositionTypeID = rs3.getString("jobgroupscode");
-            }
-            if (!SQZWLX.equals("")) {
-                RecordSet rs3 = I18nContextUtil.getBean(RecordSet.class);
-                String poolname_1r = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs3.executeSql("select jobgroupscode from hrm_jobtype_set as  HrmJobGroups where id=" + SQZWLX, poolname_1r);
-                rs3.next();
-                PositionAttID = Util.null2String(rs3.getString("jobgroupscode"));
-            }
-            if (!SQZW.equals("")) {
-                RecordSet rs4 = I18nContextUtil.getBean(RecordSet.class);
-                String poolname_cg = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs4.executeSql("select JobActivitiescode from hrm_jobset as  HrmJobActivities where id=" + SQZW, poolname_cg);
-                rs4.next();
-                PositionTypeID = Util.null2String(rs4.getString("JobActivitiescode"));
-            }
-            if (!SQGWMC.equals("")) {
-                PositionStatus = "1";
-            }
-            // RecordSet rs3 = new RecordSet();
-            // rs3.executeSql("select * from HrmJobTitles where id="+XQGW);
-            // if (!rs3.next()){
-            // PositionStatus = "1";
-            // }
-            try {
-                // ApplyPositionFormWS(XQBM,XQGW,SQRQ,Integer.parseInt(XQRS),XWBDRQ,ZBFS2,XQYY1);
-                // JobCodeToDeptFormWS(XQBM,XQGW,createrId,SQRQ);
-                String endPoint = "http://10.6.2.12/hengtongws/HengtongWebService.asmx";
-                String soapaction = "http://tempuri.org/";
-                Service service = new Service();
-                Call call1 = (Call) service.createCall();
-                call1.setTargetEndpointAddress(new java.net.URL(endPoint));
-                call1.setOperationName(new QName(soapaction, "JobCodeToDeptFormWS"));
-                call1.addParameter(new QName(soapaction, "DeptID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);
-                call1.addParameter(new QName(soapaction, "PositionAttID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);
-                call1.addParameter(new QName(soapaction, "PositionTypeID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);
-                call1.addParameter(new QName(soapaction, "PositionID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);
-                call1.addParameter(new QName(soapaction, "PositionStatus"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);
-                call1.addParameter(new QName(soapaction, "PositionName"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);
-                call1.addParameter(new QName(soapaction, "ApplyerID"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);
-                call1.addParameter(new QName(soapaction, "ApplyDate"), org.apache.axis.encoding.XMLType.XSD_STRING, javax.xml.rpc.ParameterMode.INOUT);
-                call1.setReturnType(new QName(soapaction, "JobCodeToDeptFormWS"), String.class);
-                call1.setUseSOAPAction(true);
-                call1.setSOAPActionURI(soapaction + "JobCodeToDeptFormWS");
-                log.info("DeptID:-----  " + DeptID + "PositionAttID: -----  " + PositionAttID + "PositionTypeID:  ----" + PositionTypeID + "PositionID :  ----" + PositionID + "PositionStatus------  " + PositionStatus + "SQGWMC:" + SQGWMC + "createrId:----" + createrId + "SQRQ:  ----" + SQRQ);
-                String str = (String) call1.invoke(new Object[] { DeptID, PositionAttID, PositionTypeID, PositionID, PositionStatus, SQGWMC, createrId, SQRQ });
-                System.out.println(str);
-                log.info("str:" + str);
-                if (!str.equals("SUCCESS")) {
-                    request.getRequestManager().setMessageid("100004");
-                    request.getRequestManager().setMessagecontent(str);
-                }
-            } catch (Exception e) {
-                System.err.println(e.toString());
-            }
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_3bab3f4e.error("GangWeiXinZengAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -34,6 +34,8 @@ public class HTGD_MES_NonStandardAction extends BaseBean implements Action, EsbS
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private ReturnMesWLPS_SYService service;
     private static final Logger logger_c8d15d65 = LoggerFactory.getLogger(HTGD_MES_NonStandardAction.class);
 
     @Override
@@ -45,6 +47,8 @@ public class HTGD_MES_NonStandardAction extends BaseBean implements Action, EsbS
         try {
             String requestId = requestInfo.getRequestid();
             logger_c8d15d65.info(String.valueOf("HTGD_MES_NonStandardAction--" + requestId + "开始执行"));
+            logger_c8d15d65.info("requestIdTemp == " +requestIdTemp);
+            logger_c8d15d65.info("userIdTemp == " +userIdTemp);
             // 工作流ID
             String workFlowId = requestInfo.getWorkflowid();
             BillFieldUtil util = new BillFieldUtil();
@@ -67,7 +71,7 @@ public class HTGD_MES_NonStandardAction extends BaseBean implements Action, EsbS
                 // 业务员
                 String ywy = map.get("YWY");
                 String uuid = UUID.randomUUID().toString();
-                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
+//                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request req = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main mainData = new SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main param = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main();

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

@@ -38,6 +38,8 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private ReturnMesWLPS_SYService service;
     private static final Logger logger_1ea91e04 = LoggerFactory.getLogger(HTGD_MES_SC03Action.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -54,6 +56,8 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle
                 String workFlowId = requestinfo.getWorkflowid();
                 ResourceComInfo rsCom = I18nContextUtil.getBean(ResourceComInfo.class);
                 logger_1ea91e04.info(String.valueOf("HTGD_MES_SC03Action-start-" + requestId));
+                logger_1ea91e04.info("requestIdTemp == " +requestIdTemp);
+                logger_1ea91e04.info("userIdTemp == " +userIdTemp);
                 String fxzt = "";
                 // 申请部门意见
                 String sqbmyj = "";
@@ -135,7 +139,7 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle
                     mjson.put("xzbmyj", "");
                 }
                 String uuid = UUID.randomUUID().toString();
-                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
+//                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request req = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main mainData = new SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main param = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main();

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

@@ -37,7 +37,8 @@ public class HTGD_MES_SpeedFixAction extends BaseBean implements Action, EsbServ
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ReturnMesWLPS_SYService service;
     private static final Logger logger_d0d39a5f = LoggerFactory.getLogger(HTGD_MES_SpeedFixAction.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -53,6 +54,8 @@ public class HTGD_MES_SpeedFixAction extends BaseBean implements Action, EsbServ
                 // 工作流ID
                 String workFlowId = requestinfo.getWorkflowid();
                 logger_d0d39a5f.info(String.valueOf("HTGD_MES_SpeedFixAction-start-" + requestId));
+                logger_d0d39a5f.info("requestIdTemp == " +requestIdTemp);
+                logger_d0d39a5f.info("userIdTemp == " +userIdTemp);
                 String fxzt = "";
                 Property[] aproperty = requestinfo.getMainTableInfo().getProperty();
                 for (int j = 0; j < aproperty.length; j++) {
@@ -92,7 +95,7 @@ public class HTGD_MES_SpeedFixAction extends BaseBean implements Action, EsbServ
                 }
                 ResourceComInfo rsCom = I18nContextUtil.getBean(ResourceComInfo.class);
                 String uuid = UUID.randomUUID().toString();
-                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
+//                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
                 WLPS_SY_Request req = new WLPS_SY_Request();
                 ArrayOfWLPS_SY_Main mainData = new ArrayOfWLPS_SY_Main();
                 WLPS_SY_Main param = new WLPS_SY_Main();

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

@@ -1,6 +1,7 @@
 package com.weaver.seconddev.interfaces.workflow.action;
 
 import com.alibaba.fastjson.JSONObject;
+import com.netflix.discovery.converters.Auto;
 import  com.weaver.seconddev.interfaces.oames.ReturnMesWLPS_SYService;
 import  com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub;
 import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
@@ -35,6 +36,8 @@ public class HTGD_MES_TDLApproveActivon extends BaseBean implements Action, EsbS
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private ReturnMesWLPS_SYService service;
     private static final Logger logger_674a8052 = LoggerFactory.getLogger(HTGD_MES_TDLApproveActivon.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -50,6 +53,8 @@ public class HTGD_MES_TDLApproveActivon extends BaseBean implements Action, EsbS
                 // 工作流ID
                 String workFlowId = requestinfo.getWorkflowid();
                 logger_674a8052.info(String.valueOf("HTGD_MES_TDLApproveActivon-start-" + requestId));
+                logger_674a8052.info("requestIdTemp == " +requestIdTemp);
+                logger_674a8052.info("userIdTemp == " +userIdTemp);
                 String fxzt = "";
                 Property[] aproperty = requestinfo.getMainTableInfo().getProperty();
                 for (int j = 0; j < aproperty.length; j++) {
@@ -61,7 +66,7 @@ public class HTGD_MES_TDLApproveActivon extends BaseBean implements Action, EsbS
                 }
                 ResourceComInfo rsCom = I18nContextUtil.getBean(ResourceComInfo.class);
                 String uuid = UUID.randomUUID().toString();
-                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
+//                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request req = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main mainData = new SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main param = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main();

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

@@ -1,145 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import  com.weaver.seconddev.interfaces.oames.ReturnMesWLPS_SYService;
-import  com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub;
-import com.weaver.seconddev.interfaces.prop.ConfigProp;
-import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import org.springframework.core.env.Environment;
-import java.lang.*;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
-import com.weaver.verupgrade.soa.workflow.request.*;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-/**
- * HTGD-ZG04-亨通光导质量异常处理流程 回调
- */
-@org.springframework.stereotype.Service("workflow_action_HTGD_MES_ZG04ReturnAction")
-public class HTGD_MES_ZG04ReturnAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    @Autowired
-    private ConfigProp configProp;
-    private static final Logger logger_5763d172 = LoggerFactory.getLogger(HTGD_MES_ZG04ReturnAction.class);
-
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            String requestId = requestinfo.getRequestid();
-            try {
-                String requestName = requestinfo.getRequestManager().getRequestname();
-                String creatorId = requestinfo.getCreatorid();
-                // 工作流ID
-                String workFlowId = requestinfo.getWorkflowid();
-                BillFieldUtil util = new BillFieldUtil();
-                String tablename = util.getTablename(workFlowId);
-                ResourceComInfo rsCom = I18nContextUtil.getBean(ResourceComInfo.class);
-                logger_5763d172.info(String.valueOf("HTGD_MES_ZG04ReturnAction-start-" + requestId));
-                logger_5763d172.info(String.valueOf("获取requestId:=" + requestId));
-                Property[] properties = requestinfo.getMainTableInfo().getProperty();
-                Map<String, String> mMap = new HashMap<String, String>();
-                for (int i = 0; i < properties.length; i++) {
-                    String name = properties[i].getName().toUpperCase();
-                    String value = Util.null2String(properties[i].getValue());
-                    mMap.put(name, value);
-                }
-                String lcbh = mMap.get("LCBH");
-                logger_5763d172.info(String.valueOf("流程编号:" + lcbh));
-                JSONObject mJson = new JSONObject();
-                mJson.put("procId", requestId);
-                mJson.put("procNo", lcbh);
-                JSONArray reqArr = new JSONArray();
-                reqArr.add(mJson);
-                logger_5763d172.info(requestId + "-request info:" + reqArr.toString());
-                Map<String, String> params = new HashMap<String, String>();
-                params.put("params", reqArr.toString());
-                // 调用接口
-                // "http://10.6.105.25:8180/mes/oa/OaAuditResult.html";//
-//                String url = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htmesoasync.GDZG04OaAuditResult")).trim();
-                String url = configProp.getGetTzlhtApplyResultUrl();
-                SendPostRequest_param mGetResult = new SendPostRequest_param();
-                // reqArr.toString()
-                String result = mGetResult.getResult(params, url);
-                logger_5763d172.info(String.valueOf(requestId + "-HTGD_MES_ZG04ReturnAction info:" + result));
-                if (!"E".equals(result)) {
-                    JSONArray arr = JSONArray.parseArray(result);
-                    if (arr != null && arr.size() > 0) {
-                        JSONObject returnJson = (JSONObject) arr.get(0);
-                        String errorMessage = returnJson.getString("errorMessage");
-                        // 处理消息
-                        String message = returnJson.getString("result");
-                        // 接口处理状态 1-失败，0-成功
-                        String resultCode = returnJson.getString("resultCode");
-                        if (!"0".equals(resultCode)) {
-                            RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                            String poolname_zg = CONN_TYPE.workflow.getType();
-                            // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                            rs.executeSql("update " + tablename + " set hxzt='E',fhxx='" + errorMessage + "' where requestId=" + requestId, poolname_zg);
-                            requestinfo.getRequestManager().setMessagecontent("mes返回错误信息：" + errorMessage);
-                            return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager()));
-                        } else {
-                            RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                            String poolname = CONN_TYPE.workflow.getType();
-                            // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                            rs.executeSql("update " + tablename + " set hxzt='S',fhxx='" + message + "' where requestId=" + requestId, poolname);
-                        }
-                    }
-                } else {
-                    logger_5763d172.info(String.valueOf("调用光导mes系统接口返回失败，请联系mes系统管理员！"));
-                    // requestInfo.getRequestManager().setMessageid("ERROR");
-                    requestinfo.getRequestManager().setMessagecontent("调用光导mes系统接口返回失败，请联系mes系统管理员！");
-                    return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager()));
-                }
-            } catch (Exception exception) {
-                logger_5763d172.info(String.valueOf(requestId + "-HTGD_MES_ZG04ReturnAction error:" + exception.getMessage()));
-                // requestInfo.getRequestManager().setMessageid("ERROR");
-                requestinfo.getRequestManager().setMessagecontent("提交失败！");
-                return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager()));
-            }
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_5763d172.error("HTGD_MES_ZG04ReturnAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -366,7 +366,8 @@ public class HTGD_SW_OaBackAction extends BaseBean implements Action, EsbServerl
                 meg = rtInfo[2].replace("'", "’");
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
                 logger_e4a191d3.info(String.valueOf("logsql:" + logsql));
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);

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

@@ -1,229 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import  com.weaver.seconddev.interfaces.oames.ReturnMesWLPS_SYService;
-import  com.weaver.seconddev.interfaces.oames.SI_OA_HTOAApproFlowSync_OUTServiceStub;
-import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import java.lang.*;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
-import com.weaver.verupgrade.soa.workflow.request.*;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.soa.workflow.request.DetailTable;
-import com.weaver.verupgrade.soa.workflow.request.Row;
-import com.weaver.verupgrade.soa.workflow.request.Cell;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-/**
- * HTLL-ZL01,HTLL-ZL02,HTLL-ZL03
- */
-@org.springframework.stereotype.Service("workflow_action_HTLLUnqualifiedApprovalAction")
-public class HTLLUnqualifiedApprovalAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_f1407471 = LoggerFactory.getLogger(HTLLUnqualifiedApprovalAction.class);
-
-    @Override
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo requestInfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            String requestId = requestInfo.getRequestid();
-            logger_f1407471.info(String.valueOf("HTLLUnqualifiedApprovalAction--" + requestId + "开始执行"));
-            // 工作流ID
-            String workFlowId = requestInfo.getWorkflowid();
-            BillFieldUtil util = new BillFieldUtil();
-            String tablename = util.getTablename(workFlowId);
-            try {
-                String requestName = requestInfo.getRequestManager().getRequestname();
-                String creatorId = requestInfo.getCreatorid();
-                Map<String, String> map = new HashMap<String, String>();
-                Property[] aproperty = requestInfo.getMainTableInfo().getProperty();
-                for (int j = 0; j < aproperty.length; j++) {
-                    String name = aproperty[j].getName().toUpperCase();
-                    String value = Util.null2String(aproperty[j].getValue());
-                    map.put(name, value);
-                }
-                ResourceComInfo rsCom = I18nContextUtil.getBean(ResourceComInfo.class);
-                // 处理结果选择--
-                String fxzt = map.get("XLYJ");
-                if ("0".equals(fxzt)) {
-                    // 转序
-                    fxzt = "10";
-                } else if ("1".equals(fxzt)) {
-                    // 降级使用
-                    fxzt = "11";
-                } else if ("2".equals(fxzt)) {
-                    // 报废
-                    fxzt = "14";
-                } else if ("3".equals(fxzt)) {
-                    // 降级使用
-                    fxzt = "12";
-                } else if ("4".equals(fxzt)) {
-                    // 返工返修
-                    fxzt = "13";
-                } else if ("5".equals(fxzt)) {
-                    // 留用
-                    fxzt = "0";
-                } else if ("6".equals(fxzt)) {
-                    // 留用考核
-                    fxzt = "1";
-                } else if ("7".equals(fxzt)) {
-                    // 退货考核
-                    fxzt = "2";
-                } else if ("8".equals(fxzt)) {
-                    // 重新生产
-                    fxzt = "20";
-                }
-                // 质量问题描述
-                String zzpdjg = map.get("ZLWTMS");
-                // 原因分析
-                String yyfx = map.get("YYFX");
-                // 纠正措施
-                String jzcs = map.get("JZCS");
-                // 评审意见
-                String psyj = map.get("PSYJ");
-                // 填报责任人
-                String tbzrr = map.get("TBZRR");
-                String uuid = UUID.randomUUID().toString();
-                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
-                SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request req = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request();
-                SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main mainData = new SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main();
-                SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main param = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main();
-                param.setZzpdjg(zzpdjg);
-                param.setWorkflowid(workFlowId);
-                param.setFxzt(fxzt);
-                param.setRequestName(requestName);
-                param.setRequestid(requestId);
-                param.setCreator(rsCom.getWorkcode(creatorId));
-                param.setPlaceholder1(yyfx);
-                param.setPlaceholder2(jzcs);
-                param.setPlaceholder3(psyj);
-                ResourceComInfo rc = I18nContextUtil.getBean(ResourceComInfo.class);
-                logger_f1407471.info(String.valueOf("HTLLUnqualifiedApprovalAction--" + requestId + "明细表开始"));
-                DetailTable[] detailtable = requestInfo.getDetailTableInfo().getDetailTable();
-                if (detailtable != null && detailtable.length > 0) {
-                    DetailTable dtq = detailtable[0];
-                    Row[] sq = dtq.getRow();
-                    for (int j = 0; j < sq.length; j++) {
-                        // 指定行
-                        Row rq = sq[j];
-                        // 每行数据再按列存储
-                        Cell[] cq = rq.getCell();
-                        JSONObject item = new JSONObject();
-                        Map<String, String> mDetailMap = new HashMap<String, String>();
-                        for (int k = 0; k < cq.length; k++) {
-                            // 指定列
-                            Cell cq1 = cq[k];
-                            // 明细字段名称
-                            String nameq = cq1.getName().toUpperCase();
-                            String valueq = Util.null2String(cq1.getValue());
-                            mDetailMap.put(nameq, valueq);
-                        }
-                        String zrr = mDetailMap.get("KHZRE");
-                        if (j == 0) {
-                            param.setPlaceholder6(rc.getLastname(zrr));
-                        }
-                        if (j == 1) {
-                            param.setPlaceholder7(rc.getLastname(zrr));
-                        }
-                        if (j == 2) {
-                            param.setPlaceholder8(rc.getLastname(zrr));
-                        }
-                        if (j == 3) {
-                            param.setPlaceholder9(rc.getLastname(zrr));
-                        }
-                        if (j == 4) {
-                            param.setPlaceholder10(rc.getLastname(zrr));
-                        }
-                    }
-                }
-                logger_f1407471.info(String.valueOf("HTLLUnqualifiedApprovalAction--" + requestId + "明细表结束"));
-                // ============================责任人在主表中======================================
-                // String[] zrr = tbzrr.split(",");
-                // for(int i=0;i<zrr.length&&i<5;i++){
-                // if(i==0){
-                // param.setPlaceholder6(rc.getLastname(zrr[i]));
-                // }
-                // if(i==1){
-                // param.setPlaceholder7(rc.getLastname(zrr[i]));
-                // }
-                // if(i==2){
-                // param.setPlaceholder8(rc.getLastname(zrr[i]));
-                // }
-                // if(i==3){
-                // param.setPlaceholder9(rc.getLastname(zrr[i]));
-                // }
-                // if(i==4){
-                // param.setPlaceholder10(rc.getLastname(zrr[i]));
-                // }
-                // }
-                // ========================================================================
-                mainData.addWLPS_SY_Main(param);
-                req.setSYSID("SYS073");
-                req.setSENDID(uuid);
-                req.setITFID("HT01ETS009");
-                req.setDATAS(mainData);
-                logger_f1407471.info(String.valueOf("HTLLUnqualifiedApprovalAction--" + requestId + "|SYS073"));
-                String[] ret = service.returnRes(req);
-                logger_f1407471.info(String.valueOf("HTLLUnqualifiedApprovalAction--" + requestId + "--return--" + ret[0] + "|" + ret[1]));
-                if ("E".equals(ret[0])) {
-                    RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                    String sql = "update " + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId;
-                    String poolname_vb = CONN_TYPE.workflow.getType();
-                    // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                    rs.executeSql(sql, poolname_vb);
-                }
-                logger_f1407471.info(String.valueOf("HTLLUnqualifiedApprovalAction--" + requestId + "执行结束"));
-            } catch (Exception exception) {
-                logger_f1407471.info(String.valueOf("HTLLUnqualifiedApprovalAction--" + requestId + "执行出错：" + exception.getMessage()));
-                RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                String sql = "update " + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId;
-                String poolname = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql(sql, poolname);
-            }
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestInfo.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_f1407471.error("HTLLUnqualifiedApprovalAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())), requestInfo.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -1,248 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import  com.weaver.seconddev.interfaces.easoa.InterLoanService;
-import  com.weaver.seconddev.interfaces.easoa.SI_InterLoanApplicationSync_OUTServiceStub.InternalBorrowing;
-import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import java.lang.*;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import java.util.Map;
-import java.util.HashMap;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-@org.springframework.stereotype.Service("workflow_action_InterLoanAction")
-public class InterLoanAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_6e218223 = LoggerFactory.getLogger(InterLoanAction.class);
-
-    private static final char[] RMB_NUMS = "零壹贰叁肆伍陆柒捌玖".toCharArray();
-
-    private static final String[] UNITS = { "元", "角", "分", "整" };
-
-    private static final String[] U1 = { "", "拾", "佰", "仟" };
-
-    private static final String[] U2 = { "", "万", "亿" };
-
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            String requestid = request.getRequestid();
-            String lcbh = "";
-            String title = request.getRequestManager().getRequestname();
-            String type = "";
-            String sqr = "";
-            String sqbm = "";
-            String sqdw = "";
-            String sqrq = "";
-            String sqsj = "";
-            String jkdw = "";
-            String jcdw = "";
-            String kjcye = "";
-            String kjdye = "";
-            String jkjexx = "";
-            String ll = "";
-            String jkqx = "";
-            String jkrq = "";
-            String yjhkrq = "";
-            String jksy = "";
-            try {
-                BillFieldUtil util = new BillFieldUtil();
-                Property[] properties = request.getMainTableInfo().getProperty();
-                for (int i = 0; i < properties.length; i++) {
-                    String name = properties[i].getName().toUpperCase();
-                    String value = Util.null2String(properties[i].getValue());
-                    if ("LCBH".equals(name)) {
-                        lcbh = value;
-                    }
-                    if ("JKLX".equals(name)) {
-                        type = Integer.parseInt(value) + 1 + "";
-                        logger_6e218223.info(String.valueOf(type));
-                    }
-                    if ("SQR".equals(name)) {
-                        sqr = util.getName(value);
-                    }
-                    if ("SQBM".equals(name)) {
-                        sqbm = util.getDepartmentname(value);
-                    }
-                    if ("SQDW".equals(name)) {
-                        sqdw = util.getSubcompanyname(value);
-                    }
-                    if ("SQRQ".equals(name)) {
-                        sqrq = value;
-                    }
-                    if ("SQSJ".equals(name)) {
-                        sqsj = value;
-                    }
-                    if ("JKDW".equals(name)) {
-                        jkdw = util.getSubcompanyname(value);
-                    }
-                    if ("JCDW".equals(name)) {
-                        jcdw = util.getSubcompanyname(value);
-                    }
-                    if ("YZGSJKZYE".equals(name)) {
-                        kjcye = value;
-                    }
-                    if ("YJCDWJKYE".equals(name)) {
-                        kjdye = value;
-                    }
-                    if ("JKJE".equals(name)) {
-                        jkjexx = value;
-                    }
-                    if ("JELL".equals(name)) {
-                        ll = value;
-                    }
-                    if ("JKQX".equals(name)) {
-                        jkqx = value;
-                    }
-                    if ("JKRQ".equals(name)) {
-                        jkrq = value;
-                    }
-                    if ("YJHKRQ".equals(name)) {
-                        yjhkrq = value;
-                    }
-                    if ("SQJKSY".equals(name)) {
-                        jksy = value;
-                    }
-                }
-                InterLoanService service = new InterLoanService();
-                InternalBorrowing[] info = new InternalBorrowing[1];
-                InternalBorrowing param = new InternalBorrowing();
-                param.setApplicantCompany(sqdw);
-                param.setApplicantDept(sqbm);
-                param.setApplicantName(sqr);
-                param.setApplicantTime(sqrq + " " + sqsj + ":00");
-                param.setBorrowTotalBalance(kjdye);
-                param.setBorrowUnitCode("");
-                param.setBorrowUnitName(jkdw);
-                param.setFlowCode(lcbh);
-                param.setFlowId(requestid);
-                param.setFlowTitle(title);
-                param.setFlowType(type);
-                param.setInterestRate(ll + "%");
-                param.setLendingTotalBalance(kjcye);
-                param.setLendingUnitCode("");
-                param.setLendingUnitName(jcdw);
-                param.setLoanAmount(jkjexx);
-                param.setLoanAmountChines(convert(jkjexx));
-                logger_6e218223.info(String.valueOf("借款金额大写" + convert(jkjexx)));
-                param.setLoanDate(jkrq + " 00:00:00");
-                param.setLoanTerm(jkqx);
-                param.setReason(jksy);
-                param.setRepayDate(yjhkrq + " 00:00:00");
-                info[0] = param;
-                String[] str = service.call(info);
-                logger_6e218223.info(String.valueOf(requestid + "调用报账系统内部借款接口返回值：" + str[0] + "--" + str[1]));
-                if (!"1".equals(str[0])) {
-                    request.getRequestManager().setMessageid("ERROR");
-                    request.getRequestManager().setMessagecontent("报账系统返回错误信息：" + str[1]);
-                }
-            } catch (Exception e) {
-                logger_6e218223.info(String.valueOf(requestid + "调用报账系统内部借款接口返回值：" + e.toString()));
-                request.getRequestManager().setMessageid("ERROR");
-                request.getRequestManager().setMessagecontent("报账系统返回错误信息：" + e.toString());
-            }
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_6e218223.error("InterLoanAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager()));
-        }
-    }
-
-    public static String convert(String amount) throws IllegalArgumentException {
-        // 去掉分隔符
-        amount = amount.replace(",", "");
-        // 整数部分
-        String integer = amount.substring(0, amount.indexOf("."));
-        // 小数部分
-        String fraction = amount.substring(amount.indexOf(".") + 1);
-        String result = "";
-        if (!integer.equals("0")) {
-            // 整数部分
-            result += integer2rmb(integer) + UNITS[0];
-        }
-        if (fraction.equals("00")) {
-            // 添加[整]
-            result += UNITS[3];
-        } else if (fraction.startsWith("0") && integer.equals("0")) {
-            // 去掉分前面的[零]
-            result += fraction2rmb(fraction).substring(1);
-        } else {
-            // 小数部分
-            result += fraction2rmb(fraction);
-        }
-        return result;
-    }
-
-    // 将金额小数部分转换为中文大写
-    private static String fraction2rmb(String fraction) {
-        // 角
-        char jiao = fraction.charAt(0);
-        // 分
-        char fen = fraction.charAt(1);
-        return (RMB_NUMS[jiao - '0'] + (jiao > '0' ? UNITS[1] : "")) + (fen > '0' ? RMB_NUMS[fen - '0'] + UNITS[2] : "");
-    }
-
-    // 将金额整数部分转换为中文大写
-    private static String integer2rmb(String integer) {
-        StringBuilder buffer = new StringBuilder();
-        // 从个位数开始转换
-        int i, j;
-        for (i = integer.length() - 1, j = 0; i >= 0; i--, j++) {
-            char n = integer.charAt(i);
-            if (n == '0') {
-                // 当n是0且n的右边一位不是0时，插入[零]
-                if (i < integer.length() - 1 && integer.charAt(i + 1) != '0') {
-                    buffer.append(RMB_NUMS[0]);
-                }
-                // 插入[万]或者[亿]
-                if (j % 4 == 0) {
-                    if (i > 0 && integer.charAt(i - 1) != '0' || i > 1 && integer.charAt(i - 2) != '0' || i > 2 && integer.charAt(i - 3) != '0') {
-                        buffer.append(U2[j / 4]);
-                    }
-                }
-            } else {
-                if (j % 4 == 0) {
-                    // 插入[万]或者[亿]
-                    buffer.append(U2[j / 4]);
-                }
-                // 插入[拾]、[佰]或[仟]
-                buffer.append(U1[j % 4]);
-                // 插入数字
-                buffer.append(RMB_NUMS[n - '0']);
-            }
-        }
-        return buffer.reverse().toString();
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -1,115 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import com.alibaba.fastjson.JSONObject;
-import  com.weaver.seconddev.interfaces.iuroa.SyncDataService;
-import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import java.util.HashMap;
-import java.util.Map;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import java.lang.*;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.hrm.company.SubCompanyComInfo;
-import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-@org.springframework.stereotype.Service("workflow_action_Iur_syncDemand")
-public class Iur_syncDemand extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_7ae2ecde = LoggerFactory.getLogger(Iur_syncDemand.class);
-
-    @Override
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            String requestid = requestinfo.getRequestid();
-            String workflowid = requestinfo.getWorkflowid();
-            RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-            BillFieldUtil util = new BillFieldUtil();
-            String tablename = util.getTablename(workflowid);
-            try {
-                logger_7ae2ecde.info(String.valueOf("Iur_syncDemand--start:" + requestid));
-                Map<String, String> map = new HashMap<String, String>();
-                Property[] properties = requestinfo.getMainTableInfo().getProperty();
-                for (int i = 0; i < properties.length; i++) {
-                    String name = properties[i].getName().toUpperCase();
-                    String value = Util.null2String(properties[i].getValue());
-                    map.put(name, value);
-                }
-                JSONObject obj = new JSONObject();
-                SubCompanyComInfo com = I18nContextUtil.getBean(SubCompanyComInfo.class);
-                ResourceComInfo res = I18nContextUtil.getBean(ResourceComInfo.class);
-                obj.put("title", map.get("XMMC"));
-                obj.put("organizationName", com.getSubCompanyname(map.get("XQTCDW")));
-                obj.put("name", res.getResourcename(map.get("XQTCR")));
-                obj.put("userNo", map.get("XQTCRGH"));
-                obj.put("phoneNumber", map.get("XQTCRLXFS"));
-                if ("8".equals(map.get("JSLYYJ"))) {
-                    obj.put("fieldName", util.getselectNameByCol("jslyyj", workflowid, map.get("JSLYYJ")) + "-" + util.getselectNameByCol("qtfl", workflowid, map.get("QTFL")).trim());
-                } else {
-                    obj.put("fieldName", util.getselectNameByCol("jslyyj", workflowid, map.get("JSLYYJ")) + "-" + util.getselectNameByCol("jslyej", workflowid, map.get("JSLYEJ")));
-                }
-                obj.put("amount", map.get("NTRJE"));
-                obj.put("intendedPartners", map.get("YXHZDW"));
-                obj.put("modeOfIntendedCooperation", map.get("HZFS"));
-                obj.put("demandBackground", map.get("XQBJ"));
-                obj.put("demandPurpose", map.get("XQMD"));
-                obj.put("applicationScenarios", map.get("YYCJ"));
-                obj.put("performanceIndex", map.get("XNZB"));
-                obj.put("expectedResults", map.get("CXYQ"));
-                obj.put("requestId", requestid);
-                SyncDataService service = new SyncDataService();
-                String[] result = service.call(obj, "syncDemand");
-                logger_7ae2ecde.info(requestid + "--Iur_syncDemand--data:" + obj.toString());
-                logger_7ae2ecde.info(String.valueOf(requestid + "--Iur_syncDemand--info:[" + result[0] + "|" + result[1] + "]"));
-                String poolname_ux = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql("update " + tablename + " set status='" + result[0] + "',message='" + result[1] + "' where requestId=" + requestid, poolname_ux);
-            } catch (Exception e) {
-                logger_7ae2ecde.info(String.valueOf("Iur_syncDemand--error:" + e.toString()));
-                String poolname = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql("update " + tablename + " set status='E',message='" + e.toString() + "' where requestId=" + requestid, poolname);
-            }
-            logger_7ae2ecde.info(String.valueOf("Iur_syncDemand--end:" + requestid));
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_7ae2ecde.error("Iur_syncDemand e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -33,6 +33,8 @@ public class K3BuildCustomerAction extends BaseBean implements Action, EsbServer
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private CallK3CustomerService service;
     private static final Logger logger_4201db9b = LoggerFactory.getLogger(K3BuildCustomerAction.class);
 
     @Override
@@ -229,7 +231,7 @@ public class K3BuildCustomerAction extends BaseBean implements Action, EsbServer
                 customer.setBankList(bankinfo);
                 logger_4201db9b.info(String.valueOf(requestID + " 获取明细表数据结束"));
                 req.setCustomer(customer);
-                CallK3CustomerService service = new CallK3CustomerService();
+//                CallK3CustomerService service = new CallK3CustomerService();
                 CustomerServiceStub.CustomerRes response = service.buildCustomer(req);
                 logger_4201db9b.info(requestID + " 调用K3Cloud系统客户创建接口返回值：" + response);
                 // 1-成功 0-失败

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

@@ -35,6 +35,8 @@ public class K3BuildSupplierAction extends BaseBean implements Action, EsbServer
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private CallK3SupplierServices service;
     private static final Logger logger_c748ab09 = LoggerFactory.getLogger(K3BuildSupplierAction.class);
 
     @Override
@@ -238,7 +240,7 @@ public class K3BuildSupplierAction extends BaseBean implements Action, EsbServer
                 supplier.setBankList(bankinfo);
                 logger_c748ab09.info(String.valueOf("获取明细表数据结束"));
                 req.setSupplier(supplier);
-                CallK3SupplierServices service = new CallK3SupplierServices();
+//                CallK3SupplierServices service = new CallK3SupplierServices();
                 SupplierServiceStub.SupplierRes response = service.buildSupplier(req);
                 logger_c748ab09.info("调用K3Cloud系统供应商创建接口返回值：" + response);
                 // 1-成功 0-失败

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

@@ -36,6 +36,8 @@ public class K3PORequestAction extends BaseBean implements Action, EsbServerless
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private CallPORequestService service ;
     private static final Logger logger_7396c45f = LoggerFactory.getLogger(K3PORequestAction.class);
 
     @Override
@@ -156,7 +158,7 @@ public class K3PORequestAction extends BaseBean implements Action, EsbServerless
                 }
                 purReq.setLstPoReqDt(wlinfo);
                 logger_7396c45f.info(String.valueOf("获取明细表数据结束"));
-                CallPORequestService service = new CallPORequestService();
+//                CallPORequestService service = new CallPORequestService();
                 PORequestServiceStub.PORequestRes response = service.buildPORequest(purReq);
                 logger_7396c45f.info("调用K3Cloud系统采购流程创建接口返回值" + response);
                 // 1-??? 0-???

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

@@ -35,6 +35,8 @@ public class OA_CMZ_Action extends BaseBean implements Action, EsbServerlessRpcR
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private CallMesChuMenZhengService mes;
     private static final Logger logger_44f7fe13 = LoggerFactory.getLogger(OA_CMZ_Action.class);
 
     public OA_CMZ_Action() {
@@ -105,7 +107,7 @@ public class OA_CMZ_Action extends BaseBean implements Action, EsbServerlessRpcR
                 String sta = "";
                 String meg = "";
                 // 调用接口
-                CallMesChuMenZhengService mes = new CallMesChuMenZhengService();
+//                CallMesChuMenZhengService mes = new CallMesChuMenZhengService();
                 mes.setOainput(resultIn);
                 String[] rtInfo = mes.call();
                 logger_44f7fe13.info(String.valueOf("调用接口完成--Istat--" + rtInfo[0] + "--Message--" + rtInfo[1]));
@@ -116,7 +118,8 @@ public class OA_CMZ_Action extends BaseBean implements Action, EsbServerlessRpcR
                 String wfid = requestinfo.getWorkflowid();
                 // 流程信息类
                 BillFieldUtil unit = new BillFieldUtil();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = requestinfo.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set status ='" + sta + "', message = '" + meg + "' where requestId = " + requestid;
                 logger_44f7fe13.info(String.valueOf("logsql:" + logsql));
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);

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

@@ -519,7 +519,8 @@ public class OaMesNewMaterialCertificationAction extends BaseBean implements Act
                 meg = rtInfo[2].replace("'", "’");
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
                 logger_7ab25493.info(String.valueOf("logsql:" + logsql));
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);

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

@@ -403,7 +403,8 @@ public class OaMesNewMaterialProjectAction extends BaseBean implements Action, E
                 meg = rtInfo[2].replace("'", "’");
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
                 logger_fedc85f2.info(String.valueOf("logsql:" + logsql));
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);

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

@@ -436,7 +436,8 @@ public class OaMesNewMaterialTSBGAction extends BaseBean implements Action, EsbS
                 meg = rtInfo[2].replace("'", "’");
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
                 logger_f52b61d7.info(String.valueOf("logsql:" + logsql));
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);

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

@@ -296,7 +296,8 @@ public class OaMesNewMaterialTestAction extends BaseBean implements Action, EsbS
                 meg = rtInfo[2].replace("'", "’");
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
                 logger_908d3105.info(String.valueOf("logsql:" + logsql));
                 RecordSet rs = I18nContextUtil.getBean(RecordSet.class);

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

@@ -40,6 +40,8 @@ public class OaSrmCheckMallApproveAction extends BaseBean implements Action, Esb
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
+    @Autowired
+    private CallSrmCheckMallServices srm ;
 
     private static final Logger logger_85b99b44 = LoggerFactory.getLogger(OaSrmCheckMallApproveAction.class);
 
@@ -90,7 +92,7 @@ public class OaSrmCheckMallApproveAction extends BaseBean implements Action, Esb
                 logger_85b99b44.info(String.valueOf("调用接口完成RequestId--" + requestId + "--prno--" + prno + "--shzt--" + shzt));
                 String sta = "";
                 String meg = "";
-                CallSrmCheckMallServices srm = new CallSrmCheckMallServices();
+//                CallSrmCheckMallServices srm = new CallSrmCheckMallServices();
                 srm.setOainput(resultin);
                 String[] rtInfo = srm.call();
                 logger_85b99b44.info(String.valueOf(requestId + " 调用接口完成prno--" + rtInfo[0] + "--Istat--" + rtInfo[1] + "--Srmsage--" + rtInfo[2]));
@@ -98,7 +100,8 @@ public class OaSrmCheckMallApproveAction extends BaseBean implements Action, Esb
                 meg = rtInfo[2].replace("'", "’");
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
                 logger_85b99b44.info(String.valueOf(requestId + " logsql:" + logsql));
                 String poolname = CONN_TYPE.workflow.getType();

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

@@ -41,6 +41,10 @@ public class OaSrmCheckMallRefuseAction extends BaseBean implements Action, EsbS
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private CallSrmCheckMallServices srm;
+
+
     private static final Logger logger_6576dfe9 = LoggerFactory.getLogger(OaSrmCheckMallRefuseAction.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -90,7 +94,7 @@ public class OaSrmCheckMallRefuseAction extends BaseBean implements Action, EsbS
                 logger_6576dfe9.info(String.valueOf("调用接口完成RequestId--" + requestId + "--prno--" + prno + "--shzt--" + shzt));
                 String sta = "";
                 String meg = "";
-                CallSrmCheckMallServices srm = new CallSrmCheckMallServices();
+//                CallSrmCheckMallServices srm = new CallSrmCheckMallServices();
                 srm.setOainput(resultin);
                 String[] rtInfo = srm.call();
                 logger_6576dfe9.info(String.valueOf(requestId + " 调用接口完成prno--" + rtInfo[0] + "--Istat--" + rtInfo[1] + "--Srmsage--" + rtInfo[2]));
@@ -98,7 +102,8 @@ public class OaSrmCheckMallRefuseAction extends BaseBean implements Action, EsbS
                 meg = rtInfo[2].replace("'", "’");
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
                 logger_6576dfe9.info(String.valueOf(requestId + " logsql:" + logsql));
                 String poolname = CONN_TYPE.workflow.getType();

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

@@ -42,6 +42,8 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private CallSrmCheckPriceServices srm;
     private static final Logger logger_c6c5cea5 = LoggerFactory.getLogger(OaSrmCheckPriceApproveAction.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -133,7 +135,7 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es
                 logUtil.setTscs("RequestId--" + requestId + "--enquiryid--" + enquiryid + "--shr--" + shr + "--shzt--" + shzt + "--shyj--" + shyj + "--shrq--" + shrq + shsj);
                 String sta = "";
                 String meg = "";
-                CallSrmCheckPriceServices srm = new CallSrmCheckPriceServices();
+//                CallSrmCheckPriceServices srm = new CallSrmCheckPriceServices();
                 srm.setOainput(resultin);
                 String[] rtInfo = srm.call();
                 logger_c6c5cea5.info(String.valueOf("调用接口完成RequestId--" + rtInfo[0] + "--Istat--" + rtInfo[1] + "--Srmsage--" + rtInfo[2]));
@@ -142,7 +144,8 @@ public class OaSrmCheckPriceApproveAction extends BaseBean implements Action, Es
                 meg = rtInfo[2].replace("'", "’");
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
                 logger_c6c5cea5.info(String.valueOf("logsql:" + logsql));
                 String poolname = CONN_TYPE.workflow.getType();

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

@@ -41,6 +41,8 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
+    @Autowired
+    private CallSrmCheckPriceServices srm;
 
     private static final Logger logger_80563c68 = LoggerFactory.getLogger(OaSrmCheckPriceRefuseAction.class);
 
@@ -132,7 +134,7 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb
                 logUtil.setTscs("RequestId--" + requestId + "--enquiryid--" + enquiryid + "--shr--" + shr + "--shzt--" + shzt + "--shyj--" + shyj + "--shrq--" + shrq + shsj);
                 String sta = "";
                 String meg = "";
-                CallSrmCheckPriceServices srm = new CallSrmCheckPriceServices();
+//                CallSrmCheckPriceServices srm = new CallSrmCheckPriceServices();
                 srm.setOainput(resultin);
                 String[] rtInfo = srm.call();
                 logger_80563c68.info(String.valueOf("调用接口完成RequestId--" + rtInfo[0] + "--Istat--" + rtInfo[1] + "--Srmsage--" + rtInfo[2]));
@@ -141,7 +143,8 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb
                 meg = rtInfo[2].replace("'", "’");
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
                 logger_80563c68.info(String.valueOf("logsql:" + logsql));
                 String poolname = CONN_TYPE.workflow.getType();

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

@@ -34,6 +34,9 @@ public class OaSrmVenMatExtAction extends BaseBean implements Action, EsbServerl
     @Autowired
     private RequestInfo requestInfoTemp;
 
+
+    @Autowired
+    private OaSrmVenMatExtService service ;
     private static final Logger logger_e97618d9 = LoggerFactory.getLogger(OaSrmVenMatExtAction.class);
 
     public OaSrmVenMatExtAction() {
@@ -189,7 +192,7 @@ public class OaSrmVenMatExtAction extends BaseBean implements Action, EsbServerl
                 logger_e97618d9.info(String.valueOf(requestid + " resourceType:" + resourceType));
                 paramInfo.setResourceType(resourceType);
                 param.setInputTab(paramInfo);
-                OaSrmVenMatExtService service = new OaSrmVenMatExtService();
+//                OaSrmVenMatExtService service = new OaSrmVenMatExtService();
                 // 
                 String[] str = service.sendsrm(param, requestid);
                 logger_e97618d9.info(String.valueOf(requestid + "str[0]:" + str[0] + "str[1]:" + str[1] + "str[2]:" + str[2]));

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

@@ -38,6 +38,9 @@ public class OaSrmVenMatExtCheckAction extends BaseBean implements Action, EsbSe
     @Autowired
     private RequestInfo requestInfoTemp;
 
+
+    @Autowired
+    private OaSrmVenMatExtService service ;
     private static final Logger logger_ac19fc9b = LoggerFactory.getLogger(OaSrmVenMatExtCheckAction.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -169,7 +172,7 @@ public class OaSrmVenMatExtCheckAction extends BaseBean implements Action, EsbSe
                                 logger_ac19fc9b.info(String.valueOf(requestid + " resourceType:" + resourceType));
                                 paramInfo.setResourceType(resourceType);
                                 param.setInputTab(paramInfo);
-                                OaSrmVenMatExtService service = new OaSrmVenMatExtService();
+//                                OaSrmVenMatExtService service = new OaSrmVenMatExtService();
                                 // 
                                 String[] str = service.sendsrm(param, requestid);
                                 logger_ac19fc9b.info(String.valueOf(new StringBuilder().append(requestid).append("调用货源关系接口返回值：").append(str[0]).append("--").append(str[1]).toString()));

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

@@ -45,6 +45,8 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private OaSrmVenMatExtService service;
     private static final Logger logger_a864d799 = LoggerFactory.getLogger(OaSrmVendorCheckAction.class);
 
     @Override
@@ -363,7 +365,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
                                     logger_a864d799.info(String.valueOf(requestid + " resourceType:" + resourceType));
                                     paramInfo.setResourceType(resourceType);
                                     param.setInputTab(paramInfo);
-                                    OaSrmVenMatExtService service = new OaSrmVenMatExtService();
+//                                    OaSrmVenMatExtService service = new OaSrmVenMatExtService();
                                     String[] str = service.sendsrm(param, requestid);
                                     if ("1".equals(str[0])) {
                                         state = "S";

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

@@ -1,324 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import java.util.*;
-import java.text.*;
-import java.math.*;
-import java.util.Date;
-import org.apache.commons.lang.StringEscapeUtils;
-import  com.weaver.seconddev.interfaces.srmoa.*;
-import  com.weaver.seconddev.interfaces.srmoa.SI_GoodsSupplyExpanding_OUTServiceStub.SRM_OA_VENMATEXT_RESULT;
-import  com.weaver.seconddev.interfaces.srmoa.SI_GoodsSupplyExpanding_OUTServiceStub.VenMatExtResultIn;
-import  com.weaver.seconddev.interfaces.srmoa.SI_GoodsSupplyExpanding_OUTServiceStub.VenMatExtResultItemIn;
-import  com.weaver.seconddev.interfaces.swfa.*;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import java.lang.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import java.util.Map;
-import java.util.HashMap;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.conn.RecordSetDataSource;
-import com.weaver.verupgrade.general.TimeUtil;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.soa.workflow.request.Cell;
-import com.weaver.verupgrade.soa.workflow.request.DetailTable;
-import com.weaver.verupgrade.soa.workflow.request.Row;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
-
-/**
- * SRM--供应商转正申请审核接口--qingf20161109
- * @author Administrator
- */
-@org.springframework.stereotype.Service("workflow_action_OaSrmVendorPropmtionServiceAction")
-public class OaSrmVendorPropmtionServiceAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_f507f952 = LoggerFactory.getLogger(OaSrmVendorPropmtionServiceAction.class);
-
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            // 流程请求ID
-            String requestId = request.getRequestid();
-            try {
-                // 流程编号
-                String lcbh = "";
-                // 公司编码
-                String sqdwbm = "";
-                // 公司名称
-                String sqdw = "";
-                // 申请部门名称
-                String sqbm = "";
-                // 供应商编码
-                String gysbm = "";
-                // 供应商名称
-                String gysmc = "";
-                // 供应商类型名称
-                String gyslx = "";
-                // 申请人姓名
-                String sqrxm = "";
-                // 工号
-                String gh = "";
-                // 主供品类
-                String gycpmc = "";
-                // 审核人
-                String shr = "";
-                // 审核意见
-                String shyj = "";
-                // 审核日期
-                String shrq = "2016-11-13";
-                // 审核时间
-                String shsj = "12:00:00";
-                // 1校验、2审核
-                String shzt = "2";
-                // 线上0/线下1供应商
-                String xsxx = "";
-                // 申请日期
-                String sqrq = "";
-                RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class);
-                BillFieldUtil unit = new BillFieldUtil();
-                Date now = new Date();
-                SimpleDateFormat datetype = new SimpleDateFormat("yyyy-MM-dd");
-                SimpleDateFormat timetype = new SimpleDateFormat("HH:mm:ss");
-                shrq = datetype.format(now);
-                shsj = timetype.format(now);
-                lcbh = requestId;
-                shyj = request.getRequestManager().getRemark();
-                shr = hr.getResourcename(request.getLastoperator());
-                logger_f507f952.info(String.valueOf("OaSrmVendorPropmtionServiceAction-Request: " + requestId + "开始"));
-                OaSrmVendorPropmtionServiceServiceStub.OaInputVendor oainputvendor = new OaSrmVendorPropmtionServiceServiceStub.OaInputVendor();
-                // 封装单据主信息
-                // 封装表单信息
-                // 获取表单主字段信息
-                Property[] properties = request.getMainTableInfo().getProperty();
-                for (int i = 0; i < properties.length; i++) {
-                    // 主表数据
-                    // 字段名
-                    String name = properties[i].getName().toLowerCase();
-                    // 值
-                    String value = Util.null2String(properties[i].getValue());
-                    // 单据主信息使用
-                    if (name.equals("lcbh")) {
-                        if (!value.equals("")) {
-                            // 流程编号
-                            lcbh = value;
-                        }
-                    }
-                    if (name.equals("sqdwbm")) {
-                        // 公司编码
-                        sqdwbm = value;
-                    }
-                    if (name.equals("sqdw")) {
-                        // 公司名称
-                        sqdw = value;
-                    }
-                    if (name.equals("gysbm")) {
-                        // 供应商编码
-                        gysbm = value;
-                    }
-                    if (name.equals("gysmc")) {
-                        // 供应商名称
-                        gysmc = value;
-                    }
-                    if (name.equals("gyslx")) {
-                        // 供应商类型名称
-                        gyslx = unit.getselectName(value, "47262");
-                        logger_f507f952.info(String.valueOf("供应商类型名称:" + gyslx));
-                    }
-                    if (name.equals("sqr")) {
-                        // 申请人
-                        sqrxm = hr.getResourcename(value);
-                        // 申请人
-                        ;
-                    }
-                    if (name.equals("sqbm")) {
-                        // 部门名称
-                        sqbm = unit.getDepartmentname(value);
-                    }
-                    if (name.equals("gh")) {
-                        // 工号
-                        gh = value;
-                    }
-                    if (name.equals("gycpmc")) {
-                        // 工号
-                        gycpmc = value;
-                    }
-                    if (name.equals("xsxx")) {
-                        xsxx = unit.getselectName(value, "47269");
-                        logger_f507f952.info(String.valueOf("线上线下供应商:" + xsxx));
-                        if (xsxx.length() > 1) {
-                            // 线上0/线下1供应商
-                            xsxx = xsxx.substring(0, 1);
-                        }
-                    }
-                    if (name.equals("sqrq")) {
-                        sqrq = value;
-                        logger_f507f952.info(String.valueOf("申请日期：" + value));
-                    }
-                }
-                oainputvendor.setRequestId(requestId);
-                oainputvendor.setLcbh(lcbh);
-                oainputvendor.setSqdwbm(sqdwbm);
-                oainputvendor.setSqdw(sqdw);
-                oainputvendor.setSqbm(sqbm);
-                oainputvendor.setGysbm(gysbm);
-                oainputvendor.setGysmc(gysmc);
-                oainputvendor.setGyslx(gyslx);
-                oainputvendor.setSqrxm(sqrxm);
-                oainputvendor.setGh(gh);
-                oainputvendor.setGycpmc(gycpmc);
-                oainputvendor.setShr(shr);
-                oainputvendor.setShyj(shyj);
-                oainputvendor.setShrq(shrq);
-                oainputvendor.setShsj(shsj);
-                oainputvendor.setShzt(shzt);
-                // writeLog("调用接口开始0 ");
-                String sta = "";
-                String meg = "";
-                if (xsxx.equals("1")) {
-                    sta = "S";
-                    meg = "线下供应商!!!";
-                    logger_f507f952.info(String.valueOf("无需调用接口RequestId--" + requestId + "--sta--" + sta + "--meg--" + meg));
-                } else {
-                    CallSrmServices srm = new CallSrmServices();
-                    srm.setOainputvendor(oainputvendor);
-                    String[] rtInfo = srm.call();
-                    logger_f507f952.info(String.valueOf("调用接口完成RequestId--" + rtInfo[0] + "--Istat--" + rtInfo[1] + "--Srmsage--" + rtInfo[2]));
-                    sta = rtInfo[1];
-                    meg = rtInfo[2].replace("'", "’");
-                }
-                String tablename = "";
-                String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
-                String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
-                logger_f507f952.info(String.valueOf("logsql:" + logsql));
-                String poolname = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql(logsql, poolname);
-                logger_f507f952.info(String.valueOf("OaSrmVendorPropmtionServiceAction-Request: " + requestId + "完成"));
-                if ("S".equals(sta) && ("直接材料".equals(gyslx) || "间接材料".equals(gyslx) || "OEM及委外加工".equals(gyslx))) {
-                    logger_f507f952.info(String.valueOf(requestId + "调用货源关系接口" + "--" + sta + "--" + gyslx));
-                    Set<String> set = new HashSet<String>();
-                    DetailTable[] detailtable = request.getDetailTableInfo().getDetailTable();
-                    // 指定明细表
-                    DetailTable dtq = detailtable[2];
-                    // 当前明细表的所有数据,按行存储
-                    Row[] sq = dtq.getRow();
-                    if (sq.length <= 300 && sq.length > 0) {
-                        SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT();
-                        VenMatExtResultIn paramInfo = new VenMatExtResultIn();
-                        VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[sq.length];
-                        for (int j = 0; j < sq.length; j++) {
-                            // 指定行
-                            Row rq = sq[j];
-                            Cell[] cq = rq.getCell();
-                            VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn();
-                            for (int k = 0; k < cq.length; k++) {
-                                // 指定列
-                                Cell cq1 = cq[k];
-                                // 明细字段名称
-                                String nameq = cq1.getName().toLowerCase();
-                                // 明细字段的值
-                                String valueq = Util.null2String(cq1.getValue());
-                                if ("cgzzbm".equals(nameq)) {
-                                    set.add(valueq);
-                                }
-                                if ("直接材料".equals(gyslx) || "间接材料".equals(gyslx)) {
-                                    if ("wlh".equals(nameq)) {
-                                        itemIn.setMaterialCode(valueq);
-                                    }
-                                    if ("wlms".equals(nameq)) {
-                                        String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
-                                        itemIn.setMaterialName(wlms);
-                                    }
-                                    if ("xjxzb".equals(nameq)) {
-                                        itemIn.setWeight(valueq);
-                                    }
-                                    if ("clfl".equals(nameq)) {
-                                        String clfl = unit.getselectName(valueq, "48517");
-                                        itemIn.setMatLevel(clfl);
-                                    }
-                                } else {
-                                    if ("wlh".equals(nameq)) {
-                                        itemIn.setMatCategoryCode(valueq);
-                                    }
-                                    if ("wlms".equals(nameq)) {
-                                        String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
-                                        itemIn.setMatCategoryName(wlms);
-                                    }
-                                }
-                            }
-                            item[j] = itemIn;
-                        }
-                        paramInfo.setApplyUser(gh);
-                        paramInfo.setCheckUser(shr);
-                        paramInfo.setCompanyCode(sqdwbm);
-                        paramInfo.setCompanyName(sqdw);
-                        paramInfo.setVendorCode(gysbm);
-                        paramInfo.setVendorName(gysmc);
-                        paramInfo.setHandleType("6");
-                        paramInfo.setRequestId("GY105/" + requestId);
-                        paramInfo.setStartDate(sqrq);
-                        paramInfo.setEndDate("2099-12-31");
-                        paramInfo.setPurOrgCode((String) set.toArray()[0]);
-                        paramInfo.setItems(item);
-                        param.setInputTab(paramInfo);
-                        OaSrmVenMatExtService service = new OaSrmVenMatExtService();
-                        String[] str = service.call(param);
-                        if ("1".equals(str[0])) {
-                            sta = "S";
-                        } else {
-                            sta = "E";
-                        }
-                        meg = str[1];
-                        logger_f507f952.info(String.valueOf(requestId + " GY105调用货源关系接口同步数据返回值：" + sta + "--" + meg));
-                    }
-                }
-                if (!sta.equals("S")) {
-                    request.getRequestManager().setMessageid("error");
-                    request.getRequestManager().setMessagecontent(meg);
-                }
-            } catch (Exception e) {
-                request.getRequestManager().setMessageid("error");
-                request.getRequestManager().setMessagecontent("SRM接口返回错误信息：" + e.toString());
-                logger_f507f952.info(String.valueOf(requestId + "OaSrmVendorPropmtionServiceAction-Request出错: " + e.toString()));
-            }
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_f507f952.error("OaSrmVendorPropmtionServiceAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -1,353 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import java.util.*;
-import java.text.*;
-import java.math.*;
-import java.util.Date;
-import org.apache.commons.lang.StringEscapeUtils;
-import  com.weaver.seconddev.interfaces.srmoa.*;
-import  com.weaver.seconddev.interfaces.srmoa.SI_GoodsSupplyExpanding_OUTServiceStub.SRM_OA_VENMATEXT_RESULT;
-import  com.weaver.seconddev.interfaces.srmoa.SI_GoodsSupplyExpanding_OUTServiceStub.VenMatExtResultIn;
-import  com.weaver.seconddev.interfaces.srmoa.SI_GoodsSupplyExpanding_OUTServiceStub.VenMatExtResultItemIn;
-import  com.weaver.seconddev.interfaces.swfa.*;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import java.lang.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import java.util.Map;
-import java.util.HashMap;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.conn.RecordSetDataSource;
-import com.weaver.verupgrade.general.TimeUtil;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.soa.workflow.request.Cell;
-import com.weaver.verupgrade.soa.workflow.request.DetailTable;
-import com.weaver.verupgrade.soa.workflow.request.Row;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.hrm.resource.ResourceComInfo;
-
-/**
- * SRM--供应商转正申请验证接口--qingf20161109
- * @author Administrator
- */
-@org.springframework.stereotype.Service("workflow_action_OaSrmVendorPropmtionServiceCheckAction")
-public class OaSrmVendorPropmtionServiceCheckAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_3f2e7fc2 = LoggerFactory.getLogger(OaSrmVendorPropmtionServiceCheckAction.class);
-
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            // 流程请求ID
-            String requestId = request.getRequestid();
-            try {
-                // 流程编号
-                String lcbh = "";
-                // 公司编码
-                String sqdwbm = "";
-                // 公司名称
-                String sqdw = "";
-                // 申请部门名称
-                String sqbm = "";
-                // 供应商编码
-                String gysbm = "";
-                // 供应商名称
-                String gysmc = "";
-                // 供应商类型名称
-                String gyslx = "";
-                // 申请人姓名
-                String sqrxm = "";
-                // 工号
-                String gh = "";
-                // 主供品类
-                String gycpmc = "";
-                // 审核人
-                String shr = "";
-                // 审核意见
-                String shyj = "";
-                // 审核日期
-                String shrq = "2016-11-13";
-                // 审核时间
-                String shsj = "12:00:00";
-                // 1校验、2审核
-                String shzt = "1";
-                // 线上0/线下1供应商
-                String xsxx = "";
-                // 申请日期
-                String sqrq = "";
-                RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                ResourceComInfo hr = I18nContextUtil.getBean(ResourceComInfo.class);
-                BillFieldUtil unit = new BillFieldUtil();
-                Date now = new Date();
-                SimpleDateFormat datetype = new SimpleDateFormat("yyyy-MM-dd");
-                SimpleDateFormat timetype = new SimpleDateFormat("HH:mm:ss");
-                shrq = datetype.format(now);
-                shsj = timetype.format(now);
-                lcbh = requestId;
-                shyj = request.getRequestManager().getRemark();
-                shr = hr.getResourcename(request.getLastoperator());
-                logger_3f2e7fc2.info(String.valueOf("OaSrmVendorPropmtionServiceCheckAction-Request: " + requestId + "开始"));
-                OaSrmVendorPropmtionServiceServiceStub.OaInputVendor oainputvendor = new OaSrmVendorPropmtionServiceServiceStub.OaInputVendor();
-                // 封装单据主信息
-                // 封装表单信息
-                // 获取表单主字段信息
-                Property[] properties = request.getMainTableInfo().getProperty();
-                for (int i = 0; i < properties.length; i++) {
-                    // 主表数据
-                    // 字段名
-                    String name = properties[i].getName().toLowerCase();
-                    // 值
-                    String value = Util.null2String(properties[i].getValue());
-                    // 单据主信息使用
-                    if (name.equals("lcbh")) {
-                        if (!value.equals("")) {
-                            // 流程编号
-                            lcbh = value;
-                        }
-                    }
-                    if (name.equals("sqdwbm")) {
-                        // 公司编码
-                        sqdwbm = value;
-                    }
-                    if (name.equals("sqdw")) {
-                        // 公司名称
-                        sqdw = value;
-                    }
-                    if (name.equals("gysbm")) {
-                        // 供应商编码
-                        gysbm = value;
-                    }
-                    if (name.equals("gysmc")) {
-                        // 供应商名称
-                        gysmc = value;
-                    }
-                    if (name.equals("gyslx")) {
-                        // 供应商类型名称
-                        gyslx = unit.getselectName(value, "47262");
-                        logger_3f2e7fc2.info(String.valueOf("供应商类型名称:" + gyslx));
-                    }
-                    if (name.equals("sqr")) {
-                        // 申请人
-                        sqrxm = hr.getResourcename(value);
-                        // 申请人
-                        ;
-                    }
-                    if (name.equals("sqbm")) {
-                        // 部门名称
-                        sqbm = unit.getDepartmentname(value);
-                    }
-                    if (name.equals("gh")) {
-                        // 工号
-                        gh = value;
-                    }
-                    if (name.equals("gycpmc")) {
-                        // 工号
-                        gycpmc = value;
-                    }
-                    if (name.equals("xsxx")) {
-                        xsxx = unit.getselectName(value, "47269");
-                        logger_3f2e7fc2.info(String.valueOf("线上线下供应商:" + xsxx));
-                        if (xsxx.length() > 1) {
-                            // 线上0/线下1供应商
-                            xsxx = xsxx.substring(0, 1);
-                        }
-                    }
-                    if (name.equals("sqrq")) {
-                        sqrq = value;
-                        logger_3f2e7fc2.info(String.valueOf("申请日期：" + value));
-                    }
-                }
-                oainputvendor.setRequestId(requestId);
-                oainputvendor.setLcbh(lcbh);
-                oainputvendor.setSqdwbm(sqdwbm);
-                oainputvendor.setSqdw(sqdw);
-                oainputvendor.setSqbm(sqbm);
-                oainputvendor.setGysbm(gysbm);
-                oainputvendor.setGysmc(gysmc);
-                oainputvendor.setGyslx(gyslx);
-                oainputvendor.setSqrxm(sqrxm);
-                oainputvendor.setGh(gh);
-                oainputvendor.setGycpmc(gycpmc);
-                oainputvendor.setShr(shr);
-                oainputvendor.setShyj(shyj);
-                oainputvendor.setShrq(shrq);
-                oainputvendor.setShsj(shsj);
-                oainputvendor.setShzt(shzt);
-                // writeLog("调用接口开始0 ");
-                String sta = "";
-                String meg = "";
-                if (xsxx.equals("1")) {
-                    sta = "S";
-                    meg = "线下供应商!!!";
-                    logger_3f2e7fc2.info(String.valueOf("调用接口完成RequestId--" + requestId + "--sta--" + sta + "--meg--" + meg));
-                } else {
-                    CallSrmServices srm = new CallSrmServices();
-                    srm.setOainputvendor(oainputvendor);
-                    String[] rtInfo = srm.call();
-                    logger_3f2e7fc2.info(String.valueOf("调用接口完成RequestId--" + rtInfo[0] + "--Istat--" + rtInfo[1] + "--Srmsage--" + rtInfo[2]));
-                    sta = rtInfo[1];
-                    meg = rtInfo[2].replace("'", "’");
-                }
-                String tablename = "";
-                String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
-                String logsql = "update " + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId;
-                logger_3f2e7fc2.info(String.valueOf("logsql:" + logsql));
-                String poolname = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql(logsql, poolname);
-                logger_3f2e7fc2.info(String.valueOf("OaSrmVendorPropmtionServiceCheckAction-Request: " + requestId + "完成"));
-                if ("S".equals(sta) && ("直接材料".equals(gyslx) || "间接材料".equals(gyslx) || "OEM及委外加工".equals(gyslx))) {
-                    logger_3f2e7fc2.info(String.valueOf(requestId + "调用货源关系接口" + "--" + sta + "--" + gyslx));
-                    Set<String> set = new HashSet<String>();
-                    Set<String> wlhset = new HashSet<String>();
-                    List<String> list = new ArrayList<String>();
-                    StringBuilder sb = new StringBuilder();
-                    DetailTable[] detailtable = request.getDetailTableInfo().getDetailTable();
-                    // 指定明细表
-                    DetailTable dtq = detailtable[2];
-                    // 当前明细表的所有数据,按行存储
-                    Row[] sq = dtq.getRow();
-                    if (sq.length <= 300) {
-                        SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT();
-                        VenMatExtResultIn paramInfo = new VenMatExtResultIn();
-                        VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[sq.length];
-                        for (int j = 0; j < sq.length; j++) {
-                            // 指定行
-                            Row rq = sq[j];
-                            Cell[] cq = rq.getCell();
-                            VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn();
-                            for (int k = 0; k < cq.length; k++) {
-                                // 指定列
-                                Cell cq1 = cq[k];
-                                // 明细字段名称
-                                String nameq = cq1.getName().toLowerCase();
-                                // 明细字段的值
-                                String valueq = Util.null2String(cq1.getValue());
-                                if ("cgzzbm".equals(nameq)) {
-                                    set.add(valueq);
-                                }
-                                if ("直接材料".equals(gyslx) || "间接材料".equals(gyslx)) {
-                                    if ("wlh".equals(nameq)) {
-                                        itemIn.setMaterialCode(valueq);
-                                        list.add(valueq);
-                                    }
-                                    if ("wlms".equals(nameq)) {
-                                        String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
-                                        itemIn.setMaterialName(wlms);
-                                    }
-                                    if ("xjxzb".equals(nameq)) {
-                                        itemIn.setWeight(valueq);
-                                    }
-                                    if ("clfl".equals(nameq)) {
-                                        String clfl = unit.getselectName(valueq, "48517");
-                                        itemIn.setMatLevel(clfl);
-                                    }
-                                } else {
-                                    if ("wlh".equals(nameq)) {
-                                        itemIn.setMatCategoryCode(valueq);
-                                        list.add(valueq);
-                                    }
-                                    if ("wlms".equals(nameq)) {
-                                        String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
-                                        itemIn.setMatCategoryName(wlms);
-                                    }
-                                }
-                            }
-                            item[j] = itemIn;
-                        }
-                        if (list.size() > 0) {
-                            for (String s : list) {
-                                boolean flag = wlhset.add(s);
-                                if (!flag) {
-                                    sb.append("物料号-" + s + "-存在重复；");
-                                }
-                            }
-                            if (sb != null && sb.length() > 0) {
-                                sta = "E";
-                                meg = sb.toString();
-                                logger_3f2e7fc2.info(String.valueOf(requestId + " 用户申请GY105流程数据不符合要求：" + meg));
-                            } else {
-                                if (set.size() == 1) {
-                                    paramInfo.setApplyUser(gh);
-                                    paramInfo.setCheckUser(shr);
-                                    paramInfo.setCompanyCode(sqdwbm);
-                                    paramInfo.setCompanyName(sqdw);
-                                    paramInfo.setVendorCode(gysbm);
-                                    paramInfo.setVendorName(gysmc);
-                                    paramInfo.setHandleType("0");
-                                    paramInfo.setRequestId("GY105/" + requestId);
-                                    paramInfo.setStartDate(sqrq);
-                                    paramInfo.setEndDate("2099-12-31");
-                                    paramInfo.setPurOrgCode((String) set.toArray()[0]);
-                                    paramInfo.setItems(item);
-                                    param.setInputTab(paramInfo);
-                                    OaSrmVenMatExtService service = new OaSrmVenMatExtService();
-                                    String[] str = service.call(param);
-                                    if ("1".equals(str[0])) {
-                                        sta = "S";
-                                    } else {
-                                        sta = "E";
-                                    }
-                                    meg = str[1];
-                                    logger_3f2e7fc2.info(String.valueOf(requestId + " GY105调用货源关系接口校验数据返回值" + meg));
-                                } else {
-                                    sta = "E";
-                                    meg = "一次只能申请一个采购组织的";
-                                    logger_3f2e7fc2.info(String.valueOf(requestId + " 用户申请GY105流程数据不符合要求：" + meg));
-                                }
-                            }
-                        }
-                    } else {
-                        sta = "E";
-                        meg = "明细表明细行不能超过300行，请分开申请！";
-                        logger_3f2e7fc2.info(String.valueOf(requestId + " 用户申请GY105流程数据不符合要求：" + meg));
-                    }
-                }
-                if (!sta.equals("S")) {
-                    request.getRequestManager().setMessageid("error");
-                    request.getRequestManager().setMessagecontent(meg);
-                }
-            } catch (Exception e) {
-                request.getRequestManager().setMessageid("error");
-                request.getRequestManager().setMessagecontent("SRM接口返回错误信息：" + e.toString());
-                logger_3f2e7fc2.info(String.valueOf(requestId + "OaSrmVendorPropmtionServiceCheckAction-Request出错: " + e.toString()));
-            }
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_3f2e7fc2.error("OaSrmVendorPropmtionServiceCheckAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -40,7 +40,8 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private OaSrmVenMatExtService service;
     private static final Logger logger_a5e612ac = LoggerFactory.getLogger(OaSrmVendorReapplyAction.class);
 
     @Override
@@ -320,7 +321,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer
                                     logger_a5e612ac.info(String.valueOf(requestid + " resourceType:" + resourceType));
                                     paramInfo.setResourceType(resourceType);
                                     param.setInputTab(paramInfo);
-                                    OaSrmVenMatExtService service = new OaSrmVenMatExtService();
+//                                    OaSrmVenMatExtService service = new OaSrmVenMatExtService();
                                     // 
                                     String[] str = service.sendsrm(param, requestid);
                                     if ("1".equals(str[0])) {

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

@@ -40,7 +40,8 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private OaSrmVenMatExtService service;
     private static final Logger logger_41a64316 = LoggerFactory.getLogger(OaSrmVendorSyncAction.class);
 
     @Override
@@ -302,7 +303,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
                         logger_41a64316.info(String.valueOf(requestid + " resourceType:" + resourceType));
                         paramInfo.setResourceType(resourceType);
                         param.setInputTab(paramInfo);
-                        OaSrmVenMatExtService service = new OaSrmVenMatExtService();
+//                        OaSrmVenMatExtService service = new OaSrmVenMatExtService();
                         // 
                         String[] str = service.sendsrm(param, requestid);
                         if ("1".equals(str[0])) {

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

@@ -30,6 +30,10 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private  ZMES_OA_SUBMIT_SERVICE service;
+
+
     private static final Logger logger_824c0f2 = LoggerFactory.getLogger(OaWmsReturnAction.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -84,7 +88,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless
                 item.setPlaceholder1(zjsj);
                 paramItem[0] = item;
                 param.setZMES_OA_SUBMIT_ITEM_TYPE(paramItem);
-                ZMES_OA_SUBMIT_SERVICE service = new ZMES_OA_SUBMIT_SERVICE();
+//                ZMES_OA_SUBMIT_SERVICE service = new ZMES_OA_SUBMIT_SERVICE();
                 str = service.call(param, requestid, cfxt);
                 logger_824c0f2.info(String.valueOf(requestid + "--OaWmsReturnAction--result:" + str[0] + "-" + str[1]));
                 sql = "update " + tableName + " set state='" + str[0] + "',message='" + str[1] + "' where requestId=" + requestid;

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

@@ -31,6 +31,10 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+
+    private  MesAccountService service;
+
     private static final Logger logger_4057422d = LoggerFactory.getLogger(OperateMesAccountAction.class);
 
     public OperateMesAccountAction() {
@@ -93,7 +97,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ
                     paramInfo.setSystemid(sysid);
                     paramInfo.setUserid(gh);
                     param[0] = paramInfo;
-                    MesAccountService service = new MesAccountService();
+//                    MesAccountService service = new MesAccountService();
                     String[] array = service.account(param);
                     if ("E".equals(array[0])) {
                         stat = "E";

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

@@ -36,6 +36,9 @@ public class PMProjectAcceptanceAction extends BaseBean implements Action, EsbSe
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+
+    private PMService pmService ;
     private static final Logger logger_f17f81aa = LoggerFactory.getLogger(PMProjectAcceptanceAction.class);
 
     public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
@@ -156,7 +159,7 @@ public class PMProjectAcceptanceAction extends BaseBean implements Action, EsbSe
                 // }
                 // }
                 jsonObject.put("file", fileList);
-                PMService pmService = new PMService();
+//                PMService pmService = new PMService();
                 String result = pmService.call(jsonObject.toString());
                 if (!result.equals("E")) {
                     JSONObject retobj = JSONObject.parseObject(result);

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

@@ -1,91 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import org.apache.commons.lang3.StringUtils;
-import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import java.util.ArrayList;
-import java.util.List;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import java.lang.*;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import java.util.Map;
-import java.util.HashMap;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-@org.springframework.stereotype.Service("workflow_action_RandomExpertAction")
-public class RandomExpertAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_4d01ce2 = LoggerFactory.getLogger(RandomExpertAction.class);
-
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            String requestid = request.getRequestid();
-            logger_4d01ce2.info(String.valueOf("RandomExpertAction--start--" + requestid));
-            String workflowid = request.getWorkflowid();
-            try {
-                BillFieldUtil util = new BillFieldUtil();
-                String tablename = util.getTablename(workflowid);
-                RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                List<String> list = new ArrayList<String>();
-                String poolname = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql("select a.user_id from auth_user_role a " + "INNER JOIN employee b on a.user_id=b.id " + // roleid 测试1310，正式1498
-                "where a.role_id=1498 and b.personnel_status<4", poolname);
-                while (rs.next()) {
-                    list.add(rs.getString("resourceid"));
-                }
-                List<String> hrm = new ArrayList<String>();
-                for (; hrm.size() < 5; ) {
-                    int index = (int) (Math.random() * list.size());
-                    if (!hrm.contains(list.get(index))) {
-                        hrm.add(list.get(index));
-                    }
-                }
-                String userids = StringUtils.join(hrm.toArray(), ",");
-                String poolname_tf = CONN_TYPE.workflow.getType();
-                // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql("update " + tablename + " set zj='" + userids + "' where requestid=" + requestid, poolname_tf);
-                logger_4d01ce2.info(String.valueOf("RandomExpertAction--end--" + requestid));
-            } catch (Exception e) {
-                logger_4d01ce2.info(String.valueOf(requestid + "--RandomExpertAction--error--" + e.toString()));
-            }
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, request.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_4d01ce2.error("RandomExpertAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), request.getRequestManager())), request.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -25,6 +25,8 @@ public class ReturnApprovalResultToK3Action extends BaseBean implements Action,
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private ApprovalResultService service ;
     private static final Logger logger_c84d53c8 = LoggerFactory.getLogger(ReturnApprovalResultToK3Action.class);
 
     public ReturnApprovalResultToK3Action() {
@@ -77,7 +79,7 @@ public class ReturnApprovalResultToK3Action extends BaseBean implements Action,
                 in.setSyncSRM(syncSRM);
                 in.setSYSID("");
                 in.setWorkflowId(workflowId);
-                ApprovalResultService service = new ApprovalResultService();
+//                ApprovalResultService service = new ApprovalResultService();
                 str = service.returnResult(in);
                 logger_c84d53c8.info(String.valueOf("返回结果：" + str[0] + str[1]));
                 if (!"1".equals(str[0])) {

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

@@ -1,140 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import com.weaver.common.distribution.genid.IdGenerator;
-import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import java.lang.*;
-import java.util.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import java.util.Map;
-import java.util.HashMap;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-@org.springframework.stereotype.Service("workflow_action_RotationMonthlyEvaluationAction")
-public class RotationMonthlyEvaluationAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-
-    private static final Logger logger_5c3e7042 = LoggerFactory.getLogger(RotationMonthlyEvaluationAction.class);
-
-    @Override
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            String requestid = requestinfo.getRequestid();
-            logger_5c3e7042.info(String.valueOf("RotationMonthlyEvaluationAction-start-" + requestid));
-            String workflowid = requestinfo.getWorkflowid();
-            BillFieldUtil util = new BillFieldUtil();
-            String tablename = util.getTablename(workflowid);
-            String ksrq = "";
-            String jsrq = "";
-            Property[] properties = requestinfo.getMainTableInfo().getProperty();
-            for (int i = 0; i < properties.length; i++) {
-                String name = properties[i].getName().toUpperCase();
-                String value = Util.null2String(properties[i].getValue());
-                if ("LGLGKSRQ".equals(name)) {
-                    ksrq = value;
-                }
-                if ("LGLGJSRQ".equals(name)) {
-                    jsrq = value;
-                }
-            }
-            if (!"".equals(ksrq) && !"".equals(jsrq)) {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                try {
-                    Date startDate = sdf.parse(ksrq);
-                    Date endDate = sdf.parse(jsrq);
-                    if (!startDate.before(endDate)) {
-                        requestinfo.getRequestManager().setMessageid("ERROR");
-                        requestinfo.getRequestManager().setMessagecontent("轮岗开始日期需小于轮岗结束日期");
-                        return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
-                    }
-                    Calendar c = Calendar.getInstance();
-                    c.setTime(endDate);
-                    int endY = c.get(Calendar.YEAR);
-                    int endMon = c.get(Calendar.MONTH);
-                    c.setTime(startDate);
-                    int startY = c.get(Calendar.YEAR);
-                    int startMon = c.get(Calendar.MONTH);
-                    int diff = 0;
-                    if (startY == endY) {
-                        diff = endMon - startMon;
-                    } else if (endY > startY) {
-                        diff = (endY - startY) * 12 + endMon - startMon;
-                    }
-                    List<String> list = new ArrayList<String>();
-                    RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                    String get_id = "select id from " + tablename + " where requestId=" + requestid;
-                    String poolname = CONN_TYPE.workflow.getType();
-                    // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                    rs.executeSql(get_id, poolname);
-                    String id = "";
-                    if (rs.next()) {
-                        id = rs.getString("id");
-                    }
-                    for (int i = 0; i < diff + 1; i++) {
-                        c.setTime(startDate);
-                        c.add(Calendar.MONTH, (i + 1));
-                        Date midDate = c.getTime();
-                        if (!midDate.after(endDate)) {
-                            list.add(sdf.format(midDate));
-                            String sql = "insert into " + tablename + "_dt2(mainid,lgpjrq) values(" + id + ",'" + sdf.format(midDate) + "')";
-                            String poolname_x5 = CONN_TYPE.workflow.getType();
-                            /* *TODO  检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整  https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
- TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
-                            long generate = IdGenerator.generate();
-                            rs.executeSql(sql, poolname_x5,generate);
-                            logger_5c3e7042.info(String.valueOf("RotationMonthlyEvaluationAction-info-" + requestid + "-[" + sql + "]"));
-                        } else {
-                            break;
-                        }
-                    }
-                } catch (Exception e) {
-                    logger_5c3e7042.info(String.valueOf("RotationMonthlyEvaluationAction-error-" + requestid + "-[" + e.toString() + "]"));
-                }
-            }
-            logger_5c3e7042.info(String.valueOf("RotationMonthlyEvaluationAction-end-" + requestid));
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_5c3e7042.error("RotationMonthlyEvaluationAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager()));
-        }
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -31,6 +31,8 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private ReturnMesWLPS_SYService service;
     private static final Logger logger_882eb0b2 = LoggerFactory.getLogger(SY_WLPS_NEW_RETURNAction.class);
 
     public SY_WLPS_NEW_RETURNAction() {
@@ -70,7 +72,7 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer
                 // 缺陷代码
                 String qxdm = map.get("QXDM");
                 String uuid = UUID.randomUUID().toString();
-                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
+//                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request req = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main mainData = new SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main param = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main();

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

@@ -38,7 +38,8 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl
     // 对应E9的请求信息对象
     @Autowired
     private RequestInfo requestInfoTemp;
-
+    @Autowired
+    private ReturnMesWLPS_SYService service;
     private static final Logger logger_1852f2d3 = LoggerFactory.getLogger(SY_WLPS_RETURNAction.class);
 
     public SY_WLPS_RETURNAction() {
@@ -71,7 +72,7 @@ public class SY_WLPS_RETURNAction extends BaseBean implements Action, EsbServerl
                 String zzpdjg = map.get("ZZPDJG");
                 String sysid = map.get("SYSID");
                 String uuid = UUID.randomUUID().toString();
-                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
+//                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
                 WLPS_SY_Request req = new WLPS_SY_Request();
                 ArrayOfWLPS_SY_Main mainData = new ArrayOfWLPS_SY_Main();
                 WLPS_SY_Main param = new WLPS_SY_Main();

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

@@ -39,6 +39,8 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private ReturnMesWLPS_SYService service;
     private static final Logger logger_4dd7c639 = LoggerFactory.getLogger(SY_WLPS_RETURNNewAction.class);
 
     public SY_WLPS_RETURNNewAction() {
@@ -71,7 +73,7 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ
                 String zzpdjg = map.get("ZZPDJG");
                 String sysid = map.get("SYSID");
                 String uuid = UUID.randomUUID().toString();
-                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
+//                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
                 WLPS_SY_Request req = new WLPS_SY_Request();
                 ArrayOfWLPS_SY_Main mainData = new ArrayOfWLPS_SY_Main();
                 WLPS_SY_Main param = new WLPS_SY_Main();

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

@@ -28,6 +28,9 @@ public class ScfDraftApplyResultAction extends BaseBean implements Action, EsbSe
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private GetApproveResult mGetResult;
+
     private static final Logger logger_d39bef7 = LoggerFactory.getLogger(ScfDraftApplyResultAction.class);
 
     @Override
@@ -75,7 +78,7 @@ public class ScfDraftApplyResultAction extends BaseBean implements Action, EsbSe
                 mJson.put("optType", optType);
                 mJson.put("itfid", ITFID);
                 mJson.put("rate", mMap.get("RATE"));
-                GetApproveResult mGetResult = new GetApproveResult();
+//                GetApproveResult mGetResult = new GetApproveResult();
                 String result = mGetResult.getApproveResult(mJson);
                 logger_d39bef7.info(mJson.toString());
                 logger_d39bef7.info(String.valueOf(requestID + "调用供应链金融系统返回审批结果接口返回值：" + result));

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

@@ -46,6 +46,7 @@ public class SendPostRequest_API extends BaseBean {
                 post.releaseConnection();
             }
         }
+        logger_8c2343.info(String.valueOf("SendPostRequest_API---result" + result));
         return result;
     }
 }

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

@@ -39,6 +39,9 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private TransferBillService service ;
+
     private static final Logger logger_1a36f94a = LoggerFactory.getLogger(TransferBillToK3Action.class);
 
     @Override
@@ -134,7 +137,7 @@ public class TransferBillToK3Action extends BaseBean implements Action, EsbServe
                     dt.setTransferBillDt(list.toArray(new TransferBillDt[list.size()]));
                     req.setLstTransferdt(dt);
                     String sql = "";
-                    TransferBillService service = new TransferBillService();
+//                    TransferBillService service = new TransferBillService();
                     String[] str = service.call(req);
                     logger_1a36f94a.info(String.valueOf("TransferBillToK3Action--info-" + requestid + " [" + str[0] + "," + str[1] + "]"));
                     message = str[1];

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

@@ -1,166 +0,0 @@
-package com.weaver.seconddev.interfaces.workflow.action;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import com.weaver.common.distribution.genid.IdGenerator;
-import com.weaver.common.i18n.tool.util.I18nContextUtil;
-import com.weaver.seconddev.interfaces.prop.ConfigProp;
-import com.weaver.verupgrade.conn.CONN_TYPE;
-import org.springframework.core.env.Environment;
-import java.lang.*;
-import com.weaver.verupgrade.workflow.request.RequestManager;
-import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
-import com.weaver.common.base.entity.result.WeaResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.weaver.verupgrade.soa.workflow.request.RequestInfo;
-import java.util.Map;
-import java.util.HashMap;
-import com.weaver.verupgrade.conn.RecordSet;
-import com.weaver.verupgrade.formmode.setup.ModeRightInfo;
-import com.weaver.verupgrade.general.BaseBean;
-import com.weaver.verupgrade.general.Util;
-import com.weaver.verupgrade.soa.workflow.request.*;
-import com.weaver.verupgrade.soa.workflow.request.Property;
-import com.weaver.verupgrade.soa.workflow.request.DetailTable;
-import com.weaver.verupgrade.soa.workflow.request.Row;
-import com.weaver.verupgrade.soa.workflow.request.Cell;
-import com.weaver.verupgrade.interfaces.workflow.action.Action;
-
-@org.springframework.stereotype.Service("workflow_action_WuJangGiftStorageAction")
-public class WuJangGiftStorageAction extends BaseBean implements Action, EsbServerlessRpcRemoteInterface {
-
-    // 对应E9的请求信息对象
-    @Autowired
-    private RequestInfo requestInfoTemp;
-    @Autowired
-    private ConfigProp configProp;
-    private static final Logger logger_3c4594 = LoggerFactory.getLogger(WuJangGiftStorageAction.class);
-
-    @Override
-    public WeaResult<Map<String, Object>> execute(Map<String, Object> requestInfoMap) {
-        Map<String, Object> weaverResultMap = new HashMap<>();
-        Long requestIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("requestid", -1)));
-        Long userIdTemp = Long.parseLong(String.valueOf(requestInfoMap.getOrDefault("userid", -1)));
-        RequestInfo requestinfo = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
-        try {
-            String requestid = requestinfo.getRequestid();
-            logger_3c4594.info(String.valueOf("WuJangGiftStorageAction--start--" + requestid));
-            try {
-                String sqr = "";
-                // 获取表单主字段信息
-                Property[] properties = requestinfo.getMainTableInfo().getProperty();
-                for (int i = 0; i < properties.length; i++) {
-                    // 主表数据
-                    // 字段名
-                    String name = properties[i].getName().toUpperCase();
-                    // 值
-                    String value = Util.null2String(properties[i].getValue());
-                    if ("SQR".equals(name)) {
-                        sqr = value;
-                    }
-                }
-                // XZ011只有配置里维护的人申请才触发接口
-//                String creator = Util.null2String(I18nContextUtilcus.getBean(Environment.class).getProperty("htxzsetting.creator"));
-                String creator = configProp.getCreator();
-                if (creator.indexOf(sqr) >= 0) {
-                    DetailTable dtq = requestinfo.getDetailTableInfo().getDetailTable(0);
-                    Row[] sq = dtq.getRow();
-                    List<Map<String, String>> list = new ArrayList<Map<String, String>>();
-                    for (int j = 0; j < sq.length; j++) {
-                        Row rq = sq[j];
-                        Cell[] cq = rq.getCell();
-                        Map<String, String> map = new HashMap<String, String>();
-                        for (int k = 0; k < cq.length; k++) {
-                            Cell cq1 = cq[k];
-                            String nameq = cq1.getName().toLowerCase();
-                            String valueq = Util.null2String(cq1.getValue());
-                            map.put(nameq, valueq);
-                        }
-                        list.add(map);
-                    }
-                    Date date = new Date();
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-                    String rq = sdf.format(date).split(" ")[0];
-                    String sj = sdf.format(date).split(" ")[1];
-                    RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-                    for (int i = 0; i < list.size(); i++) {
-                        String lx = list.get(i).get("lx");
-                        if ("0".equals(lx)) {
-                            if ("0".equals(list.get(i).get("xqqr"))) {
-                                insertData(sqr, list.get(i).get("pm"), list.get(i).get("ggxh"), list.get(i).get("pp"), list.get(i).get("rksl"), list.get(i).get("dw"), list.get(i).get("ygdj"), list.get(i).get("lplx"), list.get(i).get("lpbm"), rq, sj);
-                            } else {
-                                insertData(sqr, list.get(i).get("sjpm"), list.get(i).get("ggxh2"), list.get(i).get("pp2"), list.get(i).get("sjshsl"), list.get(i).get("sjdw"), list.get(i).get("sjygjg"), list.get(i).get("sjlplx"), list.get(i).get("sjlpbm"), rq, sj);
-                            }
-                        } else if ("1".equals(lx)) {
-                            // 入库数量
-                            String rksl = "";
-                            if ("0".equals(list.get(i).get("xqqr"))) {
-                                rksl = list.get(i).get("rksl");
-                            } else {
-                                rksl = list.get(i).get("sjshsl");
-                            }
-                            String sql = "update formtable_main_206 set kcsl=isnull(kcsl,0)+'" + rksl + "' where id=" + list.get(i).get("lpxx");
-                            logger_3c4594.info(String.valueOf(sql));
-                            String poolname = CONN_TYPE.workflow.getType();
-                            // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                            rs.executeSql(sql, poolname);
-                        }
-                    }
-                    ModeRightInfo ModeRightInfo = I18nContextUtil.getBean(ModeRightInfo.class);
-                    // TODO e10 该方法已废弃
-                    ModeRightInfo.setNewRight(true);
-                    String right_sql = "select id from formtable_main_206 where modedatacreatedate='" + rq + "' and modedatacreatetime='" + sj + "'";
-                    logger_3c4594.info(String.valueOf(right_sql));
-                    String poolname_bm = CONN_TYPE.workflow.getType();
-                    // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                    rs.executeSql(right_sql, poolname_bm);
-                    while (rs.next()) {
-                        Long id = (long) rs.getInt("id");
-                        /* TODO 方法参数:Integer.parseInt(sqr) 类型发生变化 e9类型:int e10类型:long
- TODO 方法参数:10 类型发生变化 e9类型:int e10类型:long
- TODO 方法参数:id 类型发生变化 e9类型:int e10类型:long
- TODO // 创建人字段已废弃 默认是用billid 数据对应的数据创建人*/
-                        ModeRightInfo.editModeDataShare(Integer.parseInt(sqr), 10, id);
-                    }
-                }
-            } catch (Exception e) {
-                logger_3c4594.info(String.valueOf("WuJangGiftStorageAction--" + requestid + "--error--" + e.toString()));
-            }
-            logger_3c4594.info(String.valueOf("WuJangGiftStorageAction--end--" + requestid));
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger_3c4594.error("WuJangGiftStorageAction e: {}", e.getMessage());
-            return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestinfo.getRequestManager())), requestinfo.getRequestManager()));
-        }
-    }
-
-    public void insertData(String creator, String pm, String ggxh, String pp, String kcsl, String dw, String ygdj, String lplx, String lpbm, String rq, String sj) {
-        String sql = "insert into formtable_main_206(formmodeid,modedatacreater,modedatacreatertype,modedatacreatedate,modedatacreatetime,lplx,pm,pp,ggxh,dw,dj,lpbm,kcsl,sfqy) values(" + "10,'" + creator + "',0,'" + rq + "','" + sj + "'," + lplx + ",'" + pm + "','" + pp + "','" + ggxh + "','" + dw + "','" + ygdj + "','" + lpbm + "','" + kcsl + "',0 )";
-        RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-        logger_3c4594.info(String.valueOf(sql));
-        String poolname_n1 = CONN_TYPE.workflow.getType();
-        /* *TODO  检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整  https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
- TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
-        long generate = IdGenerator.generate();
-        rs.executeSql(sql, poolname_n1,generate);
-    }
-
-    Map<String, Object> getResultMapForAction(Map<String, Object> map, String key, Object value, RequestManager requestManager) {
-        if (key != null && !key.isEmpty()) {
-            map.put(key, value);
-        }
-        String msgContent = requestManager.getMessagecontent();
-        if (msgContent != null && !msgContent.isEmpty()) {
-            map.put("msgContent", msgContent);
-        }
-        String msgId = requestManager.getMessageid();
-        if (msgId != null && !msgId.isEmpty()) {
-            map.put("msgId", msgId);
-        }
-        return map;
-    }
-}

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

@@ -34,6 +34,8 @@ public class XNY_YCLTC_ReturnAction extends BaseBean implements Action, EsbServe
     @Autowired
     private RequestInfo requestInfoTemp;
 
+    @Autowired
+    private ReturnMesWLPS_SYService service;
     private static final Logger logger_555b962f = LoggerFactory.getLogger(XNY_YCLTC_ReturnAction.class);
 
     public XNY_YCLTC_ReturnAction() {
@@ -67,7 +69,7 @@ public class XNY_YCLTC_ReturnAction extends BaseBean implements Action, EsbServe
                 // String zzpdjg = map.get("ZZPDJG");
                 String sysid = map.get("SYSID");
                 String uuid = UUID.randomUUID().toString();
-                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
+//                ReturnMesWLPS_SYService service = new ReturnMesWLPS_SYService();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request req = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Request();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main mainData = new SI_OA_HTOAApproFlowSync_OUTServiceStub.ArrayOfWLPS_SY_Main();
                 SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main param = new SI_OA_HTOAApproFlowSync_OUTServiceStub.WLPS_SY_Main();

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

@@ -80,7 +80,8 @@ public class ZOA_CCSQ_AQJB_Action extends BaseBean implements Action, EsbServerl
                 }
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 String logsql = "";
                 if (ccsxry.equals("")) {
                     ccsxry = "0";

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

@@ -201,7 +201,8 @@ public class ZOA_FI_CUSTOMER_MAINTAINAction extends BaseBean implements Action,
                 prdetail[0] = edit_flag;
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 ZOA_FI_CUSTOMER_MAINTAIN po = new ZOA_FI_CUSTOMER_MAINTAIN();
                 String[][] fhz = po.Getexecute(prdetail);
                 String sta = fhz[0][0];

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

@@ -214,7 +214,8 @@ public class ZOA_FI_VENDOR_MAINTAIN_GYSAction extends BaseBean implements Action
                 prdetail[0] = edit_flag;
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 ZOA_FI_VENDOR_MAINTAIN po = new ZOA_FI_VENDOR_MAINTAIN();
                 String[][] fhz = po.Getexecute(prdetail);
                 String sta = fhz[0][0];

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

@@ -276,7 +276,8 @@ public class ZOA_MM_PR_CREATE_JGJ_JgAction extends BaseBean implements Action, E
                 }
                 String tablename = "";
                 String wfid = request.getWorkflowid();
-                tablename = unit.getTablename(wfid);
+//                tablename = unit.getTablename(wfid);
+                tablename = request.getRequestManager().getBillTableName();
                 ZOA_MM_PR_CREATE_JGJ po = new ZOA_MM_PR_CREATE_JGJ();
                 String[] fhz = po.Getexecute(prtype, prdetail);
                 String cgsqh = fhz[0];