diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/InsertUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/InsertUtil.java
index ad56dbe..3a3a4f4 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/InsertUtil.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/InsertUtil.java
@@ -1,541 +1,544 @@
-//package com.weaver.seconddev.interfaces.htjt.util;
-//
-//import java.util.Iterator;
-//import java.util.Map;
-//import com.weaver.common.i18n.tool.util.I18nContextUtil;
-//import com.weaver.verupgrade.conn.CONN_TYPE;
-//import java.lang.*;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import weaver.conn.ConnStatementNew.ConnStatement;
-//import com.weaver.verupgrade.conn.RecordSet;
-//import com.weaver.verupgrade.conn.RecordSetDataSource;
-//import com.weaver.verupgrade.general.BaseBean;
-//import com.weaver.verupgrade.general.Util;
-//
-///**
-// */
-//public class InsertUtil {
-//
-//	private static final org.slf4j.Logger logger_110ff965 = LoggerFactory.getLogger(InsertUtil.class);
-//
-//	BaseBean log = new BaseBean();
-//
-//	public boolean insertold(Map<String, String> mapStr, String table) {
-//		if (mapStr == null) {
-//			return false;
-//		}
-//		if (mapStr.isEmpty()) {
-//			return false;
-//		}
-//		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-//		String sql_0 = "insert into " + table + "(";
-//		StringBuffer sql_1 = new StringBuffer();
-//		String sql_2 = ") values(";
-//		StringBuffer sql_3 = new StringBuffer();
-//		String sql_4 = ")";
-//		Iterator<String> it = mapStr.keySet().iterator();
-//		while (it.hasNext()) {
-//			String tmp_1 = it.next();
-//			// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
-//			String tmp_1_str = mapStr.get(tmp_1);
-//			if (tmp_1_str == null) {
-//				tmp_1_str = "";
-//			}
-//			if (tmp_1_str.length() > 0) {
-//				sql_1.append(tmp_1);
-//				sql_1.append(",");
-//				if (tmp_1_str.contains("##")) {
-//					sql_3.append(tmp_1_str.replace("##", ""));
-//					sql_3.append(",");
-//				} else {
-//					sql_3.append("'");
-//					sql_3.append(tmp_1_str);
-//					sql_3.append("',");
-//				}
-//			}
-//		}
-//		String now_sql_1 = sql_1.toString();
-//		if (now_sql_1.lastIndexOf(",") > 0) {
-//			now_sql_1 = now_sql_1.substring(0, now_sql_1.length() - 1);
-//		}
-//		String now_sql_3 = sql_3.toString();
-//		if (now_sql_3.lastIndexOf(",") > 0) {
-//			now_sql_3 = now_sql_3.substring(0, now_sql_3.length() - 1);
-//		}
-//		String sql = sql_0 + now_sql_1 + sql_2 + now_sql_3 + sql_4;
-//		logger_110ff965.info(String.valueOf("## sql = " + sql));
-//		String poolname = CONN_TYPE.workflow.getType();
-//        /* return false;
-// *TODO  检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整  https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
-// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
-//      long generate = IdGenerator.generate();
-//		return rs.executeSql(sql, poolname);
-//	}
-//
-//	public boolean insert(Map<String, String> mapStr, String table) {
-//		if (mapStr == null) {
-//			return false;
-//		}
-//		if (mapStr.isEmpty()) {
-//			return false;
-//		}
-//		String id = "";
-//		String sql_0 = "insert into " + table + "(";
-//		StringBuffer sql_1 = new StringBuffer();
-//		String sql_2 = ") values(";
-//		StringBuffer sql_3 = new StringBuffer();
-//		String sql_4 = ")";
-//		Iterator<String> it = mapStr.keySet().iterator();
-//		while (it.hasNext()) {
-//			String tmp_1 = it.next();
-//			// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
-//			String tmp_1_str = mapStr.get(tmp_1);
-//			if (tmp_1_str == null) {
-//				tmp_1_str = "";
-//			}
-//			if (tmp_1.length() > 0) {
-//				sql_1.append(tmp_1);
-//				sql_1.append(",");
-//				sql_3.append("?");
-//				sql_3.append(",");
-//			}
-//		}
-//		String now_sql_1 = sql_1.toString();
-//		if (now_sql_1.lastIndexOf(",") > 0) {
-//			now_sql_1 = now_sql_1.substring(0, now_sql_1.length() - 1);
-//		}
-//		String now_sql_3 = sql_3.toString();
-//		if (now_sql_3.lastIndexOf(",") > 0) {
-//			now_sql_3 = now_sql_3.substring(0, now_sql_3.length() - 1);
-//		}
-//		String setvalues = "";
-//		String sql = sql_0 + now_sql_1 + sql_2 + now_sql_3 + sql_4;
-//		ConnStatement cs = I18nContextUtil.getBean(ConnStatement.class);
-//		try {
-//			String poolname_x1 = "";
-//			// TODO E10请传入数据源名称
-//			cs.setStatementSql(sql, poolname_x1);
-//			it = mapStr.keySet().iterator();
-//			int num = 1;
-//			while (it.hasNext()) {
-//				String tmp_1 = it.next();
-//				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
-//				String tmp_1_str = mapStr.get(tmp_1);
-//				if (tmp_1_str == null) {
-//					tmp_1_str = "";
-//				}
-//				if (tmp_1.length() < 0) {
-//					continue;
-//				}
-//				setvalues = setvalues + "," + tmp_1_str;
-//				if ("".equals(tmp_1_str)) {
-//					cs.setString(num, null);
-//				} else {
-//					cs.setString(num, tmp_1_str);
-//				}
-//				// log.writeLog("## setvalues = " + setvalues+" num:"+num+" tmp_1:"+tmp_1);
-//				num++;
-//			}
-//			cs.executeUpdate();
-//			cs.close();
-//		} catch (Exception e) {
-//			logger_110ff965.info(String.valueOf(e));
-//			logger_110ff965.info(String.valueOf("## sql = " + sql));
-//			logger_110ff965.info(String.valueOf("++++++++++++++++++++++++++++++" + mapStr));
-//			cs.close();
-//			return false;
-//		}
-//		// return false;
-//		return true;
-//	}
-//
-//	public String insertBackId(Map<String, String> mapStr, String table, String removefield) {
-//		if (mapStr == null) {
-//			return "";
-//		}
-//		if (mapStr.isEmpty()) {
-//			return "";
-//		}
-//		String id = "";
-//		String sql_0 = "insert into " + table + "(";
-//		StringBuffer sql_1 = new StringBuffer();
-//		String sql_2 = ") values(";
-//		StringBuffer sql_3 = new StringBuffer();
-//		String sql_4 = ")";
-//		Iterator<String> it = mapStr.keySet().iterator();
-//		while (it.hasNext()) {
-//			String tmp_1 = it.next();
-//			// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
-//			String tmp_1_str = mapStr.get(tmp_1);
-//			if (tmp_1_str == null) {
-//				tmp_1_str = "";
-//			}
-//			if (tmp_1.length() > 0) {
-//				sql_1.append(tmp_1);
-//				sql_1.append(",");
-//				sql_3.append("?");
-//				sql_3.append(",");
-//			}
-//		}
-//		String now_sql_1 = sql_1.toString();
-//		if (now_sql_1.lastIndexOf(",") > 0) {
-//			now_sql_1 = now_sql_1.substring(0, now_sql_1.length() - 1);
-//		}
-//		String now_sql_3 = sql_3.toString();
-//		if (now_sql_3.lastIndexOf(",") > 0) {
-//			now_sql_3 = now_sql_3.substring(0, now_sql_3.length() - 1);
-//		}
-//		String setvalues = "";
-//		String sql = sql_0 + now_sql_1 + sql_2 + now_sql_3 + sql_4;
-//		ConnStatement cs = I18nContextUtil.getBean(ConnStatement.class);
-//		try {
-//			String poolname_rb = "";
-//			// TODO E10请传入数据源名称
-//			cs.setStatementSql(sql, poolname_rb);
-//			it = mapStr.keySet().iterator();
-//			int num = 1;
-//			while (it.hasNext()) {
-//				String tmp_1 = it.next();
-//				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
-//				String tmp_1_str = mapStr.get(tmp_1);
-//				if (tmp_1_str == null) {
-//					tmp_1_str = "";
-//				}
-//				if (tmp_1.length() < 0) {
-//					continue;
-//				}
-//				setvalues = setvalues + "," + tmp_1_str;
-//				if ("".equals(tmp_1_str)) {
-//					cs.setString(num, null);
-//				} else {
-//					cs.setString(num, tmp_1_str);
-//				}
-//				// log.writeLog("## setvalues = " + setvalues+" num:"+num+" tmp_1:"+tmp_1);
-//				num++;
-//			}
-//			cs.executeUpdate();
-//			StringBuffer sqlquery = new StringBuffer();
-//			sqlquery.append("select id from " + table + " where ");
-//			it = mapStr.keySet().iterator();
-//			while (it.hasNext()) {
-//				String tmp_1 = it.next();
-//				if (("," + removefield + ",").indexOf("," + tmp_1 + ",") >= 0) {
-//					continue;
-//				}
-//				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
-//				if (tmp_1.length() > 0) {
-//					sqlquery.append(tmp_1);
-//					String tmp_1_str = mapStr.get(tmp_1);
-//					if ("".equals(tmp_1_str)) {
-//						sqlquery.append(" is null and ");
-//					} else {
-//						sqlquery.append("=? and ");
-//					}
-//				}
-//			}
-//			String querysql = sqlquery.toString();
-//			if (querysql.lastIndexOf("and ") > 0) {
-//				querysql = querysql.substring(0, querysql.length() - 4);
-//			}
-//			String poolname_po = "";
-//			// TODO E10请传入数据源名称
-//			cs.setStatementSql(querysql, poolname_po);
-//			it = mapStr.keySet().iterator();
-//			num = 1;
-//			while (it.hasNext()) {
-//				String tmp_1 = it.next();
-//				if (("," + removefield + ",").indexOf("," + tmp_1 + ",") >= 0) {
-//					continue;
-//				}
-//				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
-//				String tmp_1_str = mapStr.get(tmp_1);
-//				if (tmp_1_str == null) {
-//					tmp_1_str = "";
-//				}
-//				if (tmp_1.length() < 0) {
-//					continue;
-//				}
-//				if ("".equals(tmp_1_str)) {
-//					continue;
-//				}
-//				setvalues = setvalues + "," + tmp_1_str;
-//				if ("".equals(tmp_1_str)) {
-//					cs.setString(num, null);
-//				} else {
-//					cs.setString(num, tmp_1_str);
-//				}
-//				// log.writeLog("## setvalues = " + setvalues+" num:"+num+" tmp_1:"+tmp_1);
-//				num++;
-//			}
-//			// log.writeLog("InsertBackquery sqlquery="+querysql);
-//			cs.executeQuery();
-//			if (cs.next()) {
-//				id = cs.getString("id");
-//			}
-//			cs.close();
-//		} catch (Exception e) {
-//			logger_110ff965.info(String.valueOf(e));
-//			logger_110ff965.info(String.valueOf("## sql = " + sql));
-//			logger_110ff965.info(String.valueOf("++++++++++++++++++++++++++++++" + mapStr));
-//			cs.close();
-//			return "";
-//		}
-//		// return false;
-//		return id;
-//	}
-//
-//	public boolean update(Map<String, String> mapStr, String table, String uqField, String uqVal) {
-//		if (mapStr == null || mapStr.isEmpty()) {
-//			return false;
-//		}
-//		if (uqField == null || "".equals(uqField)) {
-//			return false;
-//		}
-//		if (uqVal == null || "".equals(uqVal)) {
-//			return false;
-//		}
-//		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-//		StringBuffer buff = new StringBuffer();
-//		buff.append("update ");
-//		buff.append(table);
-//		buff.append(" set ");
-//		Iterator<String> it = mapStr.keySet().iterator();
-//		String flag = "";
-//		while (it.hasNext()) {
-//			String tmp_1 = it.next();
-//			String tmp_1_str = mapStr.get(tmp_1);
-//			if (tmp_1_str == null) {
-//				tmp_1_str = "";
-//			}
-//			if (tmp_1_str.length() > 0) {
-//				buff.append(flag);
-//				buff.append(tmp_1);
-//				buff.append("=");
-//				if (tmp_1_str.contains("##")) {
-//					buff.append(tmp_1_str.replace("##", ""));
-//				} else {
-//					buff.append("'");
-//					buff.append(tmp_1_str);
-//					buff.append("'");
-//				}
-//				flag = ",";
-//			}
-//		}
-//		buff.append(" where ");
-//		buff.append(uqField);
-//		buff.append("='");
-//		buff.append(uqVal);
-//		buff.append("' and superid is null");
-//		String sql = buff.toString();
-//		String poolname_1l = CONN_TYPE.workflow.getType();
-//		// log.writeLog("## sql = " + sql);
-//		// System.out.println("## sql = " + sql);
-//        /* return false;
-// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
-//		return rs.executeSql(sql, poolname_1l);
-//	}
-//
-//	public boolean updateGen(Map<String, String> mapStr, String table, String uqField, String uqVal) {
-//		if (mapStr == null || mapStr.isEmpty()) {
-//			return false;
-//		}
-//		if (uqField == null || "".equals(uqField)) {
-//			return false;
-//		}
-//		if (uqVal == null || "".equals(uqVal)) {
-//			return false;
-//		}
-//		StringBuffer buff = new StringBuffer();
-//		buff.append("update ");
-//		buff.append(table);
-//		buff.append(" set ");
-//		Iterator<String> it = mapStr.keySet().iterator();
-//		String flag = "";
-//		while (it.hasNext()) {
-//			String tmp_1 = it.next();
-//			String tmp_1_str = mapStr.get(tmp_1);
-//			if (tmp_1_str == null) {
-//				tmp_1_str = "";
-//			}
-//			buff.append(flag);
-//			buff.append(tmp_1);
-//			buff.append("=");
-//			if ("".equals(tmp_1_str)) {
-//				buff.append("null");
-//			} else {
-//				buff.append("?");
-//			}
-//			flag = ",";
-//		}
-//		buff.append(" where ");
-//		buff.append(uqField);
-//		buff.append("='");
-//		buff.append(uqVal);
-//		buff.append("' ");
-//		String sql = buff.toString();
-//		// log.writeLog("## sql = " + sql);
-//		ConnStatement cs = I18nContextUtil.getBean(ConnStatement.class);
-//		try {
-//			String poolname_gx = "";
-//			// TODO E10请传入数据源名称
-//			cs.setStatementSql(sql, poolname_gx);
-//			it = mapStr.keySet().iterator();
-//			int num = 1;
-//			while (it.hasNext()) {
-//				String tmp_1 = it.next();
-//				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
-//				String tmp_1_str = mapStr.get(tmp_1);
-//				if (tmp_1_str == null) {
-//					tmp_1_str = "";
-//				}
-//				if ("".equals(tmp_1_str)) {
-//				} else {
-//					cs.setString(num, tmp_1_str);
-//					num++;
-//				}
-//			}
-//			cs.executeUpdate();
-//			cs.close();
-//		} catch (Exception e) {
-//			logger_110ff965.info(String.valueOf(e));
-//			logger_110ff965.info(String.valueOf("## sql = " + sql));
-//			logger_110ff965.info(String.valueOf("++++++++++++++++++++++++++++++" + mapStr));
-//			cs.close();
-//			return false;
-//		}
-//		// boolean re = rs.executeSql(sql);
-//		// if("formtable_main_73_dt1".equals(table)){
-//		//
-//		// sql
-//		// ="update formtable_main_73_dt1 set yhje = (select price*ActualNumbers from formtable_main_73_dt1 where val_1='"+uqVal+"') ,Money =(select price*ActualNumbers from formtable_main_73_dt1 where val_1='"+uqVal+"') where val_1='"+uqVal+"'";
-//		// rs.executeSql(sql);
-//		// }
-//		return true;
-//	}
-//
-//	public boolean updateGenold(Map<String, String> mapStr, String table, String uqField, String uqVal) {
-//		if (mapStr == null || mapStr.isEmpty()) {
-//			return false;
-//		}
-//		if (uqField == null || "".equals(uqField)) {
-//			return false;
-//		}
-//		if (uqVal == null || "".equals(uqVal)) {
-//			return false;
-//		}
-//		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-//		StringBuffer buff = new StringBuffer();
-//		buff.append("update ");
-//		buff.append(table);
-//		buff.append(" set ");
-//		Iterator<String> it = mapStr.keySet().iterator();
-//		String flag = "";
-//		while (it.hasNext()) {
-//			String tmp_1 = it.next();
-//			String tmp_1_str = mapStr.get(tmp_1);
-//			if (tmp_1_str == null) {
-//				tmp_1_str = "";
-//			}
-//			buff.append(flag);
-//			buff.append(tmp_1);
-//			buff.append("=");
-//			if (tmp_1_str.contains("##")) {
-//				buff.append(tmp_1_str.replace("##", ""));
-//			} else {
-//				if ("".equals(tmp_1_str)) {
-//					buff.append("null");
-//				} else {
-//					buff.append("'");
-//					buff.append(tmp_1_str);
-//					buff.append("'");
-//				}
-//			}
-//			flag = ",";
-//		}
-//		buff.append(" where ");
-//		buff.append(uqField);
-//		buff.append("='");
-//		buff.append(uqVal);
-//		buff.append("' ");
-//		String sql = buff.toString();
-//		logger_110ff965.info(String.valueOf("## sql = " + sql));
-//		String poolname_4e = CONN_TYPE.workflow.getType();
-//		// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-//		boolean re = rs.executeSql(sql, poolname_4e);
-//		// if("formtable_main_73_dt1".equals(table)){
-//		//
-//		// sql
-//		// ="update formtable_main_73_dt1 set yhje = (select price*ActualNumbers from formtable_main_73_dt1 where val_1='"+uqVal+"') ,Money =(select price*ActualNumbers from formtable_main_73_dt1 where val_1='"+uqVal+"') where val_1='"+uqVal+"'";
-//		// rs.executeSql(sql);
-//		// }
-//		return re;
-//	}
-//
-//	public boolean insert(Map<String, String> mapStr, String table, RecordSetDataSource rsx) {
-//		if (mapStr == null) {
-//			return false;
-//		}
-//		if (mapStr.isEmpty()) {
-//			return false;
-//		}
-//		String sql_0 = "insert into " + table + "(";
-//		StringBuffer sql_1 = new StringBuffer();
-//		String sql_2 = ") values(";
-//		StringBuffer sql_3 = new StringBuffer();
-//		String sql_4 = ")";
-//		Iterator<String> it = mapStr.keySet().iterator();
-//		while (it.hasNext()) {
-//			String tmp_1 = it.next();
-//			String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
-//			if (tmp_1_str.length() > 0) {
-//				sql_1.append(tmp_1);
-//				sql_1.append(",");
-//				if (tmp_1_str.contains("##")) {
-//					sql_3.append(tmp_1_str.replace("##", ""));
-//					sql_3.append(",");
-//				} else {
-//					sql_3.append("'");
-//					sql_3.append(tmp_1_str);
-//					sql_3.append("',");
-//				}
-//			}
-//		}
-//		String now_sql_1 = sql_1.toString();
-//		if (now_sql_1.lastIndexOf(",") > 0) {
-//			now_sql_1 = now_sql_1.substring(0, now_sql_1.length() - 1);
-//		}
-//		String now_sql_3 = sql_3.toString();
-//		if (now_sql_3.lastIndexOf(",") > 0) {
-//			now_sql_3 = now_sql_3.substring(0, now_sql_3.length() - 1);
-//		}
-//		String sql = sql_0 + now_sql_1 + sql_2 + now_sql_3 + sql_4;
-//		String poolname_1p = "";
-//		// log.writeLog("## sql = " + sql);
-//        /* TODO  检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整  https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
-// *TODO E10必须指定poolname数据源*/
-//      long generate = IdGenerator.generate();
-//		return rsx.executeSql(sql, poolname_1p);
-//	}
-//
-//	public String getModeId(String tableName) {
-//		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-//		String formid = "";
-//		String modeid = "";
-//		String sql = "select id from form as  workflow_bill where tablename='" + tableName + "'";
-//		String poolname_5n = CONN_TYPE.workflow.getType();
-//		// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-//		rs.executeSql(sql, poolname_5n);
-//		if (rs.next()) {
-//			formid = Util.null2String(rs.getString("id"));
-//		}
-//		sql = "select id from ebdf_obj as  modeinfo where  formid=" + formid;
-//		String poolname_zg = CONN_TYPE.workflow.getType();
-//		// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-//		rs.executeSql(sql, poolname_zg);
-//		if (rs.next()) {
-//			modeid = Util.null2String(rs.getString("id"));
-//		}
-//		return modeid;
-//	}
-//}
+package com.weaver.seconddev.interfaces.htjt.util;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import com.weaver.common.distribution.genid.IdGenerator;
+import com.weaver.common.i18n.tool.util.I18nContextUtil;
+import com.weaver.verupgrade.conn.CONN_TYPE;
+import java.lang.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+//import weaver.conn.ConnStatementNew.D;
+import com.weaver.verupgrade.conn.ConnStatement;
+import com.weaver.verupgrade.conn.RecordSet;
+import com.weaver.verupgrade.conn.RecordSetDataSource;
+import com.weaver.verupgrade.general.BaseBean;
+import com.weaver.verupgrade.general.Util;
+
+/**
+ */
+public class InsertUtil {
+
+	private static final org.slf4j.Logger logger_110ff965 = LoggerFactory.getLogger(InsertUtil.class);
+
+	BaseBean log = new BaseBean();
+
+	public boolean insertold(Map<String, String> mapStr, String table) {
+		if (mapStr == null) {
+			return false;
+		}
+		if (mapStr.isEmpty()) {
+			return false;
+		}
+		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
+		String sql_0 = "insert into " + table + "(";
+		StringBuffer sql_1 = new StringBuffer();
+		String sql_2 = ") values(";
+		StringBuffer sql_3 = new StringBuffer();
+		String sql_4 = ")";
+		Iterator<String> it = mapStr.keySet().iterator();
+		while (it.hasNext()) {
+			String tmp_1 = it.next();
+			// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
+			String tmp_1_str = mapStr.get(tmp_1);
+			if (tmp_1_str == null) {
+				tmp_1_str = "";
+			}
+			if (tmp_1_str.length() > 0) {
+				sql_1.append(tmp_1);
+				sql_1.append(",");
+				if (tmp_1_str.contains("##")) {
+					sql_3.append(tmp_1_str.replace("##", ""));
+					sql_3.append(",");
+				} else {
+					sql_3.append("'");
+					sql_3.append(tmp_1_str);
+					sql_3.append("',");
+				}
+			}
+		}
+		String now_sql_1 = sql_1.toString();
+		if (now_sql_1.lastIndexOf(",") > 0) {
+			now_sql_1 = now_sql_1.substring(0, now_sql_1.length() - 1);
+		}
+		String now_sql_3 = sql_3.toString();
+		if (now_sql_3.lastIndexOf(",") > 0) {
+			now_sql_3 = now_sql_3.substring(0, now_sql_3.length() - 1);
+		}
+		String sql = sql_0 + now_sql_1 + sql_2 + now_sql_3 + sql_4;
+		logger_110ff965.info(String.valueOf("## sql = " + sql));
+		String poolname = CONN_TYPE.workflow.getType();
+        /* return false;
+ *TODO  检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整  https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
+ TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
+      long generate = IdGenerator.generate();
+		return rs.executeSql(sql, poolname);
+	}
+
+	public boolean insert(Map<String, String> mapStr, String table) {
+		if (mapStr == null) {
+			return false;
+		}
+		if (mapStr.isEmpty()) {
+			return false;
+		}
+		String id = "";
+		String sql_0 = "insert into " + table + "(";
+		StringBuffer sql_1 = new StringBuffer();
+		String sql_2 = ") values(";
+		StringBuffer sql_3 = new StringBuffer();
+		String sql_4 = ")";
+		Iterator<String> it = mapStr.keySet().iterator();
+		while (it.hasNext()) {
+			String tmp_1 = it.next();
+			// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
+			String tmp_1_str = mapStr.get(tmp_1);
+			if (tmp_1_str == null) {
+				tmp_1_str = "";
+			}
+			if (tmp_1.length() > 0) {
+				sql_1.append(tmp_1);
+				sql_1.append(",");
+				sql_3.append("?");
+				sql_3.append(",");
+			}
+		}
+		String now_sql_1 = sql_1.toString();
+		if (now_sql_1.lastIndexOf(",") > 0) {
+			now_sql_1 = now_sql_1.substring(0, now_sql_1.length() - 1);
+		}
+		String now_sql_3 = sql_3.toString();
+		if (now_sql_3.lastIndexOf(",") > 0) {
+			now_sql_3 = now_sql_3.substring(0, now_sql_3.length() - 1);
+		}
+		String setvalues = "";
+		String sql = sql_0 + now_sql_1 + sql_2 + now_sql_3 + sql_4;
+		ConnStatement cs = I18nContextUtil.getBean(ConnStatement.class);
+		try {
+			String poolname_x1 = "";
+			// TODO E10请传入数据源名称
+			cs.setStatementSql(sql, poolname_x1);
+			it = mapStr.keySet().iterator();
+			int num = 1;
+			while (it.hasNext()) {
+				String tmp_1 = it.next();
+				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
+				String tmp_1_str = mapStr.get(tmp_1);
+				if (tmp_1_str == null) {
+					tmp_1_str = "";
+				}
+				if (tmp_1.length() < 0) {
+					continue;
+				}
+				setvalues = setvalues + "," + tmp_1_str;
+				if ("".equals(tmp_1_str)) {
+					cs.setString(num, null);
+				} else {
+					cs.setString(num, tmp_1_str);
+				}
+				// log.writeLog("## setvalues = " + setvalues+" num:"+num+" tmp_1:"+tmp_1);
+				num++;
+			}
+			cs.executeUpdate();
+			cs.close();
+		} catch (Exception e) {
+			logger_110ff965.info(String.valueOf(e));
+			logger_110ff965.info(String.valueOf("## sql = " + sql));
+			logger_110ff965.info(String.valueOf("++++++++++++++++++++++++++++++" + mapStr));
+			cs.close();
+			return false;
+		}
+		// return false;
+		return true;
+	}
+
+	public String insertBackId(Map<String, String> mapStr, String table, String removefield) {
+		if (mapStr == null) {
+			return "";
+		}
+		if (mapStr.isEmpty()) {
+			return "";
+		}
+		String id = "";
+		String sql_0 = "insert into " + table + "(";
+		StringBuffer sql_1 = new StringBuffer();
+		String sql_2 = ") values(";
+		StringBuffer sql_3 = new StringBuffer();
+		String sql_4 = ")";
+		Iterator<String> it = mapStr.keySet().iterator();
+		while (it.hasNext()) {
+			String tmp_1 = it.next();
+			// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
+			String tmp_1_str = mapStr.get(tmp_1);
+			if (tmp_1_str == null) {
+				tmp_1_str = "";
+			}
+			if (tmp_1.length() > 0) {
+				sql_1.append(tmp_1);
+				sql_1.append(",");
+				sql_3.append("?");
+				sql_3.append(",");
+			}
+		}
+		String now_sql_1 = sql_1.toString();
+		if (now_sql_1.lastIndexOf(",") > 0) {
+			now_sql_1 = now_sql_1.substring(0, now_sql_1.length() - 1);
+		}
+		String now_sql_3 = sql_3.toString();
+		if (now_sql_3.lastIndexOf(",") > 0) {
+			now_sql_3 = now_sql_3.substring(0, now_sql_3.length() - 1);
+		}
+		String setvalues = "";
+		String sql = sql_0 + now_sql_1 + sql_2 + now_sql_3 + sql_4;
+		ConnStatement cs = I18nContextUtil.getBean(ConnStatement.class);
+		try {
+			String poolname_rb = "";
+			// TODO E10请传入数据源名称
+			cs.setStatementSql(sql, poolname_rb);
+			it = mapStr.keySet().iterator();
+			int num = 1;
+			while (it.hasNext()) {
+				String tmp_1 = it.next();
+				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
+				String tmp_1_str = mapStr.get(tmp_1);
+				if (tmp_1_str == null) {
+					tmp_1_str = "";
+				}
+				if (tmp_1.length() < 0) {
+					continue;
+				}
+				setvalues = setvalues + "," + tmp_1_str;
+				if ("".equals(tmp_1_str)) {
+					cs.setString(num, null);
+				} else {
+					cs.setString(num, tmp_1_str);
+				}
+				// log.writeLog("## setvalues = " + setvalues+" num:"+num+" tmp_1:"+tmp_1);
+				num++;
+			}
+			cs.executeUpdate();
+			StringBuffer sqlquery = new StringBuffer();
+			sqlquery.append("select id from " + table + " where ");
+			it = mapStr.keySet().iterator();
+			while (it.hasNext()) {
+				String tmp_1 = it.next();
+				if (("," + removefield + ",").indexOf("," + tmp_1 + ",") >= 0) {
+					continue;
+				}
+				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
+				if (tmp_1.length() > 0) {
+					sqlquery.append(tmp_1);
+					String tmp_1_str = mapStr.get(tmp_1);
+					if ("".equals(tmp_1_str)) {
+						sqlquery.append(" is null and ");
+					} else {
+						sqlquery.append("=? and ");
+					}
+				}
+			}
+			String querysql = sqlquery.toString();
+			if (querysql.lastIndexOf("and ") > 0) {
+				querysql = querysql.substring(0, querysql.length() - 4);
+			}
+			String poolname_po = "";
+			// TODO E10请传入数据源名称
+			cs.setStatementSql(querysql, poolname_po);
+			it = mapStr.keySet().iterator();
+			num = 1;
+			while (it.hasNext()) {
+				String tmp_1 = it.next();
+				if (("," + removefield + ",").indexOf("," + tmp_1 + ",") >= 0) {
+					continue;
+				}
+				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
+				String tmp_1_str = mapStr.get(tmp_1);
+				if (tmp_1_str == null) {
+					tmp_1_str = "";
+				}
+				if (tmp_1.length() < 0) {
+					continue;
+				}
+				if ("".equals(tmp_1_str)) {
+					continue;
+				}
+				setvalues = setvalues + "," + tmp_1_str;
+				if ("".equals(tmp_1_str)) {
+					cs.setString(num, null);
+				} else {
+					cs.setString(num, tmp_1_str);
+				}
+				// log.writeLog("## setvalues = " + setvalues+" num:"+num+" tmp_1:"+tmp_1);
+				num++;
+			}
+			// log.writeLog("InsertBackquery sqlquery="+querysql);
+			cs.executeQuery();
+			if (cs.next()) {
+				id = cs.getString("id");
+			}
+			cs.close();
+		} catch (Exception e) {
+			logger_110ff965.info(String.valueOf(e));
+			logger_110ff965.info(String.valueOf("## sql = " + sql));
+			logger_110ff965.info(String.valueOf("++++++++++++++++++++++++++++++" + mapStr));
+			cs.close();
+			return "";
+		}
+		// return false;
+		return id;
+	}
+
+	public boolean update(Map<String, String> mapStr, String table, String uqField, String uqVal) {
+		if (mapStr == null || mapStr.isEmpty()) {
+			return false;
+		}
+		if (uqField == null || "".equals(uqField)) {
+			return false;
+		}
+		if (uqVal == null || "".equals(uqVal)) {
+			return false;
+		}
+		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
+		StringBuffer buff = new StringBuffer();
+		buff.append("update ");
+		buff.append(table);
+		buff.append(" set ");
+		Iterator<String> it = mapStr.keySet().iterator();
+		String flag = "";
+		while (it.hasNext()) {
+			String tmp_1 = it.next();
+			String tmp_1_str = mapStr.get(tmp_1);
+			if (tmp_1_str == null) {
+				tmp_1_str = "";
+			}
+			if (tmp_1_str.length() > 0) {
+				buff.append(flag);
+				buff.append(tmp_1);
+				buff.append("=");
+				if (tmp_1_str.contains("##")) {
+					buff.append(tmp_1_str.replace("##", ""));
+				} else {
+					buff.append("'");
+					buff.append(tmp_1_str);
+					buff.append("'");
+				}
+				flag = ",";
+			}
+		}
+		buff.append(" where ");
+		buff.append(uqField);
+		buff.append("='");
+		buff.append(uqVal);
+		buff.append("' and superid is null");
+		String sql = buff.toString();
+		String poolname_1l = CONN_TYPE.workflow.getType();
+		// log.writeLog("## sql = " + sql);
+		// System.out.println("## sql = " + sql);
+        /* return false;
+ TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/
+		return rs.executeSql(sql, poolname_1l);
+	}
+
+	public boolean updateGen(Map<String, String> mapStr, String table, String uqField, String uqVal) {
+		if (mapStr == null || mapStr.isEmpty()) {
+			return false;
+		}
+		if (uqField == null || "".equals(uqField)) {
+			return false;
+		}
+		if (uqVal == null || "".equals(uqVal)) {
+			return false;
+		}
+		StringBuffer buff = new StringBuffer();
+		buff.append("update ");
+		buff.append(table);
+		buff.append(" set ");
+		Iterator<String> it = mapStr.keySet().iterator();
+		String flag = "";
+		while (it.hasNext()) {
+			String tmp_1 = it.next();
+			String tmp_1_str = mapStr.get(tmp_1);
+			if (tmp_1_str == null) {
+				tmp_1_str = "";
+			}
+			buff.append(flag);
+			buff.append(tmp_1);
+			buff.append("=");
+			if ("".equals(tmp_1_str)) {
+				buff.append("null");
+			} else {
+				buff.append("?");
+			}
+			flag = ",";
+		}
+		buff.append(" where ");
+		buff.append(uqField);
+		buff.append("='");
+		buff.append(uqVal);
+		buff.append("' ");
+		String sql = buff.toString();
+		// log.writeLog("## sql = " + sql);
+		ConnStatement cs = I18nContextUtil.getBean(ConnStatement.class);
+		try {
+			String poolname_gx = "";
+			// TODO E10请传入数据源名称
+			cs.setStatementSql(sql, poolname_gx);
+			it = mapStr.keySet().iterator();
+			int num = 1;
+			while (it.hasNext()) {
+				String tmp_1 = it.next();
+				// String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
+				String tmp_1_str = mapStr.get(tmp_1);
+				if (tmp_1_str == null) {
+					tmp_1_str = "";
+				}
+				if ("".equals(tmp_1_str)) {
+				} else {
+					cs.setString(num, tmp_1_str);
+					num++;
+				}
+			}
+			cs.executeUpdate();
+			cs.close();
+		} catch (Exception e) {
+			logger_110ff965.info(String.valueOf(e));
+			logger_110ff965.info(String.valueOf("## sql = " + sql));
+			logger_110ff965.info(String.valueOf("++++++++++++++++++++++++++++++" + mapStr));
+			cs.close();
+			return false;
+		}
+		// boolean re = rs.executeSql(sql);
+		// if("formtable_main_73_dt1".equals(table)){
+		//
+		// sql
+		// ="update formtable_main_73_dt1 set yhje = (select price*ActualNumbers from formtable_main_73_dt1 where val_1='"+uqVal+"') ,Money =(select price*ActualNumbers from formtable_main_73_dt1 where val_1='"+uqVal+"') where val_1='"+uqVal+"'";
+		// rs.executeSql(sql);
+		// }
+		return true;
+	}
+
+	public boolean updateGenold(Map<String, String> mapStr, String table, String uqField, String uqVal) {
+		if (mapStr == null || mapStr.isEmpty()) {
+			return false;
+		}
+		if (uqField == null || "".equals(uqField)) {
+			return false;
+		}
+		if (uqVal == null || "".equals(uqVal)) {
+			return false;
+		}
+		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
+		StringBuffer buff = new StringBuffer();
+		buff.append("update ");
+		buff.append(table);
+		buff.append(" set ");
+		Iterator<String> it = mapStr.keySet().iterator();
+		String flag = "";
+		while (it.hasNext()) {
+			String tmp_1 = it.next();
+			String tmp_1_str = mapStr.get(tmp_1);
+			if (tmp_1_str == null) {
+				tmp_1_str = "";
+			}
+			buff.append(flag);
+			buff.append(tmp_1);
+			buff.append("=");
+			if (tmp_1_str.contains("##")) {
+				buff.append(tmp_1_str.replace("##", ""));
+			} else {
+				if ("".equals(tmp_1_str)) {
+					buff.append("null");
+				} else {
+					buff.append("'");
+					buff.append(tmp_1_str);
+					buff.append("'");
+				}
+			}
+			flag = ",";
+		}
+		buff.append(" where ");
+		buff.append(uqField);
+		buff.append("='");
+		buff.append(uqVal);
+		buff.append("' ");
+		String sql = buff.toString();
+		logger_110ff965.info(String.valueOf("## sql = " + sql));
+		String poolname_4e = CONN_TYPE.workflow.getType();
+		// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
+		boolean re = rs.executeSql(sql, poolname_4e);
+		// if("formtable_main_73_dt1".equals(table)){
+		//
+		// sql
+		// ="update formtable_main_73_dt1 set yhje = (select price*ActualNumbers from formtable_main_73_dt1 where val_1='"+uqVal+"') ,Money =(select price*ActualNumbers from formtable_main_73_dt1 where val_1='"+uqVal+"') where val_1='"+uqVal+"'";
+		// rs.executeSql(sql);
+		// }
+		return re;
+	}
+
+	public boolean insert(Map<String, String> mapStr, String table, RecordSetDataSource rsx) {
+		if (mapStr == null) {
+			return false;
+		}
+		if (mapStr.isEmpty()) {
+			return false;
+		}
+		String sql_0 = "insert into " + table + "(";
+		StringBuffer sql_1 = new StringBuffer();
+		String sql_2 = ") values(";
+		StringBuffer sql_3 = new StringBuffer();
+		String sql_4 = ")";
+		Iterator<String> it = mapStr.keySet().iterator();
+		while (it.hasNext()) {
+			String tmp_1 = it.next();
+			String tmp_1_str = Util.null2String(mapStr.get(tmp_1));
+			if (tmp_1_str.length() > 0) {
+				sql_1.append(tmp_1);
+				sql_1.append(",");
+				if (tmp_1_str.contains("##")) {
+					sql_3.append(tmp_1_str.replace("##", ""));
+					sql_3.append(",");
+				} else {
+					sql_3.append("'");
+					sql_3.append(tmp_1_str);
+					sql_3.append("',");
+				}
+			}
+		}
+		String now_sql_1 = sql_1.toString();
+		if (now_sql_1.lastIndexOf(",") > 0) {
+			now_sql_1 = now_sql_1.substring(0, now_sql_1.length() - 1);
+		}
+		String now_sql_3 = sql_3.toString();
+		if (now_sql_3.lastIndexOf(",") > 0) {
+			now_sql_3 = now_sql_3.substring(0, now_sql_3.length() - 1);
+		}
+		String sql = sql_0 + now_sql_1 + sql_2 + now_sql_3 + sql_4;
+		String poolname_1p = "";
+		// log.writeLog("## sql = " + sql);
+        /* TODO  检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整  https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84
+ *TODO E10必须指定poolname数据源*/
+      long generate = IdGenerator.generate();
+		return rsx.executeSql(sql, poolname_1p);
+	}
+
+	public String getModeId(String tableName) {
+		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
+		String formid = "";
+		String modeid = "";
+		String sql = "select id from form as  workflow_bill where tablename='" + tableName + "'";
+		String poolname_5n = CONN_TYPE.workflow.getType();
+		// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
+		rs.executeSql(sql, poolname_5n);
+		if (rs.next()) {
+			formid = Util.null2String(rs.getString("id"));
+		}
+		sql = "select id from ebdf_obj as  modeinfo where  formid=" + formid;
+		String poolname_zg = CONN_TYPE.workflow.getType();
+		// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
+		rs.executeSql(sql, poolname_zg);
+		if (rs.next()) {
+			modeid = Util.null2String(rs.getString("id"));
+		}
+		return modeid;
+	}
+}
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/LogUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/LogUtil.java
index 4b1e3ea..3cf4ed6 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/LogUtil.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/LogUtil.java
@@ -49,12 +49,12 @@ public class LogUtil {
     /**
      */
     public void insertLog() {
-        //TODO config
-//        InsertUtil iu = new InsertUtil();
+        //TODO custom 已解决 ConnStatement
+        InsertUtil iu = new InsertUtil();
         String tablename = "uf_interface_log";
-        //TODO config
-//        String modeid = iu.getModeId(tablename);
-        String modeid ="";
+        //TODO custom 已解决 ConnStatement
+        String modeid = iu.getModeId(tablename);
+//        String modeid ="";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat sdf1 = new SimpleDateFormat("HH:mm:ss");
         SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
@@ -87,8 +87,8 @@ public class LogUtil {
         map.put("fhxx", this.fhxx);
         //
         map.put("tscs", this.tscs);
-        //TODO confing
-//        iu.insert(map, tablename);
+        //TODO custom 已解决 ConnStatement
+        iu.insert(map, tablename);
         String billid = "";
         RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
         String sql = "select max(id) as billid from " + tablename + " where modeuuid='" + uuid + "'";
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java
index ea80359..5d35084 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/swfa/sl/CallDTtripService.java
@@ -3,8 +3,8 @@ package com.weaver.seconddev.interfaces.swfa.sl;
 import cn.hutool.crypto.SecureUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-//TODO config
-//import com.cloudstore.dev.api.util.Util_DataCache;
+
+import com.weaver.common.cache.base.BaseCache;
 import com.weaver.seconddev.interfaces.prop.ConfigProp;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -91,7 +91,6 @@ public class CallDTtripService extends BaseBean {
     }
 
     public String getToken(JSONObject jsonObject) {
-        //TODO config
 //        String token = (String) Util_DataCache.getObjVal("DTtrip_token");
         String token = "";
         if (token == null) {
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 e66b365..0a2c2dc 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
@@ -119,9 +119,9 @@ public class ARSPaymentRecepitAction extends BaseBean implements Action, EsbServ
                 obj.put("OAFLOW", map.get("LCBH"));
                 obj.put("OAREQUESTID", requestid);
                 // x
-                //TODO custom edit
-//                obj.put("BUSINESSUNITSYS", hrm.getWorkcode(map.get("CLR")));
-                obj.put("BUSINESSUNITSYS", "");
+                //TODO custom 已处理 edit
+                obj.put("BUSINESSUNITSYS", hrm.getWorkcode(map.get("CLR")));
+//                obj.put("BUSINESSUNITSYS", "");
                 // x
 
                 obj.put("BUSINESSUNIT", map.get("GZGSBM"));
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 03d72b8..2c01241 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
@@ -129,7 +129,7 @@ public class AddVenMatExtsToSrmAction extends BaseBean implements Action, EsbSer
                     // handleType = "1";
                     // }
                 }
-                //TODO custom 获取Lastoperator
+                //TODO custom 已处理 获取Lastoperator
 //                checkUser = hr.getResourcename(request.getLastoperator());
                 checkUser = hr.getResourcename(String.valueOf(userIdTemp));
 
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java
index 6e52798..898094e 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/AddVenMatExtsToSrmCheckAction.java
@@ -116,7 +116,7 @@ public class AddVenMatExtsToSrmCheckAction extends BaseBean implements Action, E
                     // handleType = "1";
                     // }
                 }
-                //TODO custom edit
+                //TODO custom 已处理 获取Lastoperator
 //                checkUser = hr.getResourcename(request.getLastoperator());
                 checkUser = hr.getResourcename(String.valueOf(userIdTemp));
 
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeOrgRoleAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeOrgRoleAction.java
index d2735bd..cc19f1a 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeOrgRoleAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeOrgRoleAction.java
@@ -69,7 +69,7 @@ public class ChangeOrgRoleAction extends BaseBean implements Action, EsbServerle
 //                    String poolname_v1 = CONN_TYPE.workflow.getType();
 //                    // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
 //                    rs.executeSql("UPDATE orgchartstate SET orgchartstate.needupdate = 1 WHERE orgchartstate.delete_type = 0  AND orgchartstate.tenant_key = 't6kj9c07jr'", poolname_v1);
-//                    //TODO custom 矩阵
+                    //TODO custom 不启用 矩阵
 ////                    MatrixUtil.updateSubcompayData(org);
 //                } else if ("1".equals(map.get("ZZJGGG"))) {
 //                    org = map.get("XTZBM");
@@ -84,9 +84,9 @@ public class ChangeOrgRoleAction extends BaseBean implements Action, EsbServerle
 //                    ResourceComInfo ResourceComInfo = I18nContextUtil.getBean(ResourceComInfo.class);
 //                    ResourceComInfo.removeResourceCache();
 //                    String poolname_ou = CONN_TYPE.workflow.getType();
-//                    // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
+                   // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
 //                    rs.executeSql("UPDATE orgchartstate SET orgchartstate.needupdate = 1 WHERE orgchartstate.delete_type = 0  AND orgchartstate.tenant_key = 't6kj9c07jr'", poolname_ou);
-//                    //TODO custom 矩阵
+                    //TODO custom 不启用 矩阵
 ////                    MatrixUtil.updateDepartmentData(org);
 //                }
 //                logger_c08ea2e1.info(String.valueOf(requestid + "修改组织架构权限结束"));
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java
index fb2418c..41cfe5d 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheAction.java
@@ -330,7 +330,7 @@ public class DoTheAction {
         wri.setWorkflowBaseInfo(wbi);
         WorkflowServiceImpl WorkflowServicePortTypeProxy = I18nContextUtil.getBean(WorkflowServiceImpl.class);
         // TODO 方法参数:1 类型发生变化 e9类型:int e10类型:Long
-//        TODO custom config 管理员id
+        //TODO custom 已处理 管理员id
         String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1046285013082546176L);
         logger_7213d31d.info("流程触发：" + requestid);
     }
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java
index 68d4e58..b1771b0 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/DoTheActionNew.java
@@ -137,7 +137,7 @@ public class DoTheActionNew {
                     rs3.executeSql(sql2, poolname);
                     while (rs3.next()) {
                         // id
-                        //TODO custom 类型转换
+                        //TODO custom 已处理 类型转换
                         Long id =  Long.parseLong(rs3.getString("id"));
                         /* TODO 方法参数:tbr 类型发生变化 e9类型:int e10类型:long
  TODO 方法参数:97 类型发生变化 e9类型:int e10类型:long
@@ -385,7 +385,7 @@ public class DoTheActionNew {
         wri.setWorkflowBaseInfo(wbi);
         WorkflowServiceImpl WorkflowServicePortTypeProxy = I18nContextUtil.getBean(WorkflowServiceImpl.class);
         // TODO 方法参数:1 类型发生变化 e9类型:int e10类型:Long
-        //TODO custom config 管理员id
+        //TODO custom 已处理 管理员id
 //        String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1);
         String requestid = WorkflowServicePortTypeProxy.doCreateWorkflowRequest(wri, 1046285013082546176L);
         logger_5105ad43.info("流程触发：" + requestid);
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 a46682f..fbcf779 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
@@ -449,7 +449,7 @@ public class OaMesNewMaterialCertificationAction extends BaseBean implements Act
                 try {
                     // TODO custom long转换问题
 //                    param_data.setID(Integer.parseInt(Id));
-//                    // TODO custom long转换问题
+                    // TODO custom long转换问题
 //                    param_data.setREQUESTID(Integer.parseInt(requestId));
                     param_data.setBH(lcbh);
                     param_data.setCPMC(cpmc);
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java
index 7a9ceb0..f3a9fa3 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java
@@ -87,7 +87,7 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe
                 String gh = map.get("GH");
                 // 申请部门
                 String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM"));
-                // TODO custom 审核人
+                // TODO custom 已处理 审核人
                 String shr = resourcecominfo.getResourcename(String.valueOf(userIdTemp));
                 // 供应商类型
                 String gyslx = map.get("GYSLX");
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PushMeetingAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PushMeetingAction.java
index d64a67f..7a7e9c3 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PushMeetingAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/PushMeetingAction.java
@@ -70,7 +70,7 @@ public class PushMeetingAction extends BaseBean implements Action, EsbServerless
         RequestInfo request = requestInfoTemp.getRequestInfo(requestIdTemp, userIdTemp);
         try {
 
-            //TODO custom 消息
+            //TODO custom 会议
 //            Meeting m = new Meeting(request.getRequestid());
 //            pool.execute(m);
             /*String requestid = request.getRequestid();
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java
index 7eb76d1..61f13b8 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_MM_ZMMT002_FASTCONFIG_Action.java
@@ -113,7 +113,10 @@ public class ZOA_MM_ZMMT002_FASTCONFIG_Action extends BaseBean implements Action
             RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
             String poolname = CONN_TYPE.workflow.getType();
             // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-            rs.executeSql("update e10_core_business.dbo." + tablename + " set state='" + retstr[0] + "',message='" + retstr[1] + "' where id=" + requestid, poolname);
+            String sql = "update e10_core_business.dbo." + tablename + " set state='" + retstr[0] + "',message='" + retstr[1] + "' where id=" + requestid;
+            logger_e6726d63.info("sql = " + sql );
+            boolean b1 = rs.executeSql(sql, poolname);
+            logger_e6726d63.info("sql flag= " + b1 );
             if ("E".equals(retstr[0])) {
                 requestinfo.getRequestManager().setMessageid("error");
                 requestinfo.getRequestManager().setMessagecontent(retstr[1]);
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java
index b61554e..2a419d4 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java
@@ -174,8 +174,10 @@ public class ZOA_SD_CREDIT_HANDLE_APPROVALAction extends BaseBean implements Act
                                 SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser();
                                 Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id
                                 String sql3 = "update e10_common.dbo.HT_CRM_JDCS set REQUESTID = '" + requestId + "',KHBM='" + khbm + "',XSZZ='" + xszz + "',SQRGH='" + sqrgh + "',SQRQ='" + sqrq + "',CREATEDATE=GETDATE() where id  =  " + recodId + " and delete_type = 0 ";
-                                boolean b1 = rs.executeSql(sql3, poolname);
+
                                 logger_d591fda6.info("sql3 = " + sql3);
+                                boolean b1 = rs.executeSql(sql3, poolname);
+
                                 logger_d591fda6.info("添加 = " + b1);
                                 logger_d591fda6.info(String.valueOf("------------写入中间表 success ----------"));
                             } else {
diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_QUERYAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_QUERYAction.java
index ba3dfa0..c5dd6cf 100644
--- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_QUERYAction.java
+++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_QUERYAction.java
@@ -107,7 +107,8 @@ public class ZOA_SD_CREDIT_HANDLE_QUERYAction extends BaseBean implements Action
                 logger_270bcd1.info(String.valueOf("logsql:" + logsql));
                 String poolname = CONN_TYPE.workflow.getType();
                 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
-                rs.executeSql(logsql, poolname);
+                boolean b1 = rs.executeSql(logsql, poolname);
+                logger_270bcd1.info(String.valueOf("logsql flag:" + b1));
                 logger_270bcd1.info(String.valueOf("ZOA_SD_CREDIT_HANDLE_QUERYAction-Request: " + requestId + "完成"));
                 if (!sta.equals("S")) {
                     request.getRequestManager().setMessageid("100001");