From ce72cd2ffe97df268fe9a49feb5813a8f14429de Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Tue, 7 Jan 2025 15:47:01 +0800 Subject: [PATCH 1/5] 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; From 3c5e8f27adc2537fb7b1b2d29c9bf810caf0322d Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Tue, 7 Jan 2025 15:55:11 +0800 Subject: [PATCH 2/5] requestid --- .../workflow/action/ARSPaymentRecepitAction.java | 2 +- .../workflow/action/AddVenMatExtsToSrmAction.java | 4 ++-- .../workflow/action/BlackListTempThawCheckAction.java | 2 +- .../action/ChangeInformationExpertsAction.java | 2 +- .../workflow/action/DeleteSapGuidAction.java | 2 +- .../interfaces/workflow/action/EasWhiteListAction.java | 4 ++-- .../workflow/action/EasYszxfpApplyResultAction.java | 10 +++++----- .../workflow/action/HTGD_MES_NonStandardAction.java | 4 ++-- .../workflow/action/HTGD_MES_SC03Action.java | 6 +++--- .../workflow/action/HTGD_MES_SpeedFixAction.java | 2 +- .../workflow/action/HTGD_MES_TDLApproveActivon.java | 2 +- .../workflow/action/HTGD_SW_OaBackAction.java | 2 +- .../interfaces/workflow/action/HTWLJiaBanAction.java | 2 +- .../interfaces/workflow/action/Iur_syncProject.java | 4 ++-- .../interfaces/workflow/action/K3PORequestAction.java | 2 +- .../interfaces/workflow/action/LastOperateAction.java | 2 +- .../interfaces/workflow/action/OA_CMZ_Action.java | 2 +- .../interfaces/workflow/action/OaCrmZDYWFPAction.java | 2 +- .../action/OaMesNewMaterialCertificationAction.java | 2 +- .../workflow/action/OaMesNewMaterialProjectAction.java | 2 +- .../workflow/action/OaMesNewMaterialTSBGAction.java | 2 +- .../workflow/action/OaMesNewMaterialTestAction.java | 2 +- .../workflow/action/OaSrmCheckMallRefuseAction.java | 2 +- .../workflow/action/OaSrmCheckPriceRefuseAction.java | 2 +- .../interfaces/workflow/action/OaWmsReturnAction.java | 2 +- .../workflow/action/OperateMesAccountAction.java | 4 ++-- .../workflow/action/SY_WLPS_NEW_RETURNAction.java | 4 ++-- .../workflow/action/SY_WLPS_RETURNNewAction.java | 4 ++-- .../workflow/action/ZOA_CCSQ_AQJB_Action.java | 2 +- .../workflow/action/ZOA_MM_PR_RELEASEAction.java | 2 +- .../interfaces/workflow/action/ZOA_SL_GWCC_Action.java | 6 +++--- .../interfaces/workflow/action/ZOA_SL_GW_Action.java | 2 +- .../workflow/action/ZOEM_MATRIAL_PRICE_Action.java | 2 +- .../action/ZOEM_PRICE_DIFFERENCE_RATE_Action.java | 2 +- .../workflow/action/ZOEM_PROCESSING_CHARGE_Action.java | 2 +- .../workflow/action/ZSRM_PUR_INFO_Action.java | 2 +- .../workflow/action/ZSRM_PUR_INFO_GY107_Action.java | 4 ++-- .../workflow/action/ZSRM_PUR_INFO_GY132_Action.java | 4 ++-- 38 files changed, 55 insertions(+), 55 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java index 0a2c2dc..66649c3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ARSPaymentRecepitAction.java @@ -159,7 +159,7 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ } else { if ("2".equals(operate)) { // 正式formtable_main_2714,测试formtable_main_2252，formtable_main_2401 - boolean billingno = rs.execute("update e10_core_business.dbo.formtable_main_2401 set hkdh='" + ret.get("billingno") + "' where requestId=" + requestid); + boolean billingno = rs.execute("update e10_core_business.dbo.formtable_main_2401 set hkdh='" + ret.get("billingno") + "' where id=" + requestid); logger_c29b3679.info("billingno　＝　" +billingno); } } diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java index 2c01241..603b4c8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmAction.java @@ -229,7 +229,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 e10_core_business.dbo." + tablename + " set state='" + isTat + "',message='" + msg + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + isTat + "',message='" + msg + "' where id=" + requestId; logger_336cd654.info("sql == "+sql); String poolname_c1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -240,7 +240,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 e10_core_business.dbo." + 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 id=" + requestId; logger_336cd654.info("sql == "+sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BlackListTempThawCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BlackListTempThawCheckAction.java index 7b67c39..ca5d29c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BlackListTempThawCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/BlackListTempThawCheckAction.java @@ -158,7 +158,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 e10_core_business.dbo." + table + " where requestId=" + id; + String sql = "select lrhmddw from e10_core_business.dbo." + table + " where id=" + id; logger_454fb322.info("getApplyCom sql == " + sql); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java index 4ed7d9d..a24b489 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java @@ -59,7 +59,7 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, String roleid = "100502830000001498"; String zjlx1 = ""; String sqdw = ""; - String sql = "select * from e10_core_business.dbo." + tablename + " where requestid=" + requestid; + String sql = "select * from e10_core_business.dbo." + tablename + " where id=" + requestid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b2 = rs.executeSql(sql, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java index 38b689e..72fd9c9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DeleteSapGuidAction.java +++ b/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 e10_core_business.dbo.").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 id = ").append(requestid).toString(); logger_5b06e417.info(String.valueOf((new StringBuilder()).append("logsql:").append(sql).toString())); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 d36cdaa..596bf20 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 @@ -51,7 +51,7 @@ public class EasWhiteListAction extends BaseBean implements Action, EsbServerles String id = ""; try { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "select id from e10_core_business.dbo." + tablename + " where requestId='" + requestid + "'"; + String sql = "select id from e10_core_business.dbo." + tablename + " where id='" + requestid + "'"; logger_b5430ca5.info("sql == "+sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -185,7 +185,7 @@ 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 e10_core_business.dbo." + 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 id='" + requestid + "'"; logger_b5430ca5.info("sql = "+sql); String poolname_x3 = CONN_TYPE.workflow.getType(); 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 ea3dbeb..10de93e 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 @@ -63,7 +63,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS String wfid = requestInfo.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = requestInfo.getRequestManager().getBillTableName(); - String sql = "select sfdy from e10_core_business.dbo." + tablename + " where requestId =" + requestID; + String sql = "select sfdy from e10_core_business.dbo." + tablename + " where id =" + requestID; logger_59285be7.info("sql == " +sql); String poolname_l4 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -76,7 +76,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS } else { String poolname_r6 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql2 = "update e10_core_business.dbo." + tablename + " set sfdy = 0 where requestId = " + requestID; + String sql2 = "update e10_core_business.dbo." + tablename + " set sfdy = 0 where id = " + requestID; logger_59285be7.info("sql2 == " +sql2); boolean b = rs.executeSql(sql2, poolname_r6); logger_59285be7.info("b == " +b); @@ -190,7 +190,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS String poolname_so = CONN_TYPE.workflow.getType(); // 失败 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql3 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where requestId = " + requestID; + String sql3 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where id = " + requestID; logger_59285be7.info("sql3"+sql3); boolean b = rs.executeSql(sql3, poolname_so); logger_59285be7.info("b2"+b); @@ -202,7 +202,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS } else { String poolname_b5 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql4 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where requestId = " + requestID; + String sql4 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where id = " + requestID; logger_59285be7.info("sql4"+sql4); boolean b = rs.executeSql(sql4, poolname_b5); logger_59285be7.info("b3"+b); @@ -210,7 +210,7 @@ public class EasYszxfpApplyResultAction extends BaseBean implements Action, EsbS } catch (Exception e) { String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql5 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where requestId = " + requestID; + String sql5 = "update e10_core_business.dbo." + tablename + " set sfdy = 1 where id = " + requestID; logger_59285be7.info("sql5"+sql5); boolean b = rs.executeSql(sql5, poolname); logger_59285be7.info("b4"+b); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_NonStandardAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_NonStandardAction.java index 3db8f82..337d204 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_NonStandardAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_NonStandardAction.java @@ -97,7 +97,7 @@ public class HTGD_MES_NonStandardAction extends BaseBean implements Action, EsbS String[] ret = service.returnRes(req); if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; String poolname_ar = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname_ar); @@ -107,7 +107,7 @@ public class HTGD_MES_NonStandardAction extends BaseBean implements Action, EsbS } catch (Exception exception) { logger_c8d15d65.info(String.valueOf("HTGD_MES_NonStandardAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where id=" + requestId; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SC03Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SC03Action.java index 1ca1174..bd5b27e 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SC03Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SC03Action.java @@ -85,7 +85,7 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle JSONObject mjson = new JSONObject(); RecordSet sqbmrs = I18nContextUtil.getBean(RecordSet.class); // 获取申请部门审核记录 - String sql = "select operatedatetime,operatetime,b.username from e10_core_business.dbo.wfc_requestlog a " + "INNER JOIN employee b on a.creator = b.id " + "where requestid = " + requestId + // 申请部门一级人员 测试环境-19915 正式环境-29618 + String sql = "select operatedatetime,operatetime,b.username from e10_core_business.dbo.wfc_requestlog a " + "INNER JOIN employee b on a.creator = b.id " + "where id = " + requestId + // 申请部门一级人员 测试环境-19915 正式环境-29618 " and nodeid = 29618"; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -100,7 +100,7 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle mjson.put("sqbmyj", sqbmyj); } // 获取受理部门审核记录 - String sql_slbm = "select operatedatetime,operatetime,b.username from e10_core_business.dbo.wfc_requestlog a " + "INNER JOIN employee b on a.creator = b.id " + "where requestid = " + requestId + // 受理部门一级人员 测试环境-19916 正式环境-29619 + String sql_slbm = "select operatedatetime,operatetime,b.username from e10_core_business.dbo.wfc_requestlog a " + "INNER JOIN employee b on a.creator = b.id " + "where id = " + requestId + // 受理部门一级人员 测试环境-19916 正式环境-29619 " and nodeid = 29619"; String poolname_dk = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -166,7 +166,7 @@ public class HTGD_MES_SC03Action extends BaseBean implements Action, EsbServerle RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_ig = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b2 = rs.executeSql("update e10_core_business.dbo" + tablename + " set state='E',message='" + ret[1] + "' where requestId=" + requestId, poolname_ig); + boolean b2 = rs.executeSql("update e10_core_business.dbo" + tablename + " set state='E',message='" + ret[1] + "' where id=" + requestId, poolname_ig); logger_1ea91e04.info("b2 -----"+ b2); } } catch (Exception exception) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SpeedFixAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SpeedFixAction.java index 6a97598..3fecc4f 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SpeedFixAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_SpeedFixAction.java @@ -120,7 +120,7 @@ public class HTGD_MES_SpeedFixAction extends BaseBean implements Action, EsbServ RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='E',message='" + ret[1] + "' where requestId=" + requestId, poolname); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='E',message='" + ret[1] + "' where id=" + requestId, poolname); logger_d0d39a5f.info(String.valueOf(requestId + "-HTGD_MES_SpeedFixAction update:" + b)); } } catch (Exception exception) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_TDLApproveActivon.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_TDLApproveActivon.java index 8d751fe..71fb467 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_TDLApproveActivon.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_MES_TDLApproveActivon.java @@ -90,7 +90,7 @@ public class HTGD_MES_TDLApproveActivon extends BaseBean implements Action, EsbS RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId, poolname); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId, poolname); if (b) { logger_674a8052.info(String.valueOf(requestId + "-HTGD_MES_TDLApproveActivon update success")); } else { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_SW_OaBackAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_SW_OaBackAction.java index a1637c6..1738594 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_SW_OaBackAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTGD_SW_OaBackAction.java @@ -368,7 +368,7 @@ public class HTGD_SW_OaBackAction extends BaseBean implements Action, EsbServerl String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_e4a191d3.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTWLJiaBanAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTWLJiaBanAction.java index ae5ac94..0878a4a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTWLJiaBanAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/HTWLJiaBanAction.java @@ -145,7 +145,7 @@ public class HTWLJiaBanAction extends BaseBean implements Action, EsbServerlessR RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_ux = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set jbdtzzdksj='" + swdkjl + "',jbdtzwdksj='" + xwdkjl + "' where requestId=" + requestid, poolname_ux); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set jbdtzzdksj='" + swdkjl + "',jbdtzwdksj='" + xwdkjl + "' where id=" + requestid, poolname_ux); logger_983b20e3.info(String.valueOf("HTWLJiaBanAction update:" + b)); } else { request.getRequestManager().setMessageid("Error"); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Iur_syncProject.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Iur_syncProject.java index fdf0ccf..66787d1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Iur_syncProject.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/Iur_syncProject.java @@ -75,7 +75,7 @@ public class Iur_syncProject extends BaseBean implements Action, EsbServerlessRp logger_72949ae6.info(String.valueOf(requestid + "--Iur_syncProject--info:[" + result[0] + "|" + result[1] + "]")); String poolname_9l = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='" + result[0] + "',message='" + result[1] + "' where requestId=" + requestid, poolname_9l); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='" + result[0] + "',message='" + result[1] + "' where id=" + requestid, poolname_9l); if (b) { logger_72949ae6.info(String.valueOf(requestid + "--Iur_syncProject--update success")); } else { @@ -85,7 +85,7 @@ public class Iur_syncProject extends BaseBean implements Action, EsbServerlessRp logger_72949ae6.info(String.valueOf("Iur_syncProject--error:" + e.toString())); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where requestId=" + requestid, poolname); + boolean b = rs.executeSql("update e10_core_business.dbo." + tablename + " set status='E',message='" + e.toString() + "' where id=" + requestid, poolname); if (b) { logger_72949ae6.info(String.valueOf(requestid + "--Iur_syncProject--update success")); } else { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java index e43d9d8..54237a7 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/K3PORequestAction.java @@ -168,7 +168,7 @@ public class K3PORequestAction extends BaseBean implements Action, EsbServerless String message = response.getMessage(); String cgdddjbh = Util.null2String(response.getFBillNO()); logger_7396c45f.info(String.valueOf(requestID + "result:code:" + code + " result:" + result + " message:" + message + " cgdddjbh:" + cgdddjbh)); - String sql = "update e10_core_business.dbo." + tableName + " set cgdddjbh='" + cgdddjbh + "' where requestid=" + requestID; + String sql = "update e10_core_business.dbo." + tableName + " set cgdddjbh='" + cgdddjbh + "' where id=" + requestID; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java index 3f82884..bf60815 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/LastOperateAction.java @@ -66,7 +66,7 @@ public class LastOperateAction extends BaseBean implements Action, EsbServerless // String tablename = wkbl.getTablename(wkfl.getFormId(workflowid)); String tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set spr = '" + spr + "' where requestId = " + reid; + String logsql = "update e10_core_business.dbo." + tablename + " set spr = '" + spr + "' where id = " + reid; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs1.executeSql(logsql, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OA_CMZ_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OA_CMZ_Action.java index 30e3e37..3b71608 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OA_CMZ_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OA_CMZ_Action.java @@ -120,7 +120,7 @@ public class OA_CMZ_Action extends BaseBean implements Action, EsbServerlessRpcR BillFieldUtil unit = new BillFieldUtil(); // tablename = unit.getTablename(wfid); tablename = requestinfo.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set status ='" + sta + "', message = '" + meg + "' where requestId = " + requestid; + String logsql = "update e10_core_business.dbo." + tablename + " set status ='" + sta + "', message = '" + meg + "' where id = " + requestid; logger_44f7fe13.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java index 462cbb1..890c8c5 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaCrmZDYWFPAction.java @@ -129,7 +129,7 @@ public class OaCrmZDYWFPAction extends BaseBean implements Action, EsbServerless requestInfo.getRequestManager().setMessagecontent("CRM返回错误信息：" + srMessage); } else { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set jssqdh='" + goldenNum + "' where requestId=" + requestID; + String sql = "update e10_core_business.dbo." + tablename + " set jssqdh='" + goldenNum + "' where id=" + requestID; String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialCertificationAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialCertificationAction.java index bc407a0..bf90bf1 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialCertificationAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialCertificationAction.java @@ -523,7 +523,7 @@ public class OaMesNewMaterialCertificationAction extends BaseBean implements Act String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_7ab25493.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialProjectAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialProjectAction.java index 15f2925..c4e3e70 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialProjectAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialProjectAction.java @@ -405,7 +405,7 @@ public class OaMesNewMaterialProjectAction extends BaseBean implements Action, E String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_fedc85f2.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTSBGAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTSBGAction.java index 2512ba0..735e0d5 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTSBGAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTSBGAction.java @@ -439,7 +439,7 @@ public class OaMesNewMaterialTSBGAction extends BaseBean implements Action, EsbS String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_f52b61d7.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTestAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTestAction.java index ccd12a6..debc7bf 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTestAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaMesNewMaterialTestAction.java @@ -299,7 +299,7 @@ public class OaMesNewMaterialTestAction extends BaseBean implements Action, EsbS String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_908d3105.info(String.valueOf("logsql:" + logsql)); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallRefuseAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallRefuseAction.java index f1c7ea6..a2fb208 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallRefuseAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckMallRefuseAction.java @@ -105,7 +105,7 @@ public class OaSrmCheckMallRefuseAction extends BaseBean implements Action, EsbS String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_6576dfe9.info(String.valueOf(requestId + " logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java index 262211c..8f2ffd8 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmCheckPriceRefuseAction.java @@ -146,7 +146,7 @@ public class OaSrmCheckPriceRefuseAction extends BaseBean implements Action, Esb String wfid = request.getWorkflowid(); // tablename = unit.getTablename(wfid); tablename = request.getRequestManager().getBillTableName(); - String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where requestId = " + requestId; + String logsql = "update e10_core_business.dbo." + tablename + " set sta ='" + sta + "', meg = '" + meg + "' where id = " + requestId; logger_80563c68.info(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java index f93a72a..4a30dca 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaWmsReturnAction.java @@ -106,7 +106,7 @@ public class OaWmsReturnAction extends BaseBean implements Action, EsbServerless return WeaResult.fail(500, "执行失败", getResultMapForAction(weaverResultMap, "result", Action.FAILURE_AND_CONTINUE, requestinfo.getRequestManager())); } } catch (Exception e) { - sql = "update e10_core_business.dbo." + tableName + " set state='E',message='" + e.toString() + "' where requestId=" + requestid; + sql = "update e10_core_business.dbo." + tableName + " set state='E',message='" + e.toString() + "' where id=" + requestid; logger_824c0f2.info("sql--"+sql); String poolname_bm = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java index 680a2ee..4b2e7d6 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OperateMesAccountAction.java @@ -121,7 +121,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ logger_4057422d.info(String.valueOf(requestId + "----" + gh + str + "成功")); } } - String sql = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; logger_4057422d.info("sql" + sql); String poolname_cc = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -131,7 +131,7 @@ public class OperateMesAccountAction extends BaseBean implements Action, EsbServ } catch (Exception e) { stat = "E"; message = e.toString(); - String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where requestId=" + requestId; + String errorLog = "update e10_core_business.dbo." + tablename + " set status='" + stat + "',message='" + message + "' where id=" + requestId; logger_4057422d.info("errorLog" + errorLog); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 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 819dab3..fa8aec9 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 @@ -98,7 +98,7 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer String[] ret = service.returnRes(req); if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; String poolname_9c = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 boolean b = rs.executeSql(sql, poolname_9c); @@ -109,7 +109,7 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer } catch (Exception exception) { logger_882eb0b2.error(String.valueOf("SY_WLPS_NEW_RETURNAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where id=" + requestId; logger_882eb0b2.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNNewAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNNewAction.java index 7d651ee..7c8b85d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNNewAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/SY_WLPS_RETURNNewAction.java @@ -92,7 +92,7 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ String[] ret = service.returnRes(req); if ("E".equals(ret[0])) { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestId; logger_4dd7c639.info("sql--" + sql); String poolname_2y = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -104,7 +104,7 @@ public class SY_WLPS_RETURNNewAction extends BaseBean implements Action, EsbServ } catch (Exception exception) { logger_4dd7c639.info(String.valueOf("SY_WLPS_RETURNAction--" + requestId + "执行出错：" + exception.getMessage())); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where requestId=" + requestId; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + exception.getMessage() + "' where id=" + requestId; logger_4dd7c639.info("sql--" + sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java index f694795..830f783 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_CCSQ_AQJB_Action.java @@ -91,7 +91,7 @@ public class ZOA_CCSQ_AQJB_Action extends BaseBean implements Action, EsbServerl sqr = "0"; } if (!tablename.equals("")) { - logsql = "update e10_core_business.dbo." + tablename + " set aqjb = (select max(seclevel) from employee as HrmResource where id in (" + sqr + ") or id in (" + ccsxry + ") ) where requestId = " + reid; + logsql = "update e10_core_business.dbo." + tablename + " set aqjb = (select max(seclevel) from employee as HrmResource where id in (" + sqr + ") or id in (" + ccsxry + ") ) where id = " + reid; logger_31bb84de.info(String.valueOf("logsql:" + logsql)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java index 5ce65a2..cf2ba08 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_PR_RELEASEAction.java @@ -136,7 +136,7 @@ public class ZOA_MM_PR_RELEASEAction extends BaseBean implements Action, EsbServ Object[] obj1 = new Object[2]; obj1[0] = e_status; obj1[1] = e_message; - String sql = "update " + tablename + " set status = ? , message = ? where requestid = " + requestId; + String sql = "update " + tablename + " set status = ? , message = ? where id = " + requestId; logger_41a94d2d.info(String.valueOf("ZOA_MM_PR_RELEASEAction ----- sql = " + sql)); String poolname_sb = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java index a64cef2..80e2e00 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GWCC_Action.java @@ -504,7 +504,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles logUtil.setJkzt("1"); logUtil.insertLog(); str = Message; - String sql1 = "update e10_core_business.dbo." + tablename + " set message = isnull(cast(message as varchar(8000)),'') + '" + Message + "' where requestId = " + reid; + String sql1 = "update e10_core_business.dbo." + tablename + " set message = isnull(cast(message as varchar(8000)),'') + '" + Message + "' where id = " + reid; logger_f5224b91.info(String.valueOf("sql1:" + sql1)); String poolname = CONN_TYPE.workflow.getType(); @@ -655,7 +655,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles message = "--携程接口回写说明--ReturnStatus:" + strreturn[0] + "；ReturnERRORMessage:" + strreturn[1] + "；ReturnErrorCode:" + strreturn[2]; message = message.replace("'", "’"); if (!tablename.equals("")) { - String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql2 = "update e10_core_business.dbo." + tablename + " set status ='" + status + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; logger_f5224b91.info(String.valueOf("logsql2:" + logsql2)); String poolname_t9 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -732,7 +732,7 @@ public class ZOA_SL_GWCC_Action extends BaseBean implements Action, EsbServerles } message = "--同程接口回写说明--ReturnStatus:" + dTtrip[0] + "；ReturnMessage:" + dTtrip[1] + "；出差单号:" + dTtrip[2]; message = message.replace("'", "’"); - String logsql4 = "update e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql4 = "update e10_core_business.dbo." + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; logger_f5224b91.info(String.valueOf("logsql4:" + logsql4)); String poolname_ot = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java index 013efbd..d9e590d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SL_GW_Action.java @@ -585,7 +585,7 @@ public class ZOA_SL_GW_Action extends BaseBean implements Action, EsbServerlessR String[] dTtrip = dTtripService.optForDTtrip(map); message = "--同程接口回写说明--ReturnStatus:" + dTtrip[0] + "；ReturnMessage:" + dTtrip[1] + "；出差单号:" + dTtrip[2]; message = message.replace("'", "’"); - String logsql4 = "update " + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where requestId = " + reid; + String logsql4 = "update " + tablename + " set status ='" + dTtrip[0] + "', message = isnull(cast(message as varchar(8000)),'') + '" + message + "' where id = " + reid; logger_39ae6ef1.info(String.valueOf("logsql4:" + logsql4)); String poolname_2f = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_MATRIAL_PRICE_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_MATRIAL_PRICE_Action.java index e3a9564..33a18ca 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_MATRIAL_PRICE_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_MATRIAL_PRICE_Action.java @@ -101,7 +101,7 @@ public class ZOEM_MATRIAL_PRICE_Action extends BaseBean implements Action, EsbSe BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); String tablename = requestinfo.getRequestManager().getBillTableName(); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where id=" + requestid; logger_8aa7358c.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PRICE_DIFFERENCE_RATE_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PRICE_DIFFERENCE_RATE_Action.java index bd1ec56..b02aeee 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PRICE_DIFFERENCE_RATE_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PRICE_DIFFERENCE_RATE_Action.java @@ -158,7 +158,7 @@ public class ZOEM_PRICE_DIFFERENCE_RATE_Action extends BaseBean implements Actio BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); String tablename = requestinfo.getRequestManager().getBillTableName(); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where id=" + requestid; log.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PROCESSING_CHARGE_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PROCESSING_CHARGE_Action.java index f17249f..0d3a0e5 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PROCESSING_CHARGE_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOEM_PROCESSING_CHARGE_Action.java @@ -100,7 +100,7 @@ public class ZOEM_PROCESSING_CHARGE_Action extends BaseBean implements Action, E BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); String tablename = requestinfo.getRequestManager().getBillTableName(); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where id=" + requestid; logger_9b3f3cb8.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java index ba1559e..732dc08 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java @@ -147,7 +147,7 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl BillFieldUtil util = new BillFieldUtil(); // String tablename = util.getTablename(wfid); String tablename = requestinfo.getRequestManager().getBillTableName(); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + state + "',message='" + sb.toString() + "' where id=" + requestid; logger_78218549.info("sql -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_Action.java index 535ee57..936128a 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY107_Action.java @@ -101,7 +101,7 @@ public class ZSRM_PUR_INFO_GY107_Action extends BaseBean implements Action, EsbS ZSRM_PUR_INFO info = new ZSRM_PUR_INFO(); String[] ret = info.Getexecute(str); logger_da6b5da2.info(String.valueOf("ZSRM_PUR_INFO_GY107_Action-return-" + requestid + "-[" + ret[0] + "," + ret[1] + "]")); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestid; logger_da6b5da2.info("sql -----"+ sql); String poolname_mm = CONN_TYPE.workflow.getType(); @@ -114,7 +114,7 @@ public class ZSRM_PUR_INFO_GY107_Action extends BaseBean implements Action, EsbS logger_da6b5da2.info(String.valueOf("ZSRM_PUR_INFO_GY107_Action-error-" + requestid + "-[" + e.toString() + "]")); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("调用SAP接口校验数据出错：" + e.toString()); - String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.toString() + "' where id=" + requestid; logger_da6b5da2.info("sql2 -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_Action.java index b9ad022..710b3c9 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_Action.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_Action.java @@ -102,7 +102,7 @@ public class ZSRM_PUR_INFO_GY132_Action extends BaseBean implements Action, EsbS ZSRM_PUR_INFO info = new ZSRM_PUR_INFO(); String[] ret = info.Getexecute(str); logger_8fd2ca4a.info(String.valueOf("ZSRM_PUR_INFO_GY132_Action-return-" + requestid + "-[" + ret[0] + "," + ret[1] + "]")); - String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='" + ret[0] + "',message='" + ret[1] + "' where id=" + requestid; logger_8fd2ca4a.info("sql -----"+ sql); String poolname_r3 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -114,7 +114,7 @@ public class ZSRM_PUR_INFO_GY132_Action extends BaseBean implements Action, EsbS logger_8fd2ca4a.info(String.valueOf("ZSRM_PUR_INFO_GY132_Action-error-" + requestid + "-[" + e.toString() + "]")); requestinfo.getRequestManager().setMessageid("ERROR"); requestinfo.getRequestManager().setMessagecontent("调用SAP接口校验数据出错：" + e.toString()); - String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.toString() + "' where requestid=" + requestid; + String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.toString() + "' where id=" + requestid; logger_8fd2ca4a.info("sql2 -----"+ sql); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 From 5cf50350232356efd7cc7204156a5b5beb1da872 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Tue, 7 Jan 2025 16:25:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?util=20sql=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/swfa/BillFieldUtil.java | 363 +++++++++--------- 1 file changed, 182 insertions(+), 181 deletions(-) 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 3c9394d..96ce592 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 @@ -34,32 +34,31 @@ public class BillFieldUtil { * @return Map */ - // TODO custom 问题sql - public static Map getFieldId(int formid, String num) { - - logger_6c507bbc.info("BillFieldUtil getFieldId start formid "+ formid); - logger_6c507bbc.info("num "+ num); - formid = Math.abs(formid); - String sql = ""; - if ("0".equals(num)) { - sql = "select b.id,fieldname,detailtable from workflow_billfield b ,workflow_base a where b.billid=-" + formid + " and a.formid=b.billid and (detailtable='' or detailtable is null)"; - } else { - sql = "select b.id,fieldname,detailtable from workflow_billfield b ,workflow_base a where b.billid=-" + formid + " and a.formid=b.billid and detailtable='formtable_main_" + formid + "_dt" + num + "'"; - } - - logger_6c507bbc.info("sql "+ sql); - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String poolname = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname); - Map array = new HashMap(); - while (rs.next()) { - logger_6c507bbc.info("fieldname "+ rs.getString("fieldname")); - array.put(Util.null2String(rs.getString("fieldname")).toLowerCase(), Util.null2String(rs.getString("id"))); - } - logger_6c507bbc.info("array "+ array); - return array; - } +// public static Map getFieldId(int formid, String num) { +// +// logger_6c507bbc.info("BillFieldUtil getFieldId start formid "+ formid); +// logger_6c507bbc.info("num "+ num); +// formid = Math.abs(formid); +// String sql = ""; +// if ("0".equals(num)) { +// sql = "select b.id,fieldname,detailtable from workflow_billfield b ,workflow_base a where b.billid=-" + formid + " and a.formid=b.billid and (detailtable='' or detailtable is null)"; +// } else { +// sql = "select b.id,fieldname,detailtable from workflow_billfield b ,workflow_base a where b.billid=-" + formid + " and a.formid=b.billid and detailtable='formtable_main_" + formid + "_dt" + num + "'"; +// } +// +// logger_6c507bbc.info("sql "+ sql); +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String poolname = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname); +// Map array = new HashMap(); +// while (rs.next()) { +// logger_6c507bbc.info("fieldname "+ rs.getString("fieldname")); +// array.put(Util.null2String(rs.getString("fieldname")).toLowerCase(), Util.null2String(rs.getString("id"))); +// } +// logger_6c507bbc.info("array "+ array); +// return array; +// } /** * @Title: getlabelId @@ -73,34 +72,33 @@ public class BillFieldUtil { * @throws */ - //TODO 问题sql - public static String getlabelId(String name, int formid, String ismain, String num) { - - logger_6c507bbc.info("BillFieldUtil getlabelId start "); - logger_6c507bbc.info("name----------- " + name); - logger_6c507bbc.info("formid----------- " + formid); - logger_6c507bbc.info("ismain----------- " + ismain); - logger_6c507bbc.info("num----------- " + num); - String id = ""; - String sql = ""; - formid = formid * -1; - if ("0".equals(ismain)) { - sql = "select id,fieldname,detailtable from workflow_billfield where billid=-" + formid + " and (detailtable='' or detailtable is null) and lower(fieldname)='" + name + "'"; - } else { - sql = "select id,fieldname,detailtable from workflow_billfield where billid=-" + formid + " and detailtable='formtable_main_" + formid + "_dt" + num + "' and lower(fieldname)='" + name + "'"; - } - // System.out.println(sql); - logger_6c507bbc.info("sql----------- " + sql); - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String poolname_a1 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql(sql, poolname_a1); - if (rs.next()) { - id = Util.null2String(rs.getString("id")); - } - logger_6c507bbc.info("id----------- " + id); - return id; - } +// public static String getlabelId(String name, int formid, String ismain, String num) { +// +// logger_6c507bbc.info("BillFieldUtil getlabelId start "); +// logger_6c507bbc.info("name----------- " + name); +// logger_6c507bbc.info("formid----------- " + formid); +// logger_6c507bbc.info("ismain----------- " + ismain); +// logger_6c507bbc.info("num----------- " + num); +// String id = ""; +// String sql = ""; +// formid = formid * -1; +// if ("0".equals(ismain)) { +// sql = "select id,fieldname,detailtable from workflow_billfield where billid=-" + formid + " and (detailtable='' or detailtable is null) and lower(fieldname)='" + name + "'"; +// } else { +// sql = "select id,fieldname,detailtable from workflow_billfield where billid=-" + formid + " and detailtable='formtable_main_" + formid + "_dt" + num + "' and lower(fieldname)='" + name + "'"; +// } +// // System.out.println(sql); +// logger_6c507bbc.info("sql----------- " + sql); +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String poolname_a1 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql(sql, poolname_a1); +// if (rs.next()) { +// id = Util.null2String(rs.getString("id")); +// } +// logger_6c507bbc.info("id----------- " + id); +// return id; +// } /** * 选择框 显示名 @@ -119,7 +117,6 @@ public class BillFieldUtil { String poolname_n1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 //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); @@ -184,24 +181,24 @@ public class BillFieldUtil { * @param id * @return */ - public static String getselectOptionStr(String val, String id) { - String str = ""; - RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); - String poolname_fi = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - //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("name")); - String value = Util.null2String(recordSet.getString("value_key")); - if (value.equals(val)) { - str += ""; - } else { - str += ""; - } - } - return str; - } +// public static String getselectOptionStr(String val, String id) { +// String str = ""; +// RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); +// String poolname_fi = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// //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("name")); +// String value = Util.null2String(recordSet.getString("value_key")); +// if (value.equals(val)) { +// str += ""; +// } else { +// str += ""; +// } +// } +// return str; +// } /** * 判断节点是否为创建节点 @@ -209,22 +206,22 @@ public class BillFieldUtil { * @param nodeid * @return */ - public static boolean judgeNodeStart(String nodeid) { - boolean falg = false; - String isstart = "0"; - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String poolname_y9 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - //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"); - } - if ("1".equals(isstart)) { - falg = true; - } - return falg; - } +// public static boolean judgeNodeStart(String nodeid) { +// boolean falg = false; +// String isstart = "0"; +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String poolname_y9 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// //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"); +// } +// if ("1".equals(isstart)) { +// falg = true; +// } +// return falg; +// } /** * 获取节点名称 @@ -232,19 +229,18 @@ public class BillFieldUtil { * @return */ - // TODO custom 问题sql - public String getNodename(String nodeid) { - String nodename = ""; - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String poolname_v8 = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - //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"); - } - return nodename; - } +// public String getNodename(String nodeid) { +// String nodename = ""; +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String poolname_v8 = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// //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"); +// } +// return nodename; +// } /** * 获取计量单位内码 @@ -349,9 +345,15 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_tg = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select name from department as HrmSubCompany where id = " + spid, poolname_tg); + String sql ="SELECT id , name " + + "FROM eteams.dbo.department HrmSubCompany " + + "WHERE id = "+spid+"and HrmSubCompany.virtualid = 1 " + + " AND HrmSubCompany.type = 'subcompany' " + + " AND HrmSubCompany.delete_type = 0 " + + " AND HrmSubCompany.tenant_key = 't6kj9c07jr'"; + rs.executeSql(sql, poolname_tg); if (rs.next()) { - spname = Util.null2String(rs.getString("subcompanyname")); + spname = Util.null2String(rs.getString("name")); } logger_6c507bbc.info("spname----------- " + spname); return spname; @@ -363,23 +365,22 @@ public class BillFieldUtil { * @return */ - // TODO custom 问题sql - public String getTablename(String wfid) { - logger_6c507bbc.info("BillFieldUtil getSubcompanyname start "); - logger_6c507bbc.info("wfid----------- " + wfid); - String tbname = ""; - String fmid = ""; - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String poolname_tw = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select formid from wfp_base as workflow_base where id = " + wfid, poolname_tw); - if (rs.next()) { - fmid = Util.null2String(rs.getString("formid")); - tbname = "formtable_main_" + fmid.replace("-", ""); - } - logger_6c507bbc.info("tbname----------- " + tbname); - return tbname; - } +// public String getTablename(String wfid) { +// logger_6c507bbc.info("BillFieldUtil getSubcompanyname start "); +// logger_6c507bbc.info("wfid----------- " + wfid); +// String tbname = ""; +// String fmid = ""; +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String poolname_tw = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql("select formid from wfp_base as workflow_base where id = " + wfid, poolname_tw); +// if (rs.next()) { +// fmid = Util.null2String(rs.getString("formid")); +// tbname = "formtable_main_" + fmid.replace("-", ""); +// } +// logger_6c507bbc.info("tbname----------- " + tbname); +// return tbname; +// } /** * 把出差人员放在一起 @@ -442,72 +443,72 @@ public class BillFieldUtil { * @param map 所有人员 工号和ID的map * @return */ - public Map getIdsByWorkcode(String workcode, Map map) { - String ids = ""; - Map returnMap = new HashMap(); - if (workcode != null && !workcode.equals("")) { - // 传入的工号为空 - String[] array = workcode.split(","); - for (int i = 0; i < array.length; i++) { - if (array[i] != null) { - array[i] = array[i].trim(); - } - String userid = map.get(array[i]); - if (userid == null || userid.equals("")) { - returnMap.put("msg", "工号" + array[i] + "不存在..."); - return returnMap; - } else { - ids += "," + userid; - } - } - if (ids != null) { - ids = ids.replaceFirst(",", ""); - } - returnMap.put("msg", "ok"); - returnMap.put("data", ids); - } - return returnMap; - } +// public Map getIdsByWorkcode(String workcode, Map map) { +// String ids = ""; +// Map returnMap = new HashMap(); +// if (workcode != null && !workcode.equals("")) { +// // 传入的工号为空 +// String[] array = workcode.split(","); +// for (int i = 0; i < array.length; i++) { +// if (array[i] != null) { +// array[i] = array[i].trim(); +// } +// String userid = map.get(array[i]); +// if (userid == null || userid.equals("")) { +// returnMap.put("msg", "工号" + array[i] + "不存在..."); +// return returnMap; +// } else { +// ids += "," + userid; +// } +// } +// if (ids != null) { +// ids = ids.replaceFirst(",", ""); +// } +// returnMap.put("msg", "ok"); +// returnMap.put("data", ids); +// } +// return returnMap; +// } /** * 根据工号获取ID * @param workcode * @return */ - public Map getIdsByWorkcode(String workcode) { - String ids = ""; - Map returnMap = new HashMap(); - if (workcode != null && !workcode.equals("")) { - // 传入的工号为空 - String[] array = workcode.split(","); - for (int i = 0; i < array.length; i++) { - if (array[i] != null) { - array[i] = array[i].trim(); - } - RecordSet rs = I18nContextUtil.getBean(RecordSet.class); - String poolname_xj = CONN_TYPE.workflow.getType(); - // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - rs.executeSql("select id,job_num from employee as HrmResource where job_num = '" + array[i] + "'", poolname_xj); - // id - String userid = ""; - while (rs.next()) { - userid = Util.null2String(rs.getString("id")); - } - if (userid == null || userid.equals("")) { - returnMap.put("msg", "工号" + array[i] + "不存在..."); - return returnMap; - } else { - ids += "," + userid; - } - } - if (ids != null) { - ids = ids.replaceFirst(",", ""); - } - returnMap.put("msg", "ok"); - returnMap.put("data", ids); - } - return returnMap; - } +// public Map getIdsByWorkcode(String workcode) { +// String ids = ""; +// Map returnMap = new HashMap(); +// if (workcode != null && !workcode.equals("")) { +// // 传入的工号为空 +// String[] array = workcode.split(","); +// for (int i = 0; i < array.length; i++) { +// if (array[i] != null) { +// array[i] = array[i].trim(); +// } +// RecordSet rs = I18nContextUtil.getBean(RecordSet.class); +// String poolname_xj = CONN_TYPE.workflow.getType(); +// // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 +// rs.executeSql("select id,job_num from employee as HrmResource where job_num = '" + array[i] + "'", poolname_xj); +// // id +// String userid = ""; +// while (rs.next()) { +// userid = Util.null2String(rs.getString("id")); +// } +// if (userid == null || userid.equals("")) { +// returnMap.put("msg", "工号" + array[i] + "不存在..."); +// return returnMap; +// } else { +// ids += "," + userid; +// } +// } +// if (ids != null) { +// ids = ids.replaceFirst(",", ""); +// } +// returnMap.put("msg", "ok"); +// returnMap.put("data", ids); +// } +// return returnMap; +// } /** * 获取姓名 From c09e525abd819e5a367b603f1d7d1f526f07f0e2 Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Wed, 8 Jan 2025 10:09:47 +0800 Subject: [PATCH 4/5] =?UTF-8?q?util=20sql=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/swfa/BillFieldUtil.java | 48 ++++++++++++++----- 1 file changed, 37 insertions(+), 11 deletions(-) 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 96ce592..a28d6a6 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 @@ -279,10 +279,11 @@ public class BillFieldUtil { String poolname_vp = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select job_num from employee as HrmResource where id = " + hrid; + String sql = "select job_num from eteams.dbo.employee as HrmResource where id = " + hrid; + logger_6c507bbc.info("sql----------- " + sql); rs.executeSql(sql, poolname_vp); if (rs.next()) { - code = Util.null2String(rs.getString("workcode")); + code = Util.null2String(rs.getString("job_num")); } logger_6c507bbc.info("code----------- " + code); return code; @@ -293,8 +294,6 @@ public class BillFieldUtil { * @param hrid * @return */ - - // TODO custom 问题sql public String getCredentialsNumber(String hrid) { logger_6c507bbc.info("BillFieldUtil getCredentialsNumber start "); logger_6c507bbc.info("hrid----------- " + hrid); @@ -302,8 +301,25 @@ public class BillFieldUtil { RecordSet rs = I18nContextUtil.getBean(RecordSet.class); String poolname_2s = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - String sql = "select id_no from employee as HrmResource where id = " + hrid; - rs.executeSql(sql, poolname_2s); + String sql = "SELECT HrmResource.id_no AS certificatenum " + + "FROM ( " + + " SELECT employee.*, hr_userinfo.id_no " + + " FROM eteams.dbo.employee " + + " LEFT JOIN e10_other_business.dbo.hr_userinfo " + + " ON employee.id = hr_userinfo.[user] " + + " AND employee.delete_type = 0 " + + " AND employee.tenant_key = 't6kj9c07jr' " + + " AND hr_userinfo.delete_type = 0 " + + " AND hr_userinfo.tenant_key = 't6kj9c07jr' " + + ") HrmResource " + + " WHERE HrmResource.id = '" + hrid + + "' AND HrmResource.delete_type = 0 " + + " AND HrmResource.tenant_key = 't6kj9c07jr' " ; + + logger_6c507bbc.info("sql----------- " + sql); + boolean b1 = rs.executeSql(sql, poolname_2s); + logger_6c507bbc.info("getCredentialsNumber flag----------- " + b1); + if (rs.next()) { code = Util.null2String(rs.getString("certificatenum")); } @@ -324,10 +340,12 @@ public class BillFieldUtil { String poolname_p1 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 String sql = "select fullname from eteams.dbo.department as HrmDepartment where id = " + dpid; - rs.executeSql(sql, poolname_p1); + logger_6c507bbc.info("sql----------- " + sql); + boolean b1 = rs.executeSql(sql, poolname_p1); + logger_6c507bbc.info("getDepartmentname----------- " + b1); if (rs.next()) { - dpname = Util.null2String(rs.getString("departmentname")); + dpname = Util.null2String(rs.getString("fullname")); } logger_6c507bbc.info("dpname----------- " + dpname); return dpname; @@ -347,11 +365,14 @@ public class BillFieldUtil { // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 String sql ="SELECT id , name " + "FROM eteams.dbo.department HrmSubCompany " + - "WHERE id = "+spid+"and HrmSubCompany.virtualid = 1 " + + "WHERE id = '"+spid+"' and HrmSubCompany.virtualid = 1 " + " AND HrmSubCompany.type = 'subcompany' " + " AND HrmSubCompany.delete_type = 0 " + " AND HrmSubCompany.tenant_key = 't6kj9c07jr'"; - rs.executeSql(sql, poolname_tg); + + logger_6c507bbc.info("sql----------- " + sql); + boolean b1 = rs.executeSql(sql, poolname_tg); + logger_6c507bbc.info("getSubcompanyname----------- " + b1); if (rs.next()) { spname = Util.null2String(rs.getString("name")); } @@ -521,7 +542,12 @@ public class BillFieldUtil { String poolname_s2 = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 logger_6c507bbc.info("getName --" + hrid); - rs.executeSql("select username from eteams.dbo.employee as HrmResource where id = " + hrid, poolname_s2); + String sql = "select username from eteams.dbo.employee as HrmResource where id = " + hrid; + + logger_6c507bbc.info("sql----------- " + sql); + boolean b1 = rs.executeSql(sql, poolname_s2); + logger_6c507bbc.info("getName ----------- " + b1); + if (rs.next()) { code = Util.null2String(rs.getString("username")); } From 222267232a10d76ff7484737fdb1e68ac8c9f19c Mon Sep 17 00:00:00 2001 From: qijirenjian Date: Wed, 8 Jan 2025 17:19:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?util=20sql=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interfaces/htjt/util/TransUtil.java | 17 ++------- .../interfaces/swfa/BillFieldUtil.java | 25 +++--------- .../action/ChuChaiShenQingNewAction.java | 2 +- .../workflow/action/NeiBuDiaoDongAction.java | 14 +++---- .../action/SY_WLPS_NEW_RETURNAction.java | 19 +--------- .../workflow/action/YongGongXuQiuAction.java | 38 +++++++++---------- .../action/ZZ_GDFileUploadAction.java | 24 +----------- .../action/ZZ_Ten_GDFileUploadAction.java | 27 +------------ 8 files changed, 41 insertions(+), 125 deletions(-) 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 92dd700..c27bf70 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,19 +46,10 @@ public class TransUtil { if ("".equals(selectvalue)) { return selectname; } - 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" + - " AND b.table_name = '"+tableName+"'\n" + - " AND a.data_key = '"+filedname+"'\n" + - " AND c.value_key = '"+selectvalue+"'\n" + - " AND a.delete_type = 0\n" + - " AND a.tenant_key = 't6kj9c07jr'\n" + - " AND b.delete_type = 0\n" + - " AND b.tenant_key = 't6kj9c07jr'\n" + - " AND c.delete_type = 0\n" + - " AND c.tenant_key = 't6kj9c07jr'"; + String sql = " select e.table_name, e.form_id ,e.form_name ,c.title , c.data_key ,d.name ,d.value_key from e10_core_business.dbo.form_table e " + + " left join e10_core_business.dbo.form_field c on e.form_id = c.form_id " + + " left join e10_core_business.dbo.field_option d on c.id = d.field_id " + + " where e.table_name = '"+tableName+"' and c.data_key = '"+filedname+"' and value_key = '"+selectvalue+"'"; logger_24a1e280.info("TransUtil sql "+sql); String poolname_oj = CONN_TYPE.workflow.getType(); /* writeLog("sql:"+sql); 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 a28d6a6..55b6bdc 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 @@ -133,7 +133,6 @@ public class BillFieldUtil { * @return */ - // TODO custom 问题sql public static String getselectNameByCol(String fieldname, String workflowid, String selectvalue) { logger_6c507bbc.info("BillFieldUtil getselectNameByCol start "); logger_6c507bbc.info("fieldname----------- " + fieldname); @@ -144,25 +143,11 @@ 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 \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" + - "\tAND a.delete_type = 0\n" + - "\tAND a.tenant_key = 't6kj9c07jr'\n" + - "\tAND b.delete_type = 0\n" + - "\tAND b.tenant_key = 't6kj9c07jr'\n" + - "\tAND a.delete_type = 0\n" + - "\tAND a.tenant_key = 't6kj9c07jr'\n" + - "\tAND b.delete_type = 0\n" + - "\tAND b.tenant_key = 't6kj9c07jr'\n" + - "\tINNER JOIN field_option c\n" + - "\tON b.id = c.field_id\n" + - "\tAND c.delete_type = 0\n" + - "\tAND c.tenant_key = 't6kj9c07jr'\n" + - "WHERE b.data_key = '" + fieldname + "' \n" + - "\tAND a.id = '" + workflowid + "'\n" + - "\tAND c.value_key = '"+selectvalue+"';"; + String sql = " select a.id, b.relatekey ,c.title , c.data_key ,d.name ,d.value_key from e10_core_business.dbo.wfp_base a " + + " left join e10_core_business.dbo.wfp_relateform b on a.id = b.workflowid " + + " left join e10_core_business.dbo.form_field c on b.relatekey = c.form_id " + + " left join e10_core_business.dbo.field_option d on c.id = d.field_id " + + " where a.id = '"+workflowid+"' and c.data_key = '"+fieldname+"' and value_key = '"+selectvalue+"'"; logger_6c507bbc.info("sql----------- " + sql); recordSet.executeSql(sql, poolname_jl); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java index b984b4b..4a0686c 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChuChaiShenQingNewAction.java @@ -69,7 +69,7 @@ public class ChuChaiShenQingNewAction extends BaseBean implements Action, EsbSer try { logger_fee0cda9.info(String.valueOf("ChuChaiShenQingNewAction request:" + request.getRequestid())); String requestid = request.getRequestid(); - String lastoperator = request.getLastoperator(); +// String lastoperator = request.getLastoperator(); // TODO 有参构造 :new RecordSetDataSource("hr") 实例化方式改变,请检查是否有对应有参实现 RecordSet rdsd = I18nContextUtil.getBean(RecordSet.class); RecordSet rs = I18nContextUtil.getBean(RecordSet.class); diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NeiBuDiaoDongAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NeiBuDiaoDongAction.java index 5f33978..45bfec3 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NeiBuDiaoDongAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/NeiBuDiaoDongAction.java @@ -64,8 +64,8 @@ public class NeiBuDiaoDongAction implements Action, EsbServerlessRpcRemoteInterf String workflowid = request.getWorkflowid(); String maintable = ""; // String DealerID = ""; - String sql = "select b.tablename from wfp_base a,form b where a.formid = b.id and a.id = " + workflowid; - String poolname = CONN_TYPE.workflow.getType(); +// String sql = "select b.tablename from wfp_base a,form b where a.formid = b.id and a.id = " + workflowid; +// String poolname = CONN_TYPE.workflow.getType(); // RecordSetDataSource rsds = new RecordSetDataSource("eHR_test"); // rsds.executeSql("select ???GUID AS YGID from ht_psnaccount where ??????? ="+lastoperator); // rsds.next(); @@ -77,11 +77,11 @@ public class NeiBuDiaoDongAction implements Action, EsbServerlessRpcRemoteInterf // int departmentId = Util.getIntValue(rs2.getString("id")); /* String creater = rs2.getString("departmentmark") + "_" + rs2.getString("lastname"); TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - boolean b = rs.executeSql(sql, poolname); - logger_1103b3f3.info("b--" + b); - while (rs.next()) { - maintable = rs.getString("tablename"); - } +// boolean b = rs.executeSql(sql, poolname); +// logger_1103b3f3.info("b--" + b); +// while (rs.next()) { +// maintable = rs.getString("tablename"); +// } // ????????? String KDCRQ = ""; // ???? 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 fa8aec9..826dfd7 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 @@ -70,7 +70,7 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer String ycms = map.get("YCMS"); // 缺陷分类 String qxfl = map.get("QXFL"); - String qxfl_name = getselectNameByCol("qxfl", workFlowId, qxfl); + String qxfl_name = util.getselectNameByCol("qxfl", workFlowId, qxfl); // 缺陷代码 String qxdm = map.get("QXDM"); String uuid = UUID.randomUUID().toString(); @@ -125,22 +125,7 @@ public class SY_WLPS_NEW_RETURNAction extends BaseBean implements Action, EsbSer } } - /** - * 通过数据库字段名获取选择框 显示名 - * - * @return - */ - public static String getselectNameByCol(String fieldname, String workflowid, String selectvalue) { - String name = ""; - RecordSet recordSet = I18nContextUtil.getBean(RecordSet.class); - String poolname_p2 = 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 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("name"); - } - return name; - } + Map getResultMapForAction(Map map, String key, Object value, RequestManager requestManager) { if (key != null && !key.isEmpty()) { diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java index f39b5f0..71f2726 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/YongGongXuQiuAction.java @@ -64,30 +64,30 @@ public class YongGongXuQiuAction implements Action, EsbServerlessRpcRemoteInterf try { log.info("do action on request:" + request.getRequestid()); String requestid = request.getRequestid(); - String lastoperator = request.getLastoperator(); - String creater = request.getCreatorid(); +// 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 e10_common.dbo.wfp_base a,e10_common.dbo.form b where a.formid = b.id and a.id = " + workflowid; - logger_42aadd27.info("getMainTableInfo sql = " + sql); - String createsqlString = "select id from eteams.dbo.employee as hrmresource where lastname ='" + creater + "'"; - String poolname = CONN_TYPE.workflow.getType(); +// RecordSet rs2 = I18nContextUtil.getBean(RecordSet.class); +// String workflowid = request.getWorkflowid(); +// String maintable = ""; +// String sql = "select b.tablename from e10_common.dbo.wfp_base a,e10_common.dbo.form b where a.formid = b.id and a.id = " + workflowid; +// logger_42aadd27.info("getMainTableInfo sql = " + sql); +// String createsqlString = "select id from eteams.dbo.employee as hrmresource where lastname ='" + creater + "'"; +// String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 - boolean b = rs2.executeSql(createsqlString, poolname); - logger_42aadd27.info("getMainTableInfo rs2.executeSql = " + b); - rs2.next(); - String createrId = rs2.getString("id"); - String poolname_hy = CONN_TYPE.workflow.getType(); +// boolean b = rs2.executeSql(createsqlString, poolname); +// logger_42aadd27.info("getMainTableInfo rs2.executeSql = " + b); +// rs2.next(); +// String createrId = rs2.getString("id"); +// String poolname_hy = CONN_TYPE.workflow.getType(); // int departmentId = Util.getIntValue(rs2.getString("id")); /* String creater = rs2.getString("departmentmark") + "_" + rs2.getString("lastname"); TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ - boolean b1 = rs.executeSql(sql, poolname_hy); - logger_42aadd27.info("getMainTableInfo rs.executeSql = " + b1); - while (rs.next()) { - maintable = rs.getString("tablename"); - } +// boolean b1 = rs.executeSql(sql, poolname_hy); +// logger_42aadd27.info("getMainTableInfo rs.executeSql = " + b1); +// while (rs.next()) { +// maintable = rs.getString("tablename"); +// } // 需求部门 String XQBM = ""; // String GWXL = "";//岗位序列 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 55390ca..e52e756 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 @@ -111,7 +111,7 @@ public class ZZ_GDFileUploadAction extends BaseBean implements Action, EsbServer // 核算系统 String hsxt = mMap.get("HSXT"); // getHSXTName(hsxt); - String hsxtName = getselectNameByCol("hsxt", workFlowId, hsxt); + String hsxtName = unit.getselectNameByCol("hsxt", workFlowId, hsxt); // 申请人 String sqr = mMap.get("SQR"); String sqrcode = ""; @@ -285,28 +285,6 @@ public class ZZ_GDFileUploadAction extends BaseBean implements Action, EsbServer } } - /** - * 通过数据库字段名获取选择框 显示名 - * - * @param - * @param - * @return - */ - public static String getselectNameByCol(String fieldname, String workflowid, String selectvalue) { - String name = ""; - 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.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("name"); - logger_b14cb5d0.info("getselectNameByCol name = " + name ); - } - return name; - } private InputStream getFile(String filerealpath, String iszip) throws Exception { ZipInputStream zin = null; 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 4697c36..2dc86f2 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 @@ -106,7 +106,7 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe // 核算系统 String hsxt = mMap.get("HSXT"); // getHSXTName(hsxt); - String hsxtName = getselectNameByCol("hsxt", workFlowId, hsxt); + String hsxtName = unit.getselectNameByCol("hsxt", workFlowId, hsxt); // 申请人 String sqr = mMap.get("SQR"); String sqrcode = ""; @@ -288,30 +288,7 @@ public class ZZ_Ten_GDFileUploadAction extends BaseBean implements Action, EsbSe return WeaResult.success(getResultMapForAction(weaverResultMap, "result", WeaResult.fail(500, "执行异常", getResultMapForAction(weaverResultMap, "result", e.getMessage(), requestInfo.getRequestManager())), requestInfo.getRequestManager())); } } - - /** - * 通过数据库字段名获取选择框 显示名 - * - * @param - * @param - * @return - */ - public static String getselectNameByCol(String fieldname, String workflowid, String selectvalue) { - String name = ""; - 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.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("name"); - } - logger_8ab26152.info("getselectNameByCol name = " + name); - return name; - } - + private InputStream getFile(String filerealpath, String iszip) throws Exception { ZipInputStream zin = null; InputStream imagefile = null;