From ce72cd2ffe97df268fe9a49feb5813a8f14429de Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Tue, 7 Jan 2025 15:47:01 +0800 Subject: [PATCH] value_key --- .../interfaces/htjt/util/TransUtil.java | 4 +- .../interfaces/swfa/BillFieldUtil.java | 31 +- .../interfaces/swfa/sl/FileUtil.java | 482 ------------------ .../action/BlackListTempThawSyncAction.java | 2 +- .../action/EASIntermediarySyncAction.java | 4 +- .../workflow/action/EasWhiteListAction.java | 4 +- .../action/EasYszxfpApplyResultAction.java | 2 +- .../action/SY_WLPS_NEW_RETURNAction.java | 5 +- .../action/ZOA_MM_PR_CREATE_SCXAction.java | 4 +- .../action/ZOA_MM_PR_CREATE_WWJGAction.java | 2 +- .../action/ZOA_MM_PR_CREATE_YFAction.java | 2 +- .../ZOA_MM_PR_CREATE_ZJGC_ZjAction.java | 4 + .../action/ZZ_GDFileUploadAction.java | 4 +- .../action/ZZ_Ten_GDFileUploadAction.java | 4 +- 14 files changed, 43 insertions(+), 511 deletions(-) delete mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/FileUtil.java diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java index 355448e..92dd700 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java @@ -46,7 +46,7 @@ public class TransUtil { if ("".equals(selectvalue)) { return selectname; } - String sql = "SELECT c.name AS selectname\n" + + String sql = "SELECT c.name \n" + "FROM e10_core_business.dbo.form_field a, e10_core_business.dbo.form_table b, e10_core_business.dbo.field_option c\n" + "WHERE a.form_id = b.form_id\n" + " AND c.field_id = a.id\n" + @@ -65,7 +65,7 @@ public class TransUtil { TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ rs.executeSql(sql, poolname_oj); if (rs.next()) { - selectname = Util.null2String(rs.getString("selectname")); + selectname = Util.null2String(rs.getString("name")); } logger_24a1e280.info("TransUtil selectname "+selectname); return selectname; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java index b2e7c35..3c9394d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/BillFieldUtil.java @@ -118,11 +118,13 @@ public class BillFieldUtil { RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_n1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select name,field_id from field_option as workflow_selectItem where field_id =" + Util.getIntValue(id, 0) + " and selectvalue = " + Util.getIntValue(val, 0); + //TODO custom 已处理 int类型转string + //TODO custom + String sql = "select name,field_id from e10_core_business.dbo.field_option as workflow_selectItem where field_id ='"+id+"' and value_key= '" +val+"'"; logger_6c507bbc.info("sql----------- " + sql); recordSet.executeSql(sql, poolname_n1); if (recordSet.next()) { - name = recordSet.getString("selectname"); + name = recordSet.getString("name"); } logger_6c507bbc.info("name----------- " + name); return name; @@ -145,7 +147,7 @@ public class BillFieldUtil { String poolname_jl = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 // recordSet.executeSql("select c.name from wfp_base a " + "INNER JOIN form_field b on a.formid=b.form_id " + "INNER JOIN field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue, poolname_jl); - String sql = "SELECT c.name AS selectname\n" + + String sql = "SELECT c.name \n" + "FROM e10_core_business.dbo.wfp_base a\n" + "\tINNER JOIN e10_core_business.dbo.form_field b\n" + "\tON a.formid = b.form_id\n" + @@ -169,7 +171,7 @@ public class BillFieldUtil { recordSet.executeSql(sql, poolname_jl); if (recordSet.next()) { - name = recordSet.getString("selectname"); + name = recordSet.getString("name"); } logger_6c507bbc.info("name----------- " + name); return name; @@ -187,10 +189,11 @@ public class BillFieldUtil { RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_fi = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - recordSet.executeSql("select name,field_id,value_key from field_option as workflow_selectItem where field_id = " + Util.getIntValue(id, 0) + " order by value_key", poolname_fi); + //TODO custom 已处理 int类型转string + recordSet.executeSql("select name,field_id,value_key from e10_core_business.dbo.field_option as workflow_selectItem where field_id = '" + id + "' order by value_key", poolname_fi); while (recordSet.next()) { - String name = Util.null2String(recordSet.getString("selectname")); - String value = Util.null2String(recordSet.getString("selectvalue")); + String name = Util.null2String(recordSet.getString("name")); + String value = Util.null2String(recordSet.getString("value_key")); if (value.equals(val)) { str += ""; } else { @@ -212,7 +215,8 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_y9 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select * from wfp_node as workflow_nodebase where id=" + Util.getIntValue(nodeid, 0), poolname_y9); + //TODO custom 已处理 int类型转string + rs.executeSql("select * from wfp_node as workflow_nodebase where id='" + nodeid+"'", poolname_y9); if (rs.next()) { isstart = rs.getString("isstart"); } @@ -234,7 +238,8 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_v8 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select id,nodename from wfp_node as workflow_nodebase where id=" + Util.getIntValue(nodeid, 0), poolname_v8); + //TODO custom 已处理 int类型转string + rs.executeSql("select id,nodename from wfp_node as workflow_nodebase where id='" + nodeid +"'", poolname_v8); if (rs.next()) { nodename = rs.getString("nodename"); } @@ -253,8 +258,11 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_rg = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select id,dwnm from formtable_main_286 where id=" + Util.getIntValue(unitid, 0); - rs.executeSql(sql, poolname_rg); + //TODO custom 已处理 int类型转string + String sql = "select id,dwnm from e10_common.dbo.formtable_main_286 where id='" + unitid+"'"; + logger_6c507bbc.info("sql----------- " + sql); + boolean b1 = rs.executeSql(sql, poolname_rg); + logger_6c507bbc.info("b1----------- " + b1); if (rs.next()) { unitno = rs.getString("dwnm"); } @@ -274,6 +282,7 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_vp = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 + String sql = "select job_num from employee as HrmResource where id = " + hrid; rs.executeSql(sql, poolname_vp); if (rs.next()) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/FileUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/FileUtil.java deleted file mode 100644 index 0d7b866..0000000 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/FileUtil.java +++ /dev/null @@ -1,482 +0,0 @@ -//package com.weaver.seconddev.interfaces.swfa.sl; -// -///** -// * FileUtil.java -// * @Author: Administrator -// * @CreateDate: 2013-2-27 -// * @Version 1.0 -// * Copyright (C) 2013 -// */ -//import java.io.BufferedReader; -//import java.io.File; -//import java.io.FileInputStream; -//import java.io.FileReader; -//import java.io.FilenameFilter; -//import java.io.IOException; -//import java.text.ParseException; -//import java.text.SimpleDateFormat; -//import java.util.Date; -//import java.util.regex.Matcher; -//import java.util.regex.Pattern; -////import org.apache.log4j.Logger; -//import jcifs.smb.SmbAuthException; -//import jcifs.smb.SmbFile; -//import jcifs.smb.SmbFileInputStream; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -// -///** -// * ���������� -// */ -//public class FileUtil { -// -// private static final org.slf4j.Logger logger_e7cead7a = LoggerFactory.getLogger(FileUtil.class); -// -// private FileUtil() { -// } -// -// /** -// * ��ȡ�����ļ� -// * @param host -// * @param user -// * @param password -// * @param fname ���·�� -// * @return -// */ -// public static byte[] readLocalFile(String fname) { -// try { -// // File file = new File(fname); -// // FileInputStream is = new FileInputStream(file); -// SmbFile smbFile = new SmbFile(fname); -// SmbFileInputStream is = new SmbFileInputStream(smbFile); -// byte[] buff = new byte[smbFile.getContentLength()]; -// // byte[] buff = new byte[is.available()]; -// is.read(buff); -// is.close(); -// return buff; -// } catch (IOException e) { -// try { -// File file = new File(fname); -// FileInputStream is = new FileInputStream(file); -// byte[] buff = new byte[is.available()]; -// is.read(buff); -// is.close(); -// return buff; -// } catch (IOException e1) { -// return null; -// } -// } catch (Exception e) { -// return null; -// } -// } -// -// /** -// * ��ȡ�����ļ� -// * @param host -// * @param user -// * @param password -// * @param fname ���·�� -// * @return -// */ -// public static byte[] readSharedFile(String host, String user, String password, String fname) { -// String temp = ""; -// try { -// temp = fname; -// if (fname.startsWith("\\\\|/")) { -// temp = fname.replaceFirst("\\\\|/", ""); -// } -// temp = temp.replaceAll("\\\\", "/"); -// String fullpath = "smb://" + user + ":" + password + "@" + host + temp; -// SmbFile smbFile = new SmbFile(fullpath); -// SmbFileInputStream is = new SmbFileInputStream(smbFile); -// byte[] buff = new byte[smbFile.getContentLength()]; -// is.read(buff); -// is.close(); -// return buff; -// } catch (SmbAuthException e) { -// try { -// String localpath = "//" + host + temp; -// FileInputStream fis = new FileInputStream(new File(localpath)); -// byte[] buff = new byte[fis.available()]; -// fis.read(buff); -// fis.close(); -// return buff; -// } catch (IOException e1) { -// return null; -// } -// } catch (IOException e) { -// return null; -// } -// } -// -// /** -// * �жϹ����ļ��Ƿ���� -// * @param host -// * @param user -// * @param password -// * @param fname -// * @return -// */ -// public static boolean sharedFileExists(String host, String user, String password, String fname) { -// boolean flg = false; -// String temp = ""; -// try { -// temp = fname; -// if (fname.startsWith("\\\\|/")) { -// temp = fname.replaceFirst("\\\\|/", ""); -// } -// temp = fname.replaceAll("\\\\", "/"); -// String fullpath = "smb://" + user + ":" + password + "@" + host + temp; -// SmbFile smbFile = new SmbFile(fullpath); -// flg = smbFile.exists(); -// } catch (SmbAuthException e) { -// String localpath = "//" + host + temp; -// File file = new File(localpath); -// flg = file.exists(); -// } catch (IOException e) { -// } -// return flg; -// } -// -// /** -// * ����ָ�������ļ����¹����ļ����� -// * @param host -// * @param user -// * @param password -// * @param path ���·�� -// * @return -// */ -// // public static Object[] listFiles(String host, String user, String password, String path) { -// // String temp = ""; -// // try { -// // temp = path; -// // if (path.startsWith("\\\\|/")) { -// // temp = path.replaceFirst("\\\\|/", ""); -// // } -// // temp = temp.replaceAll("\\\\", "/"); -// // if (!path.endsWith("/")) { -// // temp += "/"; -// // } -// // String fullpath = "smb://" + user + ":" + password + "@" + host + temp; -// // SmbFile smbFile = new SmbFile(fullpath); -// // return smbFile.listFiles(); -// // } catch (SmbAuthException e) { -// // try { -// // String localpath = "//" + host + temp; -// // -// // File file = new File(localpath); -// // return file.listFiles(); -// // } catch (Exception e1) { -// // e1.printStackTrace(); -// // return null; -// // } -// // -// // -// // } catch (IOException e) { -// // e.printStackTrace(); -// // return null; -// // } -// // } -// /** -// * ����ָ�������ļ����¹����ļ����飨�Թ����ļ���ʽ��ȡ�� -// * @param host -// * @param user -// * @param password -// * @param path ���·�� -// * @return -// */ -// public static SmbFile[] listFilesAsShare(String fullpath) { -// try { -// SmbFile smbFile = new SmbFile(fullpath); -// return smbFile.listFiles(); -// } catch (IOException e) { -// e.printStackTrace(); -// return null; -// } -// } -// -// /** -// * ����ָ�������ļ����¹����ļ����飨�Թ����ļ���ʽ��ȡ�� -// * @param host -// * @param user -// * @param password -// * @param path ���·�� -// * @return -// */ -// public static SmbFile[] listFilesAsShare(String host, String user, String password, String path) { -// try { -// String temp = path; -// if (path.startsWith("\\\\|/")) { -// temp = path.replaceFirst("\\\\|/", ""); -// } -// temp = temp.replaceAll("\\\\", "/"); -// if (!path.endsWith("/")) { -// temp += "/"; -// } -// String fullpath = "smb://" + user + ":" + password + "@" + host + temp; -// SmbFile smbFile = new SmbFile(fullpath); -// return smbFile.listFiles(); -// } catch (IOException e) { -// e.printStackTrace(); -// return null; -// } -// } -// -// /** -// * ����ָ��ʱ��֮ǰ������ļ� -// * @param host -// * @param user -// * @param password -// * @param path -// * @param dateFormat �ļ������ڸ�ʽ -// * �磺�ļ���Ϊ -// * @param time ָ��ʱ�� -// * @return -// */ -// public static String searchLatestFiles(String host, String user, String password, String path, String dateFormat, Date time) { -// String temp = ""; -// final Pattern yPattern = Pattern.compile("\\d{4}"); -// final Pattern ymPattern = Pattern.compile("\\d{6}"); -// final Pattern ymdPattern = Pattern.compile("\\d{8}"); -// final SimpleDateFormat sdf = new SimpleDateFormat(dateFormat); -// final Date initTime = time; -// temp = path; -// if (path.startsWith("\\\\|/")) { -// temp = path.replaceFirst("\\\\|/", ""); -// } -// temp = temp.replaceAll("\\\\", "/"); -// if (!temp.endsWith("/")) { -// temp += "/"; -// } -// try { -// String localpath = "//" + host + temp; -// File file = new File(localpath); -// File[] fileYearList = file.listFiles(new FilenameFilter() { -// -// public boolean accept(File dir, String name) { -// Matcher m = yPattern.matcher(name); -// return m.matches(); -// } -// }); -// if (fileYearList != null && fileYearList.length > 0) { -// for (int i = fileYearList.length - 1; i >= 0; i--) { -// File[] fileYMList = fileYearList[i].listFiles(new FilenameFilter() { -// -// public boolean accept(File dir, String name) { -// Matcher m = ymPattern.matcher(name); -// return m.matches(); -// } -// }); -// if (null != fileYMList && fileYMList.length > 0) { -// for (int j = fileYMList.length - 1; j >= 0; j--) { -// File[] fileYMDList = fileYMList[j].listFiles(new FilenameFilter() { -// -// public boolean accept(File dir, String name) { -// Matcher m = ymdPattern.matcher(name); -// return m.matches(); -// } -// }); -// if (null != fileYMDList && fileYMDList.length > 0) { -// for (int k = fileYMDList.length - 1; k >= 0; k--) { -// File[] fileList = fileYMDList[k].listFiles(new FilenameFilter() { -// -// public boolean accept(File dir, String name) { -// try { -// Date curTime = sdf.parse(name); -// if (curTime.compareTo(initTime) <= 0) { -// return true; -// } -// } catch (ParseException e) { -// return false; -// } -// return false; -// } -// }); -// if (null != fileList && fileList.length > 0) { -// File tempFile = fileList[fileList.length - 1]; -// // TODO -// int index = tempFile.getAbsolutePath().indexOf(host); -// return tempFile.getAbsolutePath().substring(index + host.length()); -// } -// } -// } -// } -// } -// } -// } -// } catch (Exception e1) { -// e1.printStackTrace(); -// return ""; -// } -// return ""; -// } -// -// /** -// * @param host -// * @param user -// * @param password -// * @param path -// * @param p -// * @return -// */ -// public static String searchLatestFiles(String host, String user, String password, String path, Pattern p) { -// String temp = ""; -// final Pattern yPattern = Pattern.compile("\\d{4}"); -// final Pattern ymPattern = Pattern.compile("\\d{6}"); -// final Pattern ymdPattern = Pattern.compile("\\d{8}"); -// final Pattern fnamePattern = p; -// temp = path; -// if (path.startsWith("\\\\|/")) { -// temp = path.replaceFirst("\\\\|/", ""); -// } -// temp = temp.replaceAll("\\\\", "/"); -// if (!temp.endsWith("/")) { -// temp += "/"; -// } -// // try { -// // -// // String fullpath = "smb://" + user + ":" + password + "@" + host + temp; -// // SmbFile smbFile = new SmbFile(fullpath); -// // SmbFile[] smbFileYearList = smbFile.listFiles(new SmbFilenameFilter() { -// // @Override -// // public boolean accept(SmbFile dir, String name) { -// // Matcher m = yPattern.matcher(name); -// // return m.matches(); -// // }}); -// // if (smbFileYearList != null) { -// // for (int i = smbFileYearList.length - 1; i >= 0; i--) { -// // SmbFile[] smbFileYMList = smbFileYearList[i].listFiles(new SmbFilenameFilter() { -// // @Override -// // public boolean accept(SmbFile dir, String name) { -// // Matcher m = ymPattern.matcher(name); -// // return m.matches(); -// // }}); -// // if (null != smbFileYMList) { -// // for (int j = smbFileYMList.length - 1; j >= 0; j--) { -// // SmbFile[] smbFileYMDList = smbFileYMList[j].listFiles(new SmbFilenameFilter() { -// // @Override -// // public boolean accept(SmbFile dir, String name) { -// // Matcher m = ymdPattern.matcher(name); -// // return m.matches(); -// // }}); -// // if (null != smbFileYMDList) { -// // for (int k = smbFileYMDList.length - 1; k >= 0; k--) { -// // SmbFile[] smbFileList = smbFileYMDList[k].listFiles(new SmbFilenameFilter() { -// // @Override -// // public boolean accept(SmbFile dir, String name) { -// // Matcher m = fnamePattern.matcher(name); -// // return m.matches(); -// // }}); -// // if (null != smbFileList && smbFileList.length > 0) { -// // SmbFile tempFile = smbFileList[smbFileList.length - 1]; -// // String share = tempFile.getShare(); -// // int index = tempFile.getCanonicalPath().indexOf(share); -// // return tempFile.getCanonicalPath().substring(index); -// // } -// // } -// // } -// // } -// // } -// // } -// // } -// // } catch (SmbAuthException e) { -// try { -// String localpath = "//" + host + temp; -// File file = new File(localpath); -// File[] fileYearList = file.listFiles(new FilenameFilter() { -// -// public boolean accept(File dir, String name) { -// Matcher m = yPattern.matcher(name); -// return m.matches(); -// } -// }); -// if (fileYearList != null && fileYearList.length > 0) { -// for (int i = fileYearList.length - 1; i >= 0; i--) { -// File[] fileYMList = fileYearList[i].listFiles(new FilenameFilter() { -// -// public boolean accept(File dir, String name) { -// Matcher m = ymPattern.matcher(name); -// return m.matches(); -// } -// }); -// if (null != fileYMList && fileYMList.length > 0) { -// for (int j = fileYMList.length - 1; j >= 0; j--) { -// File[] fileYMDList = fileYMList[j].listFiles(new FilenameFilter() { -// -// public boolean accept(File dir, String name) { -// Matcher m = ymdPattern.matcher(name); -// return m.matches(); -// } -// }); -// if (null != fileYMDList && fileYMDList.length > 0) { -// for (int k = fileYMDList.length - 1; k >= 0; k--) { -// File[] fileList = fileYMDList[k].listFiles(new FilenameFilter() { -// -// public boolean accept(File dir, String name) { -// Matcher m = fnamePattern.matcher(name); -// return m.matches(); -// } -// }); -// if (null != fileList && fileList.length > 0) { -// // return fileList[fileList.length - 1]; -// File tempFile = fileList[fileList.length - 1]; -// // TODO -// int index = tempFile.getAbsolutePath().indexOf(host); -// return tempFile.getAbsolutePath().substring(index + host.length()); -// } -// } -// } -// } -// } -// } -// } -// } catch (Exception e1) { -// e1.printStackTrace(); -// return ""; -// } -// // } catch (IOException e) { -// // e.printStackTrace(); -// // return ""; -// // } -// return ""; -// } -// -// public static void main(String[] args) { -// // System.err.println(FileUtil.sharedFileExists("10.124.41.200", "Administrator", "oracle", "jsproduct")); -// } -// -// public static String ReadFile(String path) { -// String laststr = ""; -// File file = new File(path); -// if (file.exists()) { -// BufferedReader reader = null; -// try { -// reader = new BufferedReader(new FileReader(file)); -// String tempString = null; -// while ((tempString = reader.readLine()) != null) { -// laststr = laststr + tempString; -// } -// reader.close(); -// } catch (IOException e) { -// e.printStackTrace(); -// WriteLog(e.toString()); -// } finally { -// if (reader != null) { -// try { -// reader.close(); -// } catch (IOException e1) { -// WriteLog(e1.toString()); -// } -// } -// } -// } else { -// WriteLog("ReadFile " + path + " not exists "); -// } -// return laststr; -// } -// -// private static void WriteLog(String message) { -// // log.info(message); -// System.out.println(message); -// } -//} diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BlackListTempThawSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BlackListTempThawSyncAction.java index 67c4a5c..d20fd6c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BlackListTempThawSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BlackListTempThawSyncAction.java @@ -88,7 +88,7 @@ public class BlackListTempThawSyncAction extends BaseBean implements Action, Esb head.setTaxno(map.get("SHXYDM")); // 类型 logger_e39d526d.info("lx" + map.get("LX") ); - head.setType(util.getselectName(map.get("LX"), "50151")); + head.setType(util.getselectName(map.get("LX"), "100003720000056151")); //50151 -> 56151 arr[0] = head; logger_e39d526d.info("arr" + arr.toString() ); CRM_TEMPUNFREEZE_RETURN[] rets = service.call(arr); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java index aff3ca2..805c6ed 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EASIntermediarySyncAction.java @@ -77,7 +77,7 @@ public class EASIntermediarySyncAction extends BaseBean implements Action, EsbSe String yxx = ""; if ("0".equals(sfba)) { // 测试：47916，正式：44963 - ywlx = BillFieldUtil.getselectName(map.get("YWLX"), "44963"); + ywlx = BillFieldUtil.getselectName(map.get("YWLX"), "100003720000044963"); lxr = map.get("CWZJJGLXR"); lxfs = map.get("CWZJJGLXFS"); name = map.get("CWZJJGMC"); @@ -91,7 +91,7 @@ public class EASIntermediarySyncAction extends BaseBean implements Action, EsbSe } } else { // 测试：47923，正式：44993 - ywlx = BillFieldUtil.getselectName(map.get("YWLXXZ"), "44993"); + ywlx = BillFieldUtil.getselectName(map.get("YWLXXZ"), "100003720000044993"); lxr = map.get("LXRXZ"); lxfs = map.get("LXFSXZ"); name = map.get("CWZJJGMCXZ"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java index 185025a..d36cdaa 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasWhiteListAction.java @@ -48,7 +48,7 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles BillFieldUtil unit = new BillFieldUtil(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - int id = 0; + String id = ""; try { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String sql = "select id from e10_core_business.dbo." + tablename + " where requestId='" + requestid + "'"; @@ -58,7 +58,7 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles boolean b = rs.executeSql(sql, poolname); logger_b5430ca5.info("b == "+b); while (rs.next()) { - id = rs.getInt("id"); + id = rs.getString("id"); logger_b5430ca5.info("id == "+id); } } catch (Exception e) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java index 7781e0d..ea3dbeb 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/EasYszxfpApplyResultAction.java @@ -114,7 +114,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS } logger_59285be7.info(String.valueOf(requestID + "TAXRATE:" + mDetailMap.get("TAXRATE"))); // 测试环境-63588,正式环境-68112 - String selectitem = util.getselectName(mDetailMap.get("TAXRATE"), "68112"); + String selectitem = util.getselectName(mDetailMap.get("TAXRATE"), "100003720000068112"); logger_59285be7.info(String.valueOf(requestID + "selectitem:" + selectitem)); String taxrate = selectitem.substring(0, selectitem.indexOf("%")); if ("0".equals(taxrate)) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java index f555d43..819dab3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_NEW_RETURNAction.java @@ -135,10 +135,9 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_p2 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = recordSet.executeSql("select c.name from e10_common.dbo.wfp_base a " + "INNER JOIN e10_common.dbo.form_field b on a.formid=b.form_id " + "INNER JOIN field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue, poolname_p2); - logger_882eb0b2.info("b--" + b); + recordSet.executeSql("select c.name from wfp_base a " + "INNER JOIN form_field b on a.formid=b.form_id " + "INNER JOIN e10_core_business.dbo.field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.value_key=" + selectvalue, poolname_p2); if (recordSet.next()) { - name = recordSet.getString("selectname"); + name = recordSet.getString("name"); } return name; } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java index 2601aa0..dd1799e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_SCXAction.java @@ -132,7 +132,9 @@ public class ZOA_MM_PR_CREATE_SCXAction extends BaseBean implements Action, EsbS } // 采购组 if (nameq.equals("CGZ")) { - cgz = unit.getselectName(valueq, "30110").trim(); +// cgz = unit.getselectName(valueq, "30110").trim(); + cgz = unit.getselectName(valueq, "100003720000030110").trim(); + if (cgz.length() > 1) { // 采购组 prdetail[j][4] = cgz.substring(0, 3); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java index d81067e..61354dc 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_WWJGAction.java @@ -132,7 +132,7 @@ public class ZOA_MM_PR_CREATE_WWJGAction extends BaseBean implements Action, Esb } // 采购组 if (nameq.equals("CGZ")) { - cgz = unit.getselectName(valueq, "30137").trim(); + cgz = unit.getselectName(valueq, "100003720000030137").trim(); if (cgz.length() > 1) { // 采购组 prdetail[j][4] = cgz.substring(0, 3); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java index d0f77fd..a53bc17 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_YFAction.java @@ -126,7 +126,7 @@ public class ZOA_MM_PR_CREATE_YFAction extends BaseBean implements Action, EsbSe } // 采购组 if (nameq.equals("CGZ")) { - cgz = unit.getselectName(valueq, "57815").trim(); + cgz = unit.getselectName(valueq, "100003720000063718").trim(); //57815 -> 63718 if (cgz.length() > 1) { // 采购组 prdetail[j][4] = cgz.substring(0, 3); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java index 8c357d4..a5a5466 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_CREATE_ZJGC_ZjAction.java @@ -166,6 +166,10 @@ public class ZOA_MM_PR_CREATE_ZJGC_ZjAction extends BaseBean implements Action, String tablename = ""; String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); + + logger_518ea046.info(String.valueOf("prtype == " + prtype)); + logger_518ea046.info(String.valueOf("prdetail == " + prdetail)); + tablename = request.getRequestManager().getBillTableName(); ZOA_MM_PR_CREATE_ZJGC po = new ZOA_MM_PR_CREATE_ZJGC(); String[] fhz = po.Getexecute(prtype, prdetail); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java index a92717d..55390ca 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_GDFileUploadAction.java @@ -297,12 +297,12 @@ public class ZZ_GDFileUploadAction extends BaseBean implements Action, EsbServer RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_48 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select c.name from e10_common.dbo.wfp_base a " + "INNER JOIN e10_common.dbo.form_field b on a.formid=b.form_id " + "INNER JOIN e10_common.dbo.field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue; + String sql = "select c.name from e10_common.dbo.wfp_base a " + "INNER JOIN e10_common.dbo.form_field b on a.formid=b.form_id " + "INNER JOIN e10_common.dbo.field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.value_key=" + selectvalue; logger_b14cb5d0.info("getselectNameByCol sql = " + sql ); boolean b1 = recordSet.executeSql(sql, poolname_48); logger_b14cb5d0.info("getselectNameByCol flag = " + b1 ); if (recordSet.next()) { - name = recordSet.getString("selectname"); + name = recordSet.getString("name"); logger_b14cb5d0.info("getselectNameByCol name = " + name ); } return name; diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java index 8fa3f2a..4697c36 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZZ_Ten_GDFileUploadAction.java @@ -301,12 +301,12 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); String poolname_w2 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select c.name from e10_common.dbo.wfp_base a " + "INNER JOIN e10_common.dbo.form_field b on a.formid=b.form_id " + "INNER JOIN e10_common.dbo.field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.selectvalue=" + selectvalue; + String sql = "select c.name from e10_common.dbo.wfp_base a " + "INNER JOIN e10_common.dbo.form_field b on a.formid=b.form_id " + "INNER JOIN e10_common.dbo.field_option c on b.id=c.field_id " + "where b.fieldname='" + fieldname + "' and a.id=" + workflowid + " and c.value_key=" + selectvalue; logger_8ab26152.info("getselectNameByCol sql = " + sql); boolean b1 = recordSet.executeSql(sql, poolname_w2); logger_8ab26152.info("getselectNameByCol flag = " + b1); if (recordSet.next()) { - name = recordSet.getString("selectname"); + name = recordSet.getString("name"); } logger_8ab26152.info("getselectNameByCol name = " + name); return name;