From 062fc0466d1f652f525fe3acae79b13dd34c4907 Mon Sep 17 00:00:00 2001
From: IT-xiaoXiong <774495953@qq.com>
Date: Mon, 13 Dec 2021 12:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=9A=E8=AF=AD=E8=A8=80=E5=8C=96=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=EF=BC=8ClabelhtmlUtils=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aiyh/utils/LabelHtmlUtils.java                |  170 +
 aiyh/utils/Util.java                          | 3072 +++++++++--------
 aiyh/utils/entity/LabelHtmlIndex.java         |   39 +
 .../service/CopyAttachmentService.java        |  129 +-
 .../service/impl/FaDDContractService.java     | 1664 ++++-----
 customization/test/NewUtilTest.java           |  678 ++--
 .../AddCustomer_Action.java                   |    8 +-
 7 files changed, 3052 insertions(+), 2708 deletions(-)
 create mode 100644 aiyh/utils/LabelHtmlUtils.java
 create mode 100644 aiyh/utils/entity/LabelHtmlIndex.java

diff --git a/aiyh/utils/LabelHtmlUtils.java b/aiyh/utils/LabelHtmlUtils.java
new file mode 100644
index 0000000..4aea6b9
--- /dev/null
+++ b/aiyh/utils/LabelHtmlUtils.java
@@ -0,0 +1,170 @@
+package aiyh.utils;
+
+import aiyh.utils.entity.LabelHtmlIndex;
+import aiyh.utils.service.UtilService;
+import weaver.systeminfo.SystemEnv;
+
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/13 0013 10:29
+ * 多语言工具类
+ */
+
+
+public class LabelHtmlUtils {
+
+    private final UtilService utilService = new UtilService();
+    private Map<String, Object> htmlLabel = null;
+
+    public LabelHtmlUtils(String prefix) {
+        if (!this.init(prefix)) {
+            throw new RuntimeException("配置文件异常，请检查配置文件结构是否符合要求！");
+        }
+    }
+
+    public LabelHtmlUtils() {
+    }
+
+    /**
+     * 初始化配置信息
+     *
+     * @param prefix 前缀
+     * @return 是否初始化成功
+     */
+    public synchronized boolean init(String prefix) {
+        if (this.htmlLabel != null) {
+            return true;
+        }
+        try {
+            this.htmlLabel = Util.readProperties2Map("htmlLabelIndex", prefix);
+            return this.htmlLabel != null;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    /**
+     * 获取指定语言id的自定义标签
+     *
+     * @param id         自定义标签id
+     * @param languageId 语言id
+     * @param defaultStr 默认字符串
+     * @return 自定义标签对应的语言字符串，或者默认字符串
+     */
+    public String getHtmlLabelName(int id, int languageId, String defaultStr) {
+        String htmlLabelName = SystemEnv.getHtmlLabelName(id, languageId);
+        return htmlLabelName == null ? defaultStr : htmlLabelName;
+    }
+
+    /**
+     * 获取指定语言id的自定义标签
+     *
+     * @param id         标签id
+     * @param languageId 语言id
+     * @return 自定义标签的语言字符串
+     */
+    public String getHtmlLabelName(int id, int languageId) {
+        return SystemEnv.getHtmlLabelName(id, languageId);
+    }
+
+
+    /**
+     * 通过语言id截取多语言字符串
+     *
+     * @param languageId  语言id
+     * @param languageStr 多语言字符串
+     * @return 截取后的字符串
+     */
+    public String getHtmlLabelNameByStr(int languageId, String languageStr) {
+        String pattern = "(`~`" + languageId + " )(?<label>(\\w*|\\W*|[\\u4e00-\\u9fa5]*))(`~`)";
+        Pattern compile = Pattern.compile(pattern);
+        Matcher matcher = compile.matcher(languageStr);
+        if (matcher.find()) {
+            return matcher.group("label");
+        }
+        return languageStr;
+    }
+
+    /**
+     * 获取配置多余元文件详细
+     *
+     * @param key 键
+     */
+    public Map<String, Object> getHtmlLabelMap(String key) {
+        if (this.htmlLabel == null) {
+            throw new RuntimeException("请初始化以读取配置信息，调用方法init(String prefix)");
+        }
+        Map<String, Object> map;
+        try {
+            map = (Map<String, Object>) this.htmlLabel.get(key);
+        } catch (Exception e) {
+            throw new RuntimeException("配置文件异常，请检查配置文件结构是否符合要求！");
+        }
+        return map;
+    }
+
+    /**
+     * 读取配置文件中的多语言配置
+     *
+     * @param key 多语言配置中的前缀
+     * @return 多语言配置Map
+     */
+    public Map<String, String> getHtmlLabel(String key) {
+        if (this.htmlLabel == null) {
+            throw new RuntimeException("请初始化以读取配置信息，调用方法init(String prefix)");
+        }
+        Map<String, String> map;
+        try {
+            map = (Map<String, String>) this.htmlLabel.get(key);
+        } catch (Exception e) {
+            throw new RuntimeException("配置文件异常，请检查配置文件结构是否符合要求！");
+        }
+        return map;
+    }
+
+    /**
+     * 读取配置文件中的多语言配置
+     *
+     * @param key 多语言配置中的前缀
+     * @return 多语言配置对象
+     */
+    public LabelHtmlIndex getLabelHtmlIndex(String key) {
+        if (this.htmlLabel == null) {
+            throw new RuntimeException("请初始化以读取配置信息，调用方法init(String prefix)");
+        }
+        Map<String, Object> map;
+        LabelHtmlIndex labelHtmlIndex;
+        try {
+            map = (Map<String, Object>) this.htmlLabel.get(key);
+            labelHtmlIndex = Util.mapToObject(map, LabelHtmlIndex.class);
+        } catch (Exception e) {
+            throw new RuntimeException("配置文件异常，请检查配置文件结构是否符合要求！");
+        }
+        return labelHtmlIndex;
+    }
+
+
+    /**
+     * 读取配置文件中的多语言配置
+     *
+     * @param map 多语言配置中的对象
+     * @return 多语言配置对象
+     */
+    public LabelHtmlIndex getLabelHtmlIndex(Map<String, Object> map, String key) {
+        LabelHtmlIndex labelHtmlIndex;
+        Map<String, Object> resultMap;
+        try {
+            resultMap = (Map<String, Object>) map.get(key);
+            labelHtmlIndex = Util.mapToObject(resultMap, LabelHtmlIndex.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("map转换异常！");
+        }
+        return labelHtmlIndex;
+    }
+}
diff --git a/aiyh/utils/Util.java b/aiyh/utils/Util.java
index 595c8c3..ce33593 100644
--- a/aiyh/utils/Util.java
+++ b/aiyh/utils/Util.java
@@ -55,1584 +55,1696 @@ import java.util.zip.ZipEntry;
 
 public class Util extends weaver.general.Util {
 
-	static ToolUtil toolUtil = new ToolUtil();
-	private static final UtilService utilService = new UtilService();
-	private static final RecordSet rs = new RecordSet();
+    static ToolUtil toolUtil = new ToolUtil();
+    private static final UtilService utilService = new UtilService();
+    private static final RecordSet rs = new RecordSet();
 
 
-	/**
-	 * 获取指定格式的当前时间
-	 *
-	 * @param format 格式化字符串
-	 * @return 指定格式日期的字符串
-	 */
-	public static String getTime(String format) {
-		Date date = new Date();
-		SimpleDateFormat formatter = new SimpleDateFormat(format);
-		return formatter.format(date);
-	}
+    /**
+     * 获取指定格式的当前时间
+     *
+     * @param format 格式化字符串
+     * @return 指定格式日期的字符串
+     */
+    public static String getTime(String format) {
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat(format);
+        return formatter.format(date);
+    }
 
-	/**
-	 * 创建一个SQL where条件，不推荐使用
-	 *
-	 * @return Where对象
-	 */
-	@Deprecated
-	public static Where createWhereImpl() {
-		return new WhereImpl();
-	}
+    /**
+     * 创建一个SQL where条件，不推荐使用
+     *
+     * @return Where对象
+     */
+    @Deprecated
+    public static Where createWhereImpl() {
+        return new WhereImpl();
+    }
 
-	/**
-	 * 创建一个SQL where条件
-	 *
-	 * @return Where对象
-	 */
-	public static Where createPrepWhereImpl() {
-		return new PrepWhereImpl();
-	}
+    /**
+     * 创建一个SQL where条件
+     *
+     * @return Where对象
+     */
+    public static Where createPrepWhereImpl() {
+        return new PrepWhereImpl();
+    }
 
-	/**
-	 * 创建一个Map工具，可以自定义一些功能，比如链式添加键值对，自定义过滤条件等
-	 *
-	 * @return UtilHashMap对象
-	 */
-	public static UtilHashMap<String, Object> createUtilHashMap() {
-		return new UtilHashMap<>();
-	}
+    /**
+     * 创建一个Map工具，可以自定义一些功能，比如链式添加键值对，自定义过滤条件等
+     *
+     * @return UtilHashMap对象
+     */
+    public static UtilHashMap<String, Object> createUtilHashMap() {
+        return new UtilHashMap<>();
+    }
 
-	/**
-	 * 创建一个SQL构建工具类，通过构建工具可以实现SQL的构建
-	 *
-	 * @return BuilderSqlImpl对象
-	 */
-	public static BuilderSqlImpl createSqlBuilder() {
-		return new BuilderSqlImpl();
-	}
+    /**
+     * 创建一个SQL构建工具类，通过构建工具可以实现SQL的构建
+     *
+     * @return BuilderSqlImpl对象
+     */
+    public static BuilderSqlImpl createSqlBuilder() {
+        return new BuilderSqlImpl();
+    }
 
-	/**
-	 * 创建一个Map工具，可以自定义一些功能，比如链式添加键值对，自定义过滤条件等
-	 *
-	 * @return UtilLinkedHashMap对象
-	 */
-	public static UtilLinkedHashMap<String, Object> createUtilLinkedHashMap() {
-		return new UtilLinkedHashMap<>();
-	}
+    /**
+     * 创建一个Map工具，可以自定义一些功能，比如链式添加键值对，自定义过滤条件等
+     *
+     * @return UtilLinkedHashMap对象
+     */
+    public static UtilLinkedHashMap<String, Object> createUtilLinkedHashMap() {
+        return new UtilLinkedHashMap<>();
+    }
 
-	/**
-	 * 判断map是否为空或者是否没有数据
-	 *
-	 * @param map 判断的map对象
-	 * @return 是否为空或者和大小为0
-	 */
-	public static boolean mapIsNullOrEmpty(Map map) {
-		return Objects.isNull(map) || map.size() == 0;
-	}
+    /**
+     * 判断map是否为空或者是否没有数据
+     *
+     * @param map 判断的map对象
+     * @return 是否为空或者和大小为0
+     */
+    public static boolean mapIsNullOrEmpty(Map map) {
+        return Objects.isNull(map) || map.size() == 0;
+    }
 
-	/**
-	 * 去除前后的英文逗号
-	 *
-	 * @param sqlBuilder 构建的SQL StringBuilder对象
-	 * @return 处理后的SQL字符串
-	 */
-	public static String removeSeparator(StringBuilder sqlBuilder) {
-		String str = sqlBuilder.toString().trim();
-		String removeSeparator = ",";
-		if (str.endsWith(removeSeparator)) {
+    /**
+     * 去除前后的英文逗号
+     *
+     * @param sqlBuilder 构建的SQL StringBuilder对象
+     * @return 处理后的SQL字符串
+     */
+    public static String removeSeparator(StringBuilder sqlBuilder) {
+        String str = sqlBuilder.toString().trim();
+        String removeSeparator = ",";
+        if (str.endsWith(removeSeparator)) {
 //			如果以分割号结尾，则去除分割号
-			str = str.substring(0, str.length() - 1);
-		}
-		if (str.trim().startsWith(removeSeparator)) {
-			str = str.substring(1);
-		}
-		return str;
-	}
+            str = str.substring(0, str.length() - 1);
+        }
+        if (str.trim().startsWith(removeSeparator)) {
+            str = str.substring(1);
+        }
+        return str;
+    }
 
-	public static String removeSeparator(StringBuilder sqlBuilder, String removeSeparator) {
-		String str = sqlBuilder.toString().trim();
-		if (str.endsWith(removeSeparator)) {
+    public static String removeSeparator(StringBuilder sqlBuilder, String removeSeparator) {
+        String str = sqlBuilder.toString().trim();
+        if (str.endsWith(removeSeparator)) {
 //			如果以分割号结尾，则去除分割号
-			str = str.substring(0, str.length() - 1);
-		}
-		if (str.trim().startsWith(removeSeparator)) {
-			str = str.substring(1);
-		}
-		return str;
-	}
+            str = str.substring(0, str.length() - 1);
+        }
+        if (str.trim().startsWith(removeSeparator)) {
+            str = str.substring(1);
+        }
+        return str;
+    }
 
-	/**
-	 * 通过RecordSet对象，获取查询后的值，返回map
-	 *
-	 * @param rs         执行查询语句后的RecordSet对象
-	 * @param conversion 是否大小写转驼峰命名
-	 * @return 封装后的Map的值
-	 */
-	private static Map<String, Object> getMapMapping(RecordSet rs, boolean conversion) {
-		Map<String, Object> map = new HashMap<>();
-		String[] columnType = rs.getColumnTypeName();
-		int colCounts = 0;
-		colCounts = rs.getColCounts() == 0 ? columnType.length : rs.getColCounts();
-		toolUtil.writeErrorLog(Arrays.toString(columnType));
-		toolUtil.writeErrorLog("字段数：" + colCounts);
-		for (int i = 1; i <= colCounts; i++) {
-			String key = null;
-			String type = "varchar";
-			if (columnType != null) {
-				if (columnType.length != colCounts) {
-					type = "varchar";
-				} else {
-					type = columnType[i - 1];
-				}
-			}
-			if (conversion) {
-				key = toCamelCase(rs.getColumnName(i));
-			} else {
-				key = rs.getColumnName(i);
-			}
-			rs.getColumnName(i);
-			if ("int".equalsIgnoreCase(type) || "Integer".equalsIgnoreCase(type)
-					|| "Long".equalsIgnoreCase(type) || "BIGINT".equalsIgnoreCase(type)
-					|| "NUMBER".equalsIgnoreCase(type) || "INTEGER".equalsIgnoreCase(type)
-					|| "TINYINT".equalsIgnoreCase(type) || "SMALLINT".equalsIgnoreCase(type)) {
-				map.put(key, rs.getInt(i) == -1 ? rs.getString(i) : rs.getInt(i));
-				continue;
-			}
-			if ("FLOAT".equalsIgnoreCase(type)) {
-				map.put(key, rs.getFloat(i));
-				continue;
-			}
-			if ("DATE".equalsIgnoreCase(type) || "TIMESTAMP".equalsIgnoreCase(type)
-					|| "DATETIME".equalsIgnoreCase(type)) {
-				map.put(key, rs.getDouble(i));
-				continue;
-			}
-			if ("DOUBLE".equalsIgnoreCase(type)) {
-				map.put(key, rs.getDouble(i));
-				continue;
-			}
-			if ("DECIMAL".equalsIgnoreCase(type) || "NUMERIC".equalsIgnoreCase(type)) {
-				map.put(key, rs.getDouble(i));
-				continue;
-			}
-			map.put(key, rs.getString(i));
-		}
-		return map;
-	}
+    /**
+     * 通过RecordSet对象，获取查询后的值，返回map
+     *
+     * @param rs         执行查询语句后的RecordSet对象
+     * @param conversion 是否大小写转驼峰命名
+     * @return 封装后的Map的值
+     */
+    private static Map<String, Object> getMapMapping(RecordSet rs, boolean conversion) {
+        Map<String, Object> map = new HashMap<>();
+        String[] columnType = rs.getColumnTypeName();
+        int colCounts = 0;
+        colCounts = rs.getColCounts() == 0 ? columnType.length : rs.getColCounts();
+        toolUtil.writeErrorLog(Arrays.toString(columnType));
+        toolUtil.writeErrorLog("字段数：" + colCounts);
+        for (int i = 1; i <= colCounts; i++) {
+            String key = null;
+            String type = "varchar";
+            if (columnType != null) {
+                if (columnType.length != colCounts) {
+                    type = "varchar";
+                } else {
+                    type = columnType[i - 1];
+                }
+            }
+            if (conversion) {
+                key = toCamelCase(rs.getColumnName(i));
+            } else {
+                key = rs.getColumnName(i);
+            }
+            rs.getColumnName(i);
+            if ("int".equalsIgnoreCase(type) || "Integer".equalsIgnoreCase(type)
+                    || "Long".equalsIgnoreCase(type) || "BIGINT".equalsIgnoreCase(type)
+                    || "NUMBER".equalsIgnoreCase(type) || "INTEGER".equalsIgnoreCase(type)
+                    || "TINYINT".equalsIgnoreCase(type) || "SMALLINT".equalsIgnoreCase(type)) {
+                map.put(key, rs.getInt(i) == -1 ? rs.getString(i) : rs.getInt(i));
+                continue;
+            }
+            if ("FLOAT".equalsIgnoreCase(type)) {
+                map.put(key, rs.getFloat(i));
+                continue;
+            }
+            if ("DATE".equalsIgnoreCase(type) || "TIMESTAMP".equalsIgnoreCase(type)
+                    || "DATETIME".equalsIgnoreCase(type)) {
+                map.put(key, rs.getDouble(i));
+                continue;
+            }
+            if ("DOUBLE".equalsIgnoreCase(type)) {
+                map.put(key, rs.getDouble(i));
+                continue;
+            }
+            if ("DECIMAL".equalsIgnoreCase(type) || "NUMERIC".equalsIgnoreCase(type)) {
+                map.put(key, rs.getDouble(i));
+                continue;
+            }
+            map.put(key, rs.getString(i));
+        }
+        return map;
+    }
 
-	/**
-	 * 通过RecordSet对象获取map结果
-	 *
-	 * @param rs RecordSet对象
-	 * @return 查询结果map
-	 */
-	public static Map<String, Object> recordSet2Map(RecordSet rs) {
-		if (rs.next()) {
-			return getMapMapping(rs, false);
-		}
-		return null;
-	}
+    /**
+     * 通过RecordSet对象获取map结果
+     *
+     * @param rs RecordSet对象
+     * @return 查询结果map
+     */
+    public static Map<String, Object> recordSet2Map(RecordSet rs) {
+        if (rs.next()) {
+            return getMapMapping(rs, false);
+        }
+        return null;
+    }
 
-	/***
-	 * 通过RecordSet对象获取查询后的map结果
-	 * @param rs RecordSet对象
-	 * @param conversion 是否下划线转驼峰命名
-	 * @return 查询结果map对象
-	 */
-	public static Map<String, Object> recordSet2Map(RecordSet rs, boolean conversion) {
-		if (rs.next()) {
-			return getMapMapping(rs, conversion);
-		}
-		return null;
-	}
+    /***
+     * 通过RecordSet对象获取查询后的map结果
+     * @param rs RecordSet对象
+     * @param conversion 是否下划线转驼峰命名
+     * @return 查询结果map对象
+     */
+    public static Map<String, Object> recordSet2Map(RecordSet rs, boolean conversion) {
+        if (rs.next()) {
+            return getMapMapping(rs, conversion);
+        }
+        return null;
+    }
 
-	/**
-	 * 通过RecordSet对象获取map结果
-	 *
-	 * @param rs RecordSet对象
-	 * @return 查询结果map集合
-	 */
-	public static List<Map<String, Object>> recordSet2MapList(RecordSet rs) {
-		List<Map<String, Object>> list = new ArrayList<>();
-		while (rs.next()) {
-			list.add(getMapMapping(rs, false));
-		}
-		return list;
-	}
+    /**
+     * 通过RecordSet对象获取map结果
+     *
+     * @param rs RecordSet对象
+     * @return 查询结果map集合
+     */
+    public static List<Map<String, Object>> recordSet2MapList(RecordSet rs) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        while (rs.next()) {
+            list.add(getMapMapping(rs, false));
+        }
+        return list;
+    }
 
-	/***
-	 * 通过RecordSet对象获取查询后的map结果
-	 * @param rs RecordSet对象
-	 * @param conversion 是否下划线转驼峰命名
-	 * @return 查询结果map集合
-	 */
-	public static List<Map<String, Object>> recordSet2MapList(RecordSet rs, boolean conversion) {
-		List<Map<String, Object>> list = new ArrayList<>();
-		while (rs.next()) {
-			list.add(getMapMapping(rs, conversion));
-		}
-		return list;
-	}
+    /***
+     * 通过RecordSet对象获取查询后的map结果
+     * @param rs RecordSet对象
+     * @param conversion 是否下划线转驼峰命名
+     * @return 查询结果map集合
+     */
+    public static List<Map<String, Object>> recordSet2MapList(RecordSet rs, boolean conversion) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        while (rs.next()) {
+            list.add(getMapMapping(rs, conversion));
+        }
+        return list;
+    }
 
 
-	/**
-	 * 获取查询SQL的映射实体
-	 *
-	 * @param rs          查询结果 RecordSet类
-	 * @param t           反射获取的对象
-	 * @param emptyFields 对象的字段
-	 * @param <T>         返回一个赋值后的对象
-	 * @return 处理后的对象
-	 * @throws IllegalAccessException IllegalAccessException异常
-	 */
-	private static <T> T getMappingEntity(RecordSet rs, T t, List<Field> emptyFields) throws IllegalAccessException {
-		for (Field field : emptyFields) {
-			String fieldName = field.getName();
-			field.setAccessible(true);
-			if (field.getType().equals(String.class)) {
-				field.set(t, rs.getString(fieldName));
-				continue;
-			}
-			if (field.getType().equals(Integer.class) || field.getType().equals(int.class)
-					|| field.getType().equals(short.class) || field.getType().equals(long.class)
-					|| field.getType().equals(Long.class)) {
-				field.set(t, rs.getInt(fieldName));
-				continue;
-			}
-			if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) {
-				field.set(t, rs.getBoolean(fieldName));
-				continue;
-			}
-			if (field.getType().equals(Float.class) || field.getType().equals(float.class)) {
-				field.set(t, rs.getFloat(fieldName));
-				continue;
-			}
-			if (field.getType().equals(Double.class) || field.getType().equals(double.class)) {
-				field.set(t, rs.getDouble(fieldName));
-				continue;
-			}
-			if (field.getType().equals(Date.class)) {
-				if (field.isAnnotationPresent(DateFormatAn.class)) {
-					DateFormatAn annotation = field.getAnnotation(DateFormatAn.class);
-					String value = annotation.value();
-					try {
-						field.set(t, new SimpleDateFormat(value).parse(rs.getString(fieldName)));
-					} catch (ParseException e) {
-						e.printStackTrace();
-						field.set(t, null);
-					}
-				} else {
-					try {
-						field.set(t, rs.getDate(fieldName));
-					} catch (Exception e) {
-						field.set(t, null);
-					}
-				}
-				continue;
-			}
-			if (field.getType().equals(BigDecimal.class)) {
-				field.set(t, rs.getDouble(fieldName));
-			}
-		}
-		return t;
-	}
+    /**
+     * 获取查询SQL的映射实体
+     *
+     * @param rs          查询结果 RecordSet类
+     * @param t           反射获取的对象
+     * @param emptyFields 对象的字段
+     * @param <T>         返回一个赋值后的对象
+     * @return 处理后的对象
+     * @throws IllegalAccessException IllegalAccessException异常
+     */
+    private static <T> T getMappingEntity(RecordSet rs, T t, List<Field> emptyFields) throws IllegalAccessException {
+        for (Field field : emptyFields) {
+            String fieldName = field.getName();
+            field.setAccessible(true);
+            if (field.getType().equals(String.class)) {
+                field.set(t, rs.getString(fieldName));
+                continue;
+            }
+            if (field.getType().equals(Integer.class) || field.getType().equals(int.class)
+                    || field.getType().equals(short.class) || field.getType().equals(long.class)
+                    || field.getType().equals(Long.class)) {
+                field.set(t, rs.getInt(fieldName));
+                continue;
+            }
+            if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) {
+                field.set(t, rs.getBoolean(fieldName));
+                continue;
+            }
+            if (field.getType().equals(Float.class) || field.getType().equals(float.class)) {
+                field.set(t, rs.getFloat(fieldName));
+                continue;
+            }
+            if (field.getType().equals(Double.class) || field.getType().equals(double.class)) {
+                field.set(t, rs.getDouble(fieldName));
+                continue;
+            }
+            if (field.getType().equals(Date.class)) {
+                if (field.isAnnotationPresent(DateFormatAn.class)) {
+                    DateFormatAn annotation = field.getAnnotation(DateFormatAn.class);
+                    String value = annotation.value();
+                    try {
+                        field.set(t, new SimpleDateFormat(value).parse(rs.getString(fieldName)));
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                        field.set(t, null);
+                    }
+                } else {
+                    try {
+                        field.set(t, rs.getDate(fieldName));
+                    } catch (Exception e) {
+                        field.set(t, null);
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(BigDecimal.class)) {
+                field.set(t, rs.getDouble(fieldName));
+            }
+        }
+        return t;
+    }
 
 
-	/**
-	 * 获取查询SQL的映射实体
-	 *
-	 * @param rs          查询结果 RecordSet类
-	 * @param t           反射获取的对象
-	 * @param emptyFields 对象的字段
-	 * @param conversion  是否下划线转驼峰
-	 * @param <T>         返回一个赋值后的对象
-	 * @return 处理后的对象
-	 * @throws IllegalAccessException IllegalAccessException 异常
-	 */
-	private static <T> T getMappingEntity(RecordSet rs, T t, List<Field> emptyFields, boolean conversion) throws IllegalAccessException {
-		if (!conversion) {
-			return getMappingEntity(rs, t, emptyFields);
-		}
-		for (Field field : emptyFields) {
-			String fieldName = toUnderlineCase(field.getName());
-			field.setAccessible(true);
-			if (field.getType().equals(String.class)) {
-				field.set(t, rs.getString(fieldName));
-				continue;
-			}
-			if (field.getType().equals(Integer.class) || field.getType().equals(int.class)
-					|| field.getType().equals(short.class) || field.getType().equals(long.class)
-					|| field.getType().equals(Long.class)) {
-				field.set(t, rs.getInt(fieldName));
-				continue;
-			}
-			if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) {
-				field.set(t, rs.getBoolean(fieldName));
-				continue;
-			}
-			if (field.getType().equals(Float.class) || field.getType().equals(float.class)) {
-				field.set(t, rs.getFloat(fieldName));
-				continue;
-			}
-			if (field.getType().equals(Double.class) || field.getType().equals(double.class)) {
-				field.set(t, rs.getDouble(fieldName));
-				continue;
-			}
-			if (field.getType().equals(Date.class)) {
-				if (field.isAnnotationPresent(DateFormatAn.class)) {
-					DateFormatAn annotation = field.getAnnotation(DateFormatAn.class);
-					String value = annotation.value();
-					try {
-						field.set(t, new SimpleDateFormat(value).parse(rs.getString(fieldName)));
-					} catch (ParseException e) {
-						e.printStackTrace();
-						field.set(t, null);
-					}
-				} else {
-					try {
-						field.set(t, rs.getDate(fieldName));
-					} catch (Exception e) {
-						field.set(t, null);
-					}
-				}
-				continue;
-			}
-			if (field.getType().equals(BigDecimal.class)) {
-				field.set(t, rs.getDouble(fieldName));
-			}
-		}
-		return t;
-	}
+    /**
+     * 获取查询SQL的映射实体
+     *
+     * @param rs          查询结果 RecordSet类
+     * @param t           反射获取的对象
+     * @param emptyFields 对象的字段
+     * @param conversion  是否下划线转驼峰
+     * @param <T>         返回一个赋值后的对象
+     * @return 处理后的对象
+     * @throws IllegalAccessException IllegalAccessException 异常
+     */
+    private static <T> T getMappingEntity(RecordSet rs, T t, List<Field> emptyFields, boolean conversion) throws IllegalAccessException {
+        if (!conversion) {
+            return getMappingEntity(rs, t, emptyFields);
+        }
+        for (Field field : emptyFields) {
+            String fieldName = toUnderlineCase(field.getName());
+            field.setAccessible(true);
+            if (field.getType().equals(String.class)) {
+                field.set(t, rs.getString(fieldName));
+                continue;
+            }
+            if (field.getType().equals(Integer.class) || field.getType().equals(int.class)
+                    || field.getType().equals(short.class) || field.getType().equals(long.class)
+                    || field.getType().equals(Long.class)) {
+                field.set(t, rs.getInt(fieldName));
+                continue;
+            }
+            if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) {
+                field.set(t, rs.getBoolean(fieldName));
+                continue;
+            }
+            if (field.getType().equals(Float.class) || field.getType().equals(float.class)) {
+                field.set(t, rs.getFloat(fieldName));
+                continue;
+            }
+            if (field.getType().equals(Double.class) || field.getType().equals(double.class)) {
+                field.set(t, rs.getDouble(fieldName));
+                continue;
+            }
+            if (field.getType().equals(Date.class)) {
+                if (field.isAnnotationPresent(DateFormatAn.class)) {
+                    DateFormatAn annotation = field.getAnnotation(DateFormatAn.class);
+                    String value = annotation.value();
+                    try {
+                        field.set(t, new SimpleDateFormat(value).parse(rs.getString(fieldName)));
+                    } catch (ParseException e) {
+                        e.printStackTrace();
+                        field.set(t, null);
+                    }
+                } else {
+                    try {
+                        field.set(t, rs.getDate(fieldName));
+                    } catch (Exception e) {
+                        field.set(t, null);
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(BigDecimal.class)) {
+                field.set(t, rs.getDouble(fieldName));
+            }
+        }
+        return t;
+    }
 
-	@Deprecated
-	public static <T> T recordeSet2Empty(RecordSet rs, Class<T> clazz, boolean conversion) {
-		return recordeSet2Entity(rs, clazz, conversion);
-	}
+    @Deprecated
+    public static <T> T recordeSet2Empty(RecordSet rs, Class<T> clazz, boolean conversion) {
+        return recordeSet2Entity(rs, clazz, conversion);
+    }
 
-	/**
-	 * 通过查询结果获取到一个映射对象
-	 *
-	 * @param rs         查询结果
-	 * @param clazz      需要映射的类
-	 * @param conversion 是否下划线转驼峰
-	 * @param <T>        泛型
-	 * @return 转换后的对象
-	 */
-	public static <T> T recordeSet2Entity(RecordSet rs, Class<T> clazz, boolean conversion) {
-		if (clazz == null) {
-			return null;
-		}
-		try {
-			if (rs.next()) {
-				T t = clazz.newInstance();
-				List<Field> entityFields = getEmptyFields(clazz);
-				if (entityFields == null) {
-					toolUtil.writeErrorLog("emptyFields is empty!");
-					return null;
-				}
-				return getMappingEntity(rs, t, entityFields, conversion);
-			}
-		} catch (InstantiationException | IllegalAccessException e) {
-			toolUtil.writeErrorLog("err" + "\n" + e);
-			return null;
-		}
-		return null;
-	}
+    /**
+     * 通过查询结果获取到一个映射对象
+     *
+     * @param rs         查询结果
+     * @param clazz      需要映射的类
+     * @param conversion 是否下划线转驼峰
+     * @param <T>        泛型
+     * @return 转换后的对象
+     */
+    public static <T> T recordeSet2Entity(RecordSet rs, Class<T> clazz, boolean conversion) {
+        if (clazz == null) {
+            return null;
+        }
+        try {
+            if (rs.next()) {
+                T t = clazz.newInstance();
+                List<Field> entityFields = getEmptyFields(clazz);
+                if (entityFields == null) {
+                    toolUtil.writeErrorLog("emptyFields is empty!");
+                    return null;
+                }
+                return getMappingEntity(rs, t, entityFields, conversion);
+            }
+        } catch (InstantiationException | IllegalAccessException e) {
+            toolUtil.writeErrorLog("err" + "\n" + e);
+            return null;
+        }
+        return null;
+    }
 
 
-	@Deprecated
-	public static <T> T recordeSet2Empty(RecordSet rs, Class<T> clazz) {
-		return recordeSet2Entity(rs, clazz);
-	}
+    @Deprecated
+    public static <T> T recordeSet2Empty(RecordSet rs, Class<T> clazz) {
+        return recordeSet2Entity(rs, clazz);
+    }
 
-	/**
-	 * 通过查询结果获取到一个映射对象
-	 *
-	 * @param rs    查询结果
-	 * @param clazz 需要映射的类
-	 * @param <T>   返回改类的实例对象
-	 * @return 处理后的实体类
-	 */
-	public static <T> T recordeSet2Entity(RecordSet rs, Class<T> clazz) {
-		if (clazz == null) {
-			return null;
-		}
-		if (clazz.equals(String.class)) {
-			if (rs.next()) {
-				return (T) rs.getString(1);
-			}
-			return null;
-		} else if (clazz.equals(Integer.class)) {
-			if (rs.next()) {
-				return (T) Integer.valueOf(rs.getInt(1));
-			}
-			return null;
-		} else if (clazz.equals(Double.class)) {
-			if (rs.next()) {
-				return (T) Double.valueOf(rs.getDouble(1));
-			}
-			return null;
-		} else if (clazz.equals(Float.class)) {
-			if (rs.next()) {
-				return (T) Float.valueOf(rs.getFloat(1));
-			}
-			return null;
-		} else if (clazz.equals(Boolean.class)) {
-			if (rs.next()) {
-				return (T) Boolean.valueOf(rs.getBoolean(1));
-			}
-			return null;
-		}
-		try {
-			if (rs.next()) {
-				T t = clazz.newInstance();
-				List<Field> emptyFields = getEmptyFields(clazz);
-				if (emptyFields == null) {
-					return null;
-				}
-				return getMappingEntity(rs, t, emptyFields);
-			}
-		} catch (InstantiationException | IllegalAccessException e) {
-			e.printStackTrace();
-			return null;
-		}
-		return null;
-	}
+    /**
+     * 通过查询结果获取到一个映射对象
+     *
+     * @param rs    查询结果
+     * @param clazz 需要映射的类
+     * @param <T>   返回改类的实例对象
+     * @return 处理后的实体类
+     */
+    public static <T> T recordeSet2Entity(RecordSet rs, Class<T> clazz) {
+        if (clazz == null) {
+            return null;
+        }
+        if (clazz.equals(String.class)) {
+            if (rs.next()) {
+                return (T) rs.getString(1);
+            }
+            return null;
+        } else if (clazz.equals(Integer.class)) {
+            if (rs.next()) {
+                return (T) Integer.valueOf(rs.getInt(1));
+            }
+            return null;
+        } else if (clazz.equals(Double.class)) {
+            if (rs.next()) {
+                return (T) Double.valueOf(rs.getDouble(1));
+            }
+            return null;
+        } else if (clazz.equals(Float.class)) {
+            if (rs.next()) {
+                return (T) Float.valueOf(rs.getFloat(1));
+            }
+            return null;
+        } else if (clazz.equals(Boolean.class)) {
+            if (rs.next()) {
+                return (T) Boolean.valueOf(rs.getBoolean(1));
+            }
+            return null;
+        }
+        try {
+            if (rs.next()) {
+                T t = clazz.newInstance();
+                List<Field> emptyFields = getEmptyFields(clazz);
+                if (emptyFields == null) {
+                    return null;
+                }
+                return getMappingEntity(rs, t, emptyFields);
+            }
+        } catch (InstantiationException | IllegalAccessException e) {
+            e.printStackTrace();
+            return null;
+        }
+        return null;
+    }
 
 
-	/**
-	 * 获取数据库映射的集合
-	 *
-	 * @param rs         查询对象
-	 * @param clazz      需要映射的类
-	 * @param conversion 是否下划线转驼峰
-	 * @param <T>        返回映射实体类集合
-	 * @return 处理后的实体类集合
-	 */
-	public static <T> List<T> recordeSet2Array(RecordSet rs, Class<T> clazz, boolean conversion) {
-		if (clazz == null) {
-			return null;
-		}
-		List<T> list = new ArrayList<>();
-		List<Field> entityFields = getEmptyFields(clazz);
-		if (entityFields == null) {
-			return null;
-		}
-		while (rs.next()) {
-			try {
-				T t = clazz.newInstance();
-				list.add(getMappingEntity(rs, t, entityFields, conversion));
-			} catch (InstantiationException | IllegalAccessException e) {
-				e.printStackTrace();
-				return null;
-			}
-		}
-		return list;
-	}
+    /**
+     * 获取数据库映射的集合
+     *
+     * @param rs         查询对象
+     * @param clazz      需要映射的类
+     * @param conversion 是否下划线转驼峰
+     * @param <T>        返回映射实体类集合
+     * @return 处理后的实体类集合
+     */
+    public static <T> List<T> recordeSet2Array(RecordSet rs, Class<T> clazz, boolean conversion) {
+        if (clazz == null) {
+            return null;
+        }
+        List<T> list = new ArrayList<>();
+        List<Field> entityFields = getEmptyFields(clazz);
+        if (entityFields == null) {
+            return null;
+        }
+        while (rs.next()) {
+            try {
+                T t = clazz.newInstance();
+                list.add(getMappingEntity(rs, t, entityFields, conversion));
+            } catch (InstantiationException | IllegalAccessException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+        return list;
+    }
 
-	/**
-	 * 获取数据库映射的集合
-	 *
-	 * @param rs    查询对象
-	 * @param clazz 需要映射的类
-	 * @param <T>   返回映射实体类集合
-	 * @return 转换后的实体类集合
-	 */
-	public static <T> List<T> recordeSet2Array(RecordSet rs, Class<T> clazz) {
-		if (clazz == null) {
-			return null;
-		}
-		List<T> list = new ArrayList<>();
-		List<Field> emptyFields = getEmptyFields(clazz);
-		if (emptyFields == null) {
-			return null;
-		}
-		while (rs.next()) {
-			try {
-				if (clazz.equals(String.class)) {
-					list.add((T) rs.getString(1));
-				} else if (clazz.equals(Integer.class)) {
-					list.add((T) Integer.valueOf(rs.getInt(1)));
-				} else if (clazz.equals(Double.class)) {
-					list.add((T) Double.valueOf(rs.getDouble(1)));
-				} else if (clazz.equals(Float.class)) {
-					list.add((T) Float.valueOf(rs.getFloat(1)));
-				} else if (clazz.equals(Boolean.class)) {
-					list.add((T) Boolean.valueOf(rs.getBoolean(1)));
-				} else {
-					T t = clazz.newInstance();
-					list.add(getMappingEntity(rs, t, emptyFields));
-				}
-			} catch (InstantiationException | IllegalAccessException e) {
-				e.printStackTrace();
-				return null;
-			}
-		}
-		return list;
-	}
+    /**
+     * 获取数据库映射的集合
+     *
+     * @param rs    查询对象
+     * @param clazz 需要映射的类
+     * @param <T>   返回映射实体类集合
+     * @return 转换后的实体类集合
+     */
+    public static <T> List<T> recordeSet2Array(RecordSet rs, Class<T> clazz) {
+        if (clazz == null) {
+            return null;
+        }
+        List<T> list = new ArrayList<>();
+        List<Field> emptyFields = getEmptyFields(clazz);
+        if (emptyFields == null) {
+            return null;
+        }
+        while (rs.next()) {
+            try {
+                if (clazz.equals(String.class)) {
+                    list.add((T) rs.getString(1));
+                } else if (clazz.equals(Integer.class)) {
+                    list.add((T) Integer.valueOf(rs.getInt(1)));
+                } else if (clazz.equals(Double.class)) {
+                    list.add((T) Double.valueOf(rs.getDouble(1)));
+                } else if (clazz.equals(Float.class)) {
+                    list.add((T) Float.valueOf(rs.getFloat(1)));
+                } else if (clazz.equals(Boolean.class)) {
+                    list.add((T) Boolean.valueOf(rs.getBoolean(1)));
+                } else {
+                    T t = clazz.newInstance();
+                    list.add(getMappingEntity(rs, t, emptyFields));
+                }
+            } catch (InstantiationException | IllegalAccessException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+        return list;
+    }
 
 
-	/**
-	 * 下划线转驼峰
-	 *
-	 * @param underlineStr 带有下划线的字符串
-	 * @return 驼峰字符串
-	 */
-	public static String toCamelCase(String underlineStr) {
-		if (underlineStr == null) {
-			return null;
-		}
-		// 分成数组
-		char[] charArray = underlineStr.toCharArray();
-		// 判断上次循环的字符是否是"_"
-		boolean underlineBefore = false;
-		StringBuilder buffer = new StringBuilder();
-		for (int i = 0, l = charArray.length; i < l; i++) {
-			// 判断当前字符是否是"_",如果跳出本次循环
-			if (charArray[i] == 95) {
-				underlineBefore = true;
-			} else if (underlineBefore) {
-				// 如果为true，代表上次的字符是"_",当前字符需要转成大写
-				buffer.append(charArray[i] -= 32);
-				underlineBefore = false;
-			} else {
-				// 不是"_"后的字符就直接追加
-				buffer.append(charArray[i]);
-			}
-		}
-		return buffer.toString();
-	}
+    /**
+     * 下划线转驼峰
+     *
+     * @param underlineStr 带有下划线的字符串
+     * @return 驼峰字符串
+     */
+    public static String toCamelCase(String underlineStr) {
+        if (underlineStr == null) {
+            return null;
+        }
+        // 分成数组
+        char[] charArray = underlineStr.toCharArray();
+        // 判断上次循环的字符是否是"_"
+        boolean underlineBefore = false;
+        StringBuilder buffer = new StringBuilder();
+        for (int i = 0, l = charArray.length; i < l; i++) {
+            // 判断当前字符是否是"_",如果跳出本次循环
+            if (charArray[i] == 95) {
+                underlineBefore = true;
+            } else if (underlineBefore) {
+                // 如果为true，代表上次的字符是"_",当前字符需要转成大写
+                buffer.append(charArray[i] -= 32);
+                underlineBefore = false;
+            } else {
+                // 不是"_"后的字符就直接追加
+                buffer.append(charArray[i]);
+            }
+        }
+        return buffer.toString();
+    }
 
-	/**
-	 * 驼峰转 下划线
-	 *
-	 * @param camelCaseStr 驼峰字符串
-	 * @return 带下滑线的String
-	 */
-	public static String toUnderlineCase(String camelCaseStr) {
-		if (camelCaseStr == null) {
-			return null;
-		}
-		// 将驼峰字符串转换成数组
-		char[] charArray = camelCaseStr.toCharArray();
-		StringBuilder buffer = new StringBuilder();
-		//处理字符串
-		for (int i = 0, l = charArray.length; i < l; i++) {
-			if (charArray[i] >= 65 && charArray[i] <= 90) {
-				buffer.append("_").append(charArray[i] += 32);
-			} else {
-				buffer.append(charArray[i]);
-			}
-		}
-		return buffer.toString();
-	}
+    /**
+     * 驼峰转 下划线
+     *
+     * @param camelCaseStr 驼峰字符串
+     * @return 带下滑线的String
+     */
+    public static String toUnderlineCase(String camelCaseStr) {
+        if (camelCaseStr == null) {
+            return null;
+        }
+        // 将驼峰字符串转换成数组
+        char[] charArray = camelCaseStr.toCharArray();
+        StringBuilder buffer = new StringBuilder();
+        //处理字符串
+        for (int i = 0, l = charArray.length; i < l; i++) {
+            if (charArray[i] >= 65 && charArray[i] <= 90) {
+                buffer.append("_").append(charArray[i] += 32);
+            } else {
+                buffer.append(charArray[i]);
+            }
+        }
+        return buffer.toString();
+    }
 
-	/**
-	 * 根据类获取到对应的字段，包括父类的字段
-	 *
-	 * @param clazz 需要获取字段的类
-	 * @return java字段信息
-	 */
-	public static List<Field> getEntityFields(Class<?> clazz) {
-		Class<?> temClass = clazz;
-		List<Field> fieldList = new ArrayList<>();
-		while (temClass != null && temClass != Object.class) {
-			fieldList.addAll(Arrays.asList(temClass.getDeclaredFields()));
-			temClass = temClass.getSuperclass();
-		}
-		if (fieldList.size() == 0) {
-			return null;
-		}
-		return fieldList;
-	}
+    /**
+     * 根据类获取到对应的字段，包括父类的字段
+     *
+     * @param clazz 需要获取字段的类
+     * @return java字段信息
+     */
+    public static List<Field> getEntityFields(Class<?> clazz) {
+        Class<?> temClass = clazz;
+        List<Field> fieldList = new ArrayList<>();
+        while (temClass != null && temClass != Object.class) {
+            fieldList.addAll(Arrays.asList(temClass.getDeclaredFields()));
+            temClass = temClass.getSuperclass();
+        }
+        if (fieldList.size() == 0) {
+            return null;
+        }
+        return fieldList;
+    }
 
 
-	public static List<Field> getEmptyFields(Class<?> clazz) {
-		return getEntityFields(clazz);
-	}
+    public static List<Field> getEmptyFields(Class<?> clazz) {
+        return getEntityFields(clazz);
+    }
 
-	/**
-	 * 根据查询语句生成java文件
-	 *
-	 * @param query       查询语句
-	 * @param javaName    文件名
-	 * @param packageName 包名
-	 * @throws IOException io异常
-	 */
-	private static void createJavaFile(String query, String javaName, String packageName) throws IOException {
-		RecordSet rs = new RecordSet();
-		rs.executeQuery(query);
-		List<String> list = new ArrayList<>();
-		int colCounts = rs.getColCounts() == 0 ? rs.getColumnTypeName().length : rs.getColCounts();
-		for (int i = 1; i <= colCounts; i++) {
-			list.add(rs.getColumnName(i));
-		}
-		String[] columnType = rs.getColumnTypeName();
-		StringBuilder content = new StringBuilder();
-		StringBuilder importBuilder = new StringBuilder();
-		StringBuilder getBuilder = new StringBuilder();
-		StringBuilder setBuilder = new StringBuilder();
-		StringBuilder toStringBuilder = new StringBuilder("\n\t@Override\n");
-		String packageStr = "\npackage " + packageName + "; \n\n";
-		content.append("\npublic class ");
-		String className = Util.toCamelCase(javaName);
-		char[] chars = className.toCharArray();
-		if (!Character.isUpperCase(chars[0])) {
-			chars[0] -= 32;
-		}
-		className = String.valueOf(chars) + "PO";
-		toStringBuilder.append("\tpublic String toString() {\n\t\treturn \"")
-				.append(className)
-				.append("{\" +\n");
-		content.append(className).append(" {\n\n");
-		for (int i = 0; i < list.size(); i++) {
-			content.append(getClassField(columnType[i], list.get(i), importBuilder, getBuilder, setBuilder, toStringBuilder));
-		}
-		toStringBuilder.append("\t\t\t\t'}';\n\t}");
-		content.append(setBuilder)
-				.append(getBuilder)
-				.append(toStringBuilder.toString().replace("{\" +\n\t\t\t\t\", ", "{\" +\n\t\t\t\t\""))
-				.append("\n}");
-		String contentStr = packageStr + importBuilder + content;
-		String path = GCONST.getRootPath().replace(File.separator + "web" + File.separator,
-				File.separator + "src" + File.separator) + packageName.replace(".", File.separator) + File.separator + className + ".java";
-		System.out.println(path);
-		File file = new File(URLDecoder.decode(path, "utf-8"));
-		if (!file.getParentFile().exists()) {
-			file.getParentFile().mkdirs();
-		}
-		if (!file.exists()) {
-			file.createNewFile();
-		} else {
-			try {
-				System.out.println("已存在文件：" + packageName + "." + className + ".java");
-				System.out.print("你想如何处理该文件：替换[r/R]  重命名[w/W]  跳过[n/N] ? ");
-				Scanner scanner = new Scanner(System.in);
-				String next = scanner.next();
-				System.out.println(next);
-				if ("w".equalsIgnoreCase(next)) {
-					System.out.print("请输入新的文件名：");
-					String newName = scanner.next();
-					System.out.println(newName);
-					System.out.println("处理中...");
-					createJavaFile(query, newName, packageName);
-				} else if ("n".equalsIgnoreCase(next)) {
-					System.out.println("跳过文件生成！");
-					return;
-				}
-			} catch (Exception e) {
-				System.out.println("已存在文件：" + packageName + "." + className + ".java");
-			}
-		}
-		FileOutputStream fos = new FileOutputStream(file);
-		byte[] contentInBytes = contentStr.getBytes();
-		fos.write(contentInBytes);
-		fos.flush();
-		fos.close();
-		System.out.println("完成");
-	}
+    /**
+     * 根据查询语句生成java文件
+     *
+     * @param query       查询语句
+     * @param javaName    文件名
+     * @param packageName 包名
+     * @throws IOException io异常
+     */
+    private static void createJavaFile(String query, String javaName, String packageName) throws IOException {
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(query);
+        List<String> list = new ArrayList<>();
+        int colCounts = rs.getColCounts() == 0 ? rs.getColumnTypeName().length : rs.getColCounts();
+        for (int i = 1; i <= colCounts; i++) {
+            list.add(rs.getColumnName(i));
+        }
+        String[] columnType = rs.getColumnTypeName();
+        StringBuilder content = new StringBuilder();
+        StringBuilder importBuilder = new StringBuilder();
+        StringBuilder getBuilder = new StringBuilder();
+        StringBuilder setBuilder = new StringBuilder();
+        StringBuilder toStringBuilder = new StringBuilder("\n\t@Override\n");
+        String packageStr = "\npackage " + packageName + "; \n\n";
+        content.append("\npublic class ");
+        String className = Util.toCamelCase(javaName);
+        char[] chars = className.toCharArray();
+        if (!Character.isUpperCase(chars[0])) {
+            chars[0] -= 32;
+        }
+        className = String.valueOf(chars) + "PO";
+        toStringBuilder.append("\tpublic String toString() {\n\t\treturn \"")
+                .append(className)
+                .append("{\" +\n");
+        content.append(className).append(" {\n\n");
+        for (int i = 0; i < list.size(); i++) {
+            content.append(getClassField(columnType[i], list.get(i), importBuilder, getBuilder, setBuilder, toStringBuilder));
+        }
+        toStringBuilder.append("\t\t\t\t'}';\n\t}");
+        content.append(setBuilder)
+                .append(getBuilder)
+                .append(toStringBuilder.toString().replace("{\" +\n\t\t\t\t\", ", "{\" +\n\t\t\t\t\""))
+                .append("\n}");
+        String contentStr = packageStr + importBuilder + content;
+        String path = GCONST.getRootPath().replace(File.separator + "web" + File.separator,
+                File.separator + "src" + File.separator) + packageName.replace(".", File.separator) + File.separator + className + ".java";
+        System.out.println(path);
+        File file = new File(URLDecoder.decode(path, "utf-8"));
+        if (!file.getParentFile().exists()) {
+            file.getParentFile().mkdirs();
+        }
+        if (!file.exists()) {
+            file.createNewFile();
+        } else {
+            try {
+                System.out.println("已存在文件：" + packageName + "." + className + ".java");
+                System.out.print("你想如何处理该文件：替换[r/R]  重命名[w/W]  跳过[n/N] ? ");
+                Scanner scanner = new Scanner(System.in);
+                String next = scanner.next();
+                System.out.println(next);
+                if ("w".equalsIgnoreCase(next)) {
+                    System.out.print("请输入新的文件名：");
+                    String newName = scanner.next();
+                    System.out.println(newName);
+                    System.out.println("处理中...");
+                    createJavaFile(query, newName, packageName);
+                } else if ("n".equalsIgnoreCase(next)) {
+                    System.out.println("跳过文件生成！");
+                    return;
+                }
+            } catch (Exception e) {
+                System.out.println("已存在文件：" + packageName + "." + className + ".java");
+            }
+        }
+        FileOutputStream fos = new FileOutputStream(file);
+        byte[] contentInBytes = contentStr.getBytes();
+        fos.write(contentInBytes);
+        fos.flush();
+        fos.close();
+        System.out.println("完成");
+    }
 
-	/**
-	 * 根据表名生成java文件
-	 *
-	 * @param tableName   表名
-	 * @param packageName 包名
-	 * @throws IOException io异常
-	 */
-	public static void creatJavaFileByTable(String tableName, String packageName) throws IOException {
-		RecordSet recordSet = new RecordSet();
-		String dbType = recordSet.getDBType();
-		String query;
-		System.out.println(dbType);
-		if ("mysql".equalsIgnoreCase(dbType)) {
-			query = "select * from " + tableName + " limit 1";
-		} else if ("sqlserver".equalsIgnoreCase(dbType)) {
-			query = "select TOP 1 * from " + tableName;
-		} else {
-			query = "select TOP 1 * from " + tableName;
-		}
-		createJavaFile(query, tableName, packageName);
-	}
+    /**
+     * 根据表名生成java文件
+     *
+     * @param tableName   表名
+     * @param packageName 包名
+     * @throws IOException io异常
+     */
+    public static void creatJavaFileByTable(String tableName, String packageName) throws IOException {
+        RecordSet recordSet = new RecordSet();
+        String dbType = recordSet.getDBType();
+        String query;
+        System.out.println(dbType);
+        if ("mysql".equalsIgnoreCase(dbType)) {
+            query = "select * from " + tableName + " limit 1";
+        } else if ("sqlserver".equalsIgnoreCase(dbType)) {
+            query = "select TOP 1 * from " + tableName;
+        } else {
+            query = "select TOP 1 * from " + tableName;
+        }
+        createJavaFile(query, tableName, packageName);
+    }
 
-	/**
-	 * 根据查询语句生成java问阿金
-	 *
-	 * @param sql         查询语句
-	 * @param fileName    java文件名
-	 * @param packageName 包名
-	 * @throws IOException io 异常
-	 */
-	public static void creatJavaFileBySql(String sql, String fileName, String packageName) throws IOException {
-		RecordSet recordSet = new RecordSet();
-		String dbType = recordSet.getDBType();
-		String query;
-		System.out.println(dbType);
-		if ("mysql".equalsIgnoreCase(dbType)) {
-			query = "select * from (" + sql + ") as temp limit 1";
-		} else if ("sqlserver".equalsIgnoreCase(dbType)) {
-			query = "select TOP 1 * from (" + sql + ") as temp";
-		} else {
-			query = "select TOP 1 * from (" + sql + ") as temp";
-		}
-		createJavaFile(query, fileName, packageName);
-	}
+    /**
+     * 根据查询语句生成java问阿金
+     *
+     * @param sql         查询语句
+     * @param fileName    java文件名
+     * @param packageName 包名
+     * @throws IOException io 异常
+     */
+    public static void creatJavaFileBySql(String sql, String fileName, String packageName) throws IOException {
+        RecordSet recordSet = new RecordSet();
+        String dbType = recordSet.getDBType();
+        String query;
+        System.out.println(dbType);
+        if ("mysql".equalsIgnoreCase(dbType)) {
+            query = "select * from (" + sql + ") as temp limit 1";
+        } else if ("sqlserver".equalsIgnoreCase(dbType)) {
+            query = "select TOP 1 * from (" + sql + ") as temp";
+        } else {
+            query = "select TOP 1 * from (" + sql + ") as temp";
+        }
+        createJavaFile(query, fileName, packageName);
+    }
 
-	/**
-	 * java字段和数据库字段映射
-	 *
-	 * @param type            数据库字段类型
-	 * @param name            数据库字段名
-	 * @param importBuilder   导包的构建
-	 * @param getBuilder      getter方法的构建
-	 * @param setBuilder      setter方法的构建
-	 * @param toStringBuilder toString方法的构建
-	 * @return java字段
-	 */
-	public static String getClassField(String type, String name, StringBuilder importBuilder,
-	                                   StringBuilder getBuilder, StringBuilder setBuilder, StringBuilder toStringBuilder) {
-		if ("TINYINT".equalsIgnoreCase(type)) {
-			getBuilder.append("\n\tpublic boolean is")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(){\n")
-					.append("\t\treturn this.")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			setBuilder.append("\n\tpublic void set")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(boolean ")
-					.append(toCamelCase(name))
-					.append("){\n")
-					.append("\t\tthis.")
-					.append(toCamelCase(name))
-					.append(" = ")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			toStringBuilder.append("\t\t\t\t\", ")
-					.append(toCamelCase(name))
-					.append("='\" + ")
-					.append(toCamelCase(name))
-					.append(" + '\\'' +\n");
-			return "\tprivate boolean " + toCamelCase(name) + ";\n";
-		}
-		if ("int".equalsIgnoreCase(type) || "SMALLINT".equalsIgnoreCase(type)
-				|| "MEDIUMINT".equalsIgnoreCase(type) || "NUMBER".equalsIgnoreCase(type)
-				|| "INTEGER".equalsIgnoreCase(type)) {
-			getBuilder.append("\n\tpublic int get")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(){\n")
-					.append("\t\treturn this.")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			setBuilder.append("\n\tpublic void set")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(int ")
-					.append(toCamelCase(name))
-					.append("){\n")
-					.append("\t\tthis.")
-					.append(toCamelCase(name))
-					.append(" = ")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			toStringBuilder.append("\t\t\t\t\", ")
-					.append(toCamelCase(name))
-					.append("='\" + ")
-					.append(toCamelCase(name))
-					.append(" + '\\'' +\n");
-			return "\tprivate int " + toCamelCase(name) + ";\n";
-		}
-		if ("BIGINT".equalsIgnoreCase(type)) {
-			getBuilder.append("\n\tpublic long get")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(){\n")
-					.append("\t\treturn this.")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			setBuilder.append("\n\tpublic void set")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(long ")
-					.append(toCamelCase(name))
-					.append("){\n")
-					.append("\t\tthis.")
-					.append(toCamelCase(name))
-					.append(" = ")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			toStringBuilder.append("\t\t\t\t\", ")
-					.append(toCamelCase(name))
-					.append("='\" + ")
-					.append(toCamelCase(name))
-					.append(" + '\\'' +\n");
-			return "\tprivate long " + toCamelCase(name) + ";\n";
-		}
-		if ("double".equalsIgnoreCase(type) || "BINARY_DOUBLE".equalsIgnoreCase(type)) {
-			getBuilder.append("\n\tpublic double get")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(){\n")
-					.append("\t\treturn this.")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			setBuilder.append("\n\tpublic void set")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(double ")
-					.append(toCamelCase(name))
-					.append("){\n")
-					.append("\t\tthis.")
-					.append(toCamelCase(name))
-					.append(" = ")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			toStringBuilder.append("\t\t\t\t\", ")
-					.append(toCamelCase(name))
-					.append("='\" + ")
-					.append(toCamelCase(name))
-					.append(" + '\\'' +\n");
-			return "\tprivate double " + toCamelCase(name) + ";\n";
-		}
-		if ("float".equalsIgnoreCase(type) || "BINARY_FLOAT".equalsIgnoreCase(type)) {
-			getBuilder.append("\n\tpublic float get")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(){\n")
-					.append("\t\treturn this.")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			setBuilder.append("\n\tpublic void set")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(float ")
-					.append(toCamelCase(name))
-					.append("){\n")
-					.append("\t\tthis.")
-					.append(toCamelCase(name))
-					.append(" = ")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			toStringBuilder.append("\t\t\t\t\", ")
-					.append(toCamelCase(name))
-					.append("='\" + ")
-					.append(toCamelCase(name))
-					.append(" + '\\'' +\n");
-			return "\tprivate float " + toCamelCase(name) + ";\n";
-		}
-		if ("DECIMAL".equalsIgnoreCase(type)) {
-			getBuilder.append("\n\tpublic BigDecimal get")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(){\n")
-					.append("\t\treturn this.")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			setBuilder.append("\n\tpublic void set")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(BigDecimal ")
-					.append(toCamelCase(name))
-					.append("){\n")
-					.append("\t\tthis.")
-					.append(toCamelCase(name))
-					.append(" = ")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			toStringBuilder.append("\t\t\t\t\", ")
-					.append(toCamelCase(name))
-					.append("='\" + ")
-					.append(toCamelCase(name))
-					.append(" + '\\'' +\n");
-			importBuilder.append("import java.math.BigDecimal;\n");
-			return "\tprivate BigDecimal " + toCamelCase(name) + ";\n";
-		}
-		if ("DATE".equalsIgnoreCase(type) || "DATETIME".equalsIgnoreCase(type)) {
-			getBuilder.append("\n\tpublic Date get")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(){\n")
-					.append("\t\treturn this.")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			setBuilder.append("\n\tpublic void set")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(Date ")
-					.append(toCamelCase(name))
-					.append("){\n")
-					.append("\t\tthis.")
-					.append(toCamelCase(name))
-					.append(" = ")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			toStringBuilder.append("\t\t\t\t\", ")
-					.append(toCamelCase(name))
-					.append("='\" + ")
-					.append(toCamelCase(name))
-					.append(" + '\\'' +\n");
-			importBuilder.append("import java.util.Date;\n");
-			return "\tprivate Date" + toCamelCase(name) + ";\n";
-		}
-		if ("char".equalsIgnoreCase(type) || "VARCHAR".equalsIgnoreCase(type) || "TEXT".equalsIgnoreCase(type)) {
-			getBuilder.append("\n\tpublic String get")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(){\n")
-					.append("\t\treturn this.")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			setBuilder.append("\n\tpublic void set")
-					.append(getFirstCase(toCamelCase(name)))
-					.append("(String ")
-					.append(toCamelCase(name))
-					.append("){\n")
-					.append("\t\tthis.")
-					.append(toCamelCase(name))
-					.append(" = ")
-					.append(toCamelCase(name))
-					.append(";\n\t}\n");
-			toStringBuilder.append("\t\t\t\t\", ")
-					.append(toCamelCase(name))
-					.append("='\" + ")
-					.append(toCamelCase(name))
-					.append(" + '\\'' +\n");
-			return "\tprivate String " + toCamelCase(name) + ";\n";
-		}
-		return "";
-	}
+    /**
+     * java字段和数据库字段映射
+     *
+     * @param type            数据库字段类型
+     * @param name            数据库字段名
+     * @param importBuilder   导包的构建
+     * @param getBuilder      getter方法的构建
+     * @param setBuilder      setter方法的构建
+     * @param toStringBuilder toString方法的构建
+     * @return java字段
+     */
+    public static String getClassField(String type, String name, StringBuilder importBuilder,
+                                       StringBuilder getBuilder, StringBuilder setBuilder, StringBuilder toStringBuilder) {
+        if ("TINYINT".equalsIgnoreCase(type)) {
+            getBuilder.append("\n\tpublic boolean is")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(){\n")
+                    .append("\t\treturn this.")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            setBuilder.append("\n\tpublic void set")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(boolean ")
+                    .append(toCamelCase(name))
+                    .append("){\n")
+                    .append("\t\tthis.")
+                    .append(toCamelCase(name))
+                    .append(" = ")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            toStringBuilder.append("\t\t\t\t\", ")
+                    .append(toCamelCase(name))
+                    .append("='\" + ")
+                    .append(toCamelCase(name))
+                    .append(" + '\\'' +\n");
+            return "\tprivate boolean " + toCamelCase(name) + ";\n";
+        }
+        if ("int".equalsIgnoreCase(type) || "SMALLINT".equalsIgnoreCase(type)
+                || "MEDIUMINT".equalsIgnoreCase(type) || "NUMBER".equalsIgnoreCase(type)
+                || "INTEGER".equalsIgnoreCase(type)) {
+            getBuilder.append("\n\tpublic int get")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(){\n")
+                    .append("\t\treturn this.")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            setBuilder.append("\n\tpublic void set")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(int ")
+                    .append(toCamelCase(name))
+                    .append("){\n")
+                    .append("\t\tthis.")
+                    .append(toCamelCase(name))
+                    .append(" = ")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            toStringBuilder.append("\t\t\t\t\", ")
+                    .append(toCamelCase(name))
+                    .append("='\" + ")
+                    .append(toCamelCase(name))
+                    .append(" + '\\'' +\n");
+            return "\tprivate int " + toCamelCase(name) + ";\n";
+        }
+        if ("BIGINT".equalsIgnoreCase(type)) {
+            getBuilder.append("\n\tpublic long get")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(){\n")
+                    .append("\t\treturn this.")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            setBuilder.append("\n\tpublic void set")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(long ")
+                    .append(toCamelCase(name))
+                    .append("){\n")
+                    .append("\t\tthis.")
+                    .append(toCamelCase(name))
+                    .append(" = ")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            toStringBuilder.append("\t\t\t\t\", ")
+                    .append(toCamelCase(name))
+                    .append("='\" + ")
+                    .append(toCamelCase(name))
+                    .append(" + '\\'' +\n");
+            return "\tprivate long " + toCamelCase(name) + ";\n";
+        }
+        if ("double".equalsIgnoreCase(type) || "BINARY_DOUBLE".equalsIgnoreCase(type)) {
+            getBuilder.append("\n\tpublic double get")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(){\n")
+                    .append("\t\treturn this.")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            setBuilder.append("\n\tpublic void set")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(double ")
+                    .append(toCamelCase(name))
+                    .append("){\n")
+                    .append("\t\tthis.")
+                    .append(toCamelCase(name))
+                    .append(" = ")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            toStringBuilder.append("\t\t\t\t\", ")
+                    .append(toCamelCase(name))
+                    .append("='\" + ")
+                    .append(toCamelCase(name))
+                    .append(" + '\\'' +\n");
+            return "\tprivate double " + toCamelCase(name) + ";\n";
+        }
+        if ("float".equalsIgnoreCase(type) || "BINARY_FLOAT".equalsIgnoreCase(type)) {
+            getBuilder.append("\n\tpublic float get")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(){\n")
+                    .append("\t\treturn this.")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            setBuilder.append("\n\tpublic void set")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(float ")
+                    .append(toCamelCase(name))
+                    .append("){\n")
+                    .append("\t\tthis.")
+                    .append(toCamelCase(name))
+                    .append(" = ")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            toStringBuilder.append("\t\t\t\t\", ")
+                    .append(toCamelCase(name))
+                    .append("='\" + ")
+                    .append(toCamelCase(name))
+                    .append(" + '\\'' +\n");
+            return "\tprivate float " + toCamelCase(name) + ";\n";
+        }
+        if ("DECIMAL".equalsIgnoreCase(type)) {
+            getBuilder.append("\n\tpublic BigDecimal get")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(){\n")
+                    .append("\t\treturn this.")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            setBuilder.append("\n\tpublic void set")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(BigDecimal ")
+                    .append(toCamelCase(name))
+                    .append("){\n")
+                    .append("\t\tthis.")
+                    .append(toCamelCase(name))
+                    .append(" = ")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            toStringBuilder.append("\t\t\t\t\", ")
+                    .append(toCamelCase(name))
+                    .append("='\" + ")
+                    .append(toCamelCase(name))
+                    .append(" + '\\'' +\n");
+            importBuilder.append("import java.math.BigDecimal;\n");
+            return "\tprivate BigDecimal " + toCamelCase(name) + ";\n";
+        }
+        if ("DATE".equalsIgnoreCase(type) || "DATETIME".equalsIgnoreCase(type)) {
+            getBuilder.append("\n\tpublic Date get")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(){\n")
+                    .append("\t\treturn this.")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            setBuilder.append("\n\tpublic void set")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(Date ")
+                    .append(toCamelCase(name))
+                    .append("){\n")
+                    .append("\t\tthis.")
+                    .append(toCamelCase(name))
+                    .append(" = ")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            toStringBuilder.append("\t\t\t\t\", ")
+                    .append(toCamelCase(name))
+                    .append("='\" + ")
+                    .append(toCamelCase(name))
+                    .append(" + '\\'' +\n");
+            importBuilder.append("import java.util.Date;\n");
+            return "\tprivate Date" + toCamelCase(name) + ";\n";
+        }
+        if ("char".equalsIgnoreCase(type) || "VARCHAR".equalsIgnoreCase(type) || "TEXT".equalsIgnoreCase(type)) {
+            getBuilder.append("\n\tpublic String get")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(){\n")
+                    .append("\t\treturn this.")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            setBuilder.append("\n\tpublic void set")
+                    .append(getFirstCase(toCamelCase(name)))
+                    .append("(String ")
+                    .append(toCamelCase(name))
+                    .append("){\n")
+                    .append("\t\tthis.")
+                    .append(toCamelCase(name))
+                    .append(" = ")
+                    .append(toCamelCase(name))
+                    .append(";\n\t}\n");
+            toStringBuilder.append("\t\t\t\t\", ")
+                    .append(toCamelCase(name))
+                    .append("='\" + ")
+                    .append(toCamelCase(name))
+                    .append(" + '\\'' +\n");
+            return "\tprivate String " + toCamelCase(name) + ";\n";
+        }
+        return "";
+    }
 
-	/**
-	 * 首字母转大写
-	 *
-	 * @param str 需要转换的字符串
-	 * @return 首字母转为大写后的字符串
-	 */
-	public static String getFirstCase(String str) {
-		char[] chars = str.toCharArray();
-		if (!Character.isUpperCase(chars[0])) {
-			chars[0] -= 32;
-		}
-		return String.valueOf(chars);
-	}
+    /**
+     * 首字母转大写
+     *
+     * @param str 需要转换的字符串
+     * @return 首字母转为大写后的字符串
+     */
+    public static String getFirstCase(String str) {
+        char[] chars = str.toCharArray();
+        if (!Character.isUpperCase(chars[0])) {
+            chars[0] -= 32;
+        }
+        return String.valueOf(chars);
+    }
 
 
-	/**
-	 * 通过文件名获取到对应的配置文件map对象
-	 *
-	 * @param fileName prop/prop2map/文件夹下的文件名（不包含.properties）
-	 * @return 配置文件对应的map对象
-	 */
-	public static Map<String, Object> getProperties2Map(String fileName) {
-		String propertyPath = GCONST.getPropertyPath();
-		if (StringUtil.isNullOrEmpty(fileName)) {
-			return null;
-		}
-		if (fileName.contains(".properties")) {
-			fileName.replace(".properties", "");
-		}
-		String path = propertyPath + "prop2map" + File.separator + fileName + ".properties";
-		Properties prop = new Properties();
-		Map<String, Object> map = new HashMap<>();
-		InputStream inputStream = null;
-		try {
-			inputStream = new BufferedInputStream(new FileInputStream(path));
-			prop.load(inputStream);
-			Enumeration<?> enumeration = prop.propertyNames();
-			while (enumeration.hasMoreElements()) {
-				String key = String.valueOf(enumeration.nextElement());
-				map.put(key, prop.getProperty(key));
-			}
-		} catch (IOException e) {
-			throw new RuntimeException("找不到文件：" + path);
-		} finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return map;
-	}
+    /**
+     * 通过文件名获取到对应的配置文件map对象
+     *
+     * @param fileName prop/prop2map/文件夹下的文件名（不包含.properties）
+     * @return 配置文件对应的map对象
+     */
+    public static Map<String, Object> getProperties2Map(String fileName) {
+        String propertyPath = GCONST.getPropertyPath();
+        if (StringUtil.isNullOrEmpty(fileName)) {
+            return null;
+        }
+        if (fileName.contains(".properties")) {
+            fileName.replace(".properties", "");
+        }
+        String path = propertyPath + "prop2map" + File.separator + fileName + ".properties";
+        Properties prop = new Properties();
+        Map<String, Object> map = new HashMap<>();
+        InputStream inputStream = null;
+        try {
+            inputStream = new BufferedInputStream(new FileInputStream(path));
+            prop.load(inputStream);
+            Enumeration<?> enumeration = prop.propertyNames();
+            while (enumeration.hasMoreElements()) {
+                String key = String.valueOf(enumeration.nextElement());
+                map.put(key, prop.getProperty(key));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("找不到文件：" + path);
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return map;
+    }
 
-	/**
-	 * 根据配置文件文件名以及前缀获取对应的配置文件信息
-	 * @param fileName
-	 * @param prefix
-	 * @return
-	 */
-	public static Map<String, Object> readProperties2Map(String fileName, String prefix) {
-		String propertyPath = GCONST.getPropertyPath();
-		if (StringUtil.isNullOrEmpty(fileName)) {
-			return null;
-		}
-		if (fileName.contains(".properties")) {
-			fileName.replace(".properties", "");
-		}
-		String path = propertyPath + "prop2map" + File.separator + fileName + ".properties";
-		ProperUtil prop = new ProperUtil();
-		Map<String, Object> map = new HashMap<>();
-		InputStream inputStream = null;
-		try {
-			inputStream = new BufferedInputStream(new FileInputStream(path));
-			prop.load(inputStream);
+    /**
+     * 根据配置文件文件名以及前缀获取对应的配置文件信息
+     *
+     * @param fileName
+     * @param prefix
+     * @return
+     */
+    public static Map<String, Object> readProperties2Map(String fileName, String prefix) {
+        String propertyPath = GCONST.getPropertyPath();
+        if (StringUtil.isNullOrEmpty(fileName)) {
+            return null;
+        }
+        if (fileName.contains(".properties")) {
+            fileName.replace(".properties", "");
+        }
+        String path = propertyPath + "prop2map" + File.separator + fileName + ".properties";
+        ProperUtil prop = new ProperUtil();
+        Map<String, Object> map = new HashMap<>();
+        InputStream inputStream = null;
+        try {
+            inputStream = new BufferedInputStream(new FileInputStream(path));
+            prop.load(inputStream);
 //			Enumeration<?> enumeration = prop.propertyNames();
 //			顺序读取
-			Enumeration<?> enumeration = prop.keys();
-			while (enumeration.hasMoreElements()) {
-				String key = (String) enumeration.nextElement();
-				String value = prop.getProperty(key);
-				keyHandler(prefix, key, value, map);
-			}
-		} catch (IOException e) {
-			throw new RuntimeException("找不到文件：" + path);
-		} finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return map;
-	}
+            Enumeration<?> enumeration = prop.keys();
+            while (enumeration.hasMoreElements()) {
+                String key = (String) enumeration.nextElement();
+                String value = prop.getProperty(key);
+                keyHandler(prefix, key, value, map);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("找不到文件：" + path);
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return map;
+    }
 
 
-	/**
-	 * 处理配置文件的key和value映射关系
-	 * @param prePrefix 前缀
-	 * @param key key
-	 * @param value value
-	 * @param preResult 结果对象
-	 * @return
-	 */
-	public static Map<String, Object> keyHandler(String prePrefix, String key, Object value, Map<String, Object> preResult) {
-		String objRegex = "^(" + prePrefix + "\\.)(?<key>(\\w+))$";
-		Pattern compile = Pattern.compile(objRegex);
-		Matcher matcher = compile.matcher(key);
-		if (matcher.find()) {
+    /**
+     * 处理配置文件的key和value映射关系
+     *
+     * @param prePrefix 前缀
+     * @param key       key
+     * @param value     value
+     * @param preResult 结果对象
+     * @return
+     */
+    public static Map<String, Object> keyHandler(String prePrefix, String key, Object value, Map<String, Object> preResult) {
+        String objRegex = "^(" + prePrefix + "\\.)(?<key>(\\w+))$";
+        Pattern compile = Pattern.compile(objRegex);
+        Matcher matcher = compile.matcher(key);
+        if (matcher.find()) {
 //			只匹配前缀.key=value模式的
-			String resultKey = matcher.group("key");
-			preResult.put(resultKey, prop2MapPutValue(value));
-		}
-		String moreKey = "^(" + prePrefix + "\\.)(?<key>(?<objKey>(\\w+))\\.(\\S)+(?!\\[))";
-		compile = Pattern.compile(moreKey);
-		matcher = compile.matcher(key);
-		if (matcher.find()) {
+            String resultKey = matcher.group("key");
+            preResult.put(resultKey, prop2MapPutValue(value));
+        }
+        String moreKey = "^(" + prePrefix + "\\.)(?<key>(?<objKey>(\\w+))\\.(\\S)+(?!\\[))";
+        compile = Pattern.compile(moreKey);
+        matcher = compile.matcher(key);
+        if (matcher.find()) {
 //			匹配前缀.key1.key2=value模式的
-			String objKey = matcher.group("objKey");
-			String prefixStr = prePrefix + "." + objKey;
-			Map<String, Object> valueMap;
-			if (preResult.containsKey(objKey)) {
-				valueMap = (Map<String, Object>) preResult.get(objKey);
-				keyHandler(prefixStr, key, value, valueMap);
-				return null;
-			}
-			valueMap = new HashMap<>();
-			keyHandler(prefixStr, key, value, valueMap);
-			preResult.put(objKey, valueMap);
-			return null;
-		}
-		String strList = "^(" + prePrefix + "\\.)(?<key>(\\w+))(\\[(?<index>([0-9])+)])$";
-		compile = Pattern.compile(strList);
-		matcher = compile.matcher(key);
-		if (matcher.find()) {
+            String objKey = matcher.group("objKey");
+            String prefixStr = prePrefix + "." + objKey;
+            Map<String, Object> valueMap;
+            if (preResult.containsKey(objKey)) {
+                valueMap = (Map<String, Object>) preResult.get(objKey);
+                keyHandler(prefixStr, key, value, valueMap);
+                return null;
+            }
+            valueMap = new HashMap<>();
+            keyHandler(prefixStr, key, value, valueMap);
+            preResult.put(objKey, valueMap);
+            return null;
+        }
+        String strList = "^(" + prePrefix + "\\.)(?<key>(\\w+))(\\[(?<index>([0-9])+)])$";
+        compile = Pattern.compile(strList);
+        matcher = compile.matcher(key);
+        if (matcher.find()) {
 //			匹配前缀.key[0]=value模式的
-			String objKey = matcher.group("key");
-			int index = Integer.parseInt(matcher.group("index"));
-			if (preResult.containsKey(objKey)) {
+            String objKey = matcher.group("key");
+            int index = Integer.parseInt(matcher.group("index"));
+            if (preResult.containsKey(objKey)) {
 //				存在值
-				List<Object> valueList = (List<Object>) preResult.get(objKey);
-				if (index >= valueList.size()) {
-					valueList.add(prop2MapPutValue(value));
-				} else {
-					valueList.set(index, prop2MapPutValue(value));
-				}
-				return null;
-			}
-			List<Object> valueList = new ArrayList<>();
-			valueList.add(prop2MapPutValue(value));
-			preResult.put(objKey, valueList);
-			return null;
-		}
-		String objArray = "^(" + prePrefix + "\\.)(?<arrKey>(\\w+))(\\[(?<index>([0-9])+)])\\.(?<objKey>(\\S)+)$";
+                List<Object> valueList = (List<Object>) preResult.get(objKey);
+                if (index >= valueList.size()) {
+                    valueList.add(prop2MapPutValue(value));
+                } else {
+                    valueList.set(index, prop2MapPutValue(value));
+                }
+                return null;
+            }
+            List<Object> valueList = new ArrayList<>();
+            valueList.add(prop2MapPutValue(value));
+            preResult.put(objKey, valueList);
+            return null;
+        }
+        String objArray = "^(" + prePrefix + "\\.)(?<arrKey>(\\w+))(\\[(?<index>([0-9])+)])\\.(?<objKey>(\\S)+)$";
 //		String objArray = "^("+prePrefix+"\\.)(?<arrKey>(\\w+))(\\[(?<index>([0-9])+)])(\\.(?<objKey>(\\S)+))+";
-		compile = Pattern.compile(objArray);
-		matcher = compile.matcher(key);
-		if (matcher.find()) {
+        compile = Pattern.compile(objArray);
+        matcher = compile.matcher(key);
+        if (matcher.find()) {
 //			匹配前缀.key[0].name=value的模式
-			String arrKey = matcher.group("arrKey");
-			String objKey = matcher.group("objKey");
-			int index = Integer.parseInt(matcher.group("index"));
-			List<Map<String, Object>> mapList;
-			if (preResult.containsKey(arrKey)) {
+            String arrKey = matcher.group("arrKey");
+            String objKey = matcher.group("objKey");
+            int index = Integer.parseInt(matcher.group("index"));
+            List<Map<String, Object>> mapList;
+            if (preResult.containsKey(arrKey)) {
 //				存在
-				mapList = (List<Map<String, Object>>) preResult.get(arrKey);
+                mapList = (List<Map<String, Object>>) preResult.get(arrKey);
 //				mapList
-				Map<String, Object> valueMap;
-				if (index >= mapList.size()) {
-					valueMap = new HashMap<>();
-					valueMap.put(objKey, prop2MapPutValue(value));
-					mapList.add(valueMap);
-					return null;
-				}
-				valueMap = mapList.get(index);
-				String arrMoreKey = "(?<key>(\\w+))\\.(\\S)+(?!\\[)";
-				Pattern arrMoreKeyCompile = Pattern.compile(arrMoreKey);
-				Matcher arrMoreKeyMatcher = arrMoreKeyCompile.matcher(objKey);
-				if (arrMoreKeyMatcher.find()) {
-					String arrMoreObjKey = arrMoreKeyMatcher.group("key");
-					Map<String, Object> arrMoreValue;
-					if (valueMap.containsKey(arrMoreObjKey)) {
-						arrMoreValue = (Map<String, Object>) valueMap.get(arrMoreObjKey);
-						keyHandler(arrMoreObjKey, objKey, value, arrMoreValue);
-						return null;
-					}
-					arrMoreValue = new HashMap<>();
-					keyHandler(arrMoreObjKey, objKey, value, arrMoreValue);
-					valueMap.put(arrMoreObjKey, arrMoreValue);
-					return null;
-				}
-				arrMoreKey = "(?<key>(\\w+))(\\[(?<index>([0-9])+)])$";
-				arrMoreKeyCompile = Pattern.compile(arrMoreKey);
-				arrMoreKeyMatcher = arrMoreKeyCompile.matcher(objKey);
-				if (arrMoreKeyMatcher.find()) {
-					String arrMoreArrKey = arrMoreKeyMatcher.group("key");
-					int arrMoreIndex = Integer.parseInt(arrMoreKeyMatcher.group("index"));
-					List<Object> arrMoreListValue;
-					if (valueMap.containsKey(arrMoreArrKey)) {
+                Map<String, Object> valueMap;
+                if (index >= mapList.size()) {
+                    valueMap = new HashMap<>();
+                    valueMap.put(objKey, prop2MapPutValue(value));
+                    mapList.add(valueMap);
+                    return null;
+                }
+                valueMap = mapList.get(index);
+                String arrMoreKey = "(?<key>(\\w+))\\.(\\S)+(?!\\[)";
+                Pattern arrMoreKeyCompile = Pattern.compile(arrMoreKey);
+                Matcher arrMoreKeyMatcher = arrMoreKeyCompile.matcher(objKey);
+                if (arrMoreKeyMatcher.find()) {
+                    String arrMoreObjKey = arrMoreKeyMatcher.group("key");
+                    Map<String, Object> arrMoreValue;
+                    if (valueMap.containsKey(arrMoreObjKey)) {
+                        arrMoreValue = (Map<String, Object>) valueMap.get(arrMoreObjKey);
+                        keyHandler(arrMoreObjKey, objKey, value, arrMoreValue);
+                        return null;
+                    }
+                    arrMoreValue = new HashMap<>();
+                    keyHandler(arrMoreObjKey, objKey, value, arrMoreValue);
+                    valueMap.put(arrMoreObjKey, arrMoreValue);
+                    return null;
+                }
+                arrMoreKey = "(?<key>(\\w+))(\\[(?<index>([0-9])+)])$";
+                arrMoreKeyCompile = Pattern.compile(arrMoreKey);
+                arrMoreKeyMatcher = arrMoreKeyCompile.matcher(objKey);
+                if (arrMoreKeyMatcher.find()) {
+                    String arrMoreArrKey = arrMoreKeyMatcher.group("key");
+                    int arrMoreIndex = Integer.parseInt(arrMoreKeyMatcher.group("index"));
+                    List<Object> arrMoreListValue;
+                    if (valueMap.containsKey(arrMoreArrKey)) {
 //						存在值
-						arrMoreListValue = (List<Object>) valueMap.get(arrMoreArrKey);
-						if (arrMoreIndex >= arrMoreListValue.size()) {
-							arrMoreListValue.add(prop2MapPutValue(value));
-						} else {
-							arrMoreListValue.set(arrMoreIndex, prop2MapPutValue(value));
-						}
-						return null;
-					}
-					arrMoreListValue = new ArrayList<>();
-					arrMoreListValue.add(prop2MapPutValue(value));
-					valueMap.put(arrMoreArrKey, arrMoreListValue);
-					return null;
-				}
+                        arrMoreListValue = (List<Object>) valueMap.get(arrMoreArrKey);
+                        if (arrMoreIndex >= arrMoreListValue.size()) {
+                            arrMoreListValue.add(prop2MapPutValue(value));
+                        } else {
+                            arrMoreListValue.set(arrMoreIndex, prop2MapPutValue(value));
+                        }
+                        return null;
+                    }
+                    arrMoreListValue = new ArrayList<>();
+                    arrMoreListValue.add(prop2MapPutValue(value));
+                    valueMap.put(arrMoreArrKey, arrMoreListValue);
+                    return null;
+                }
 
 //				直接添加
-				valueMap.put(objKey, prop2MapPutValue(value));
-				return null;
-			}
+                valueMap.put(objKey, prop2MapPutValue(value));
+                return null;
+            }
 //			不存在
-			mapList = new ArrayList<>();
-			Map<String, Object> valueMap = new HashMap<>();
-			valueMap.put(objKey, prop2MapPutValue(value));
-			mapList.add(valueMap);
-			preResult.put(arrKey, mapList);
-		}
-		return null;
-	}
+            mapList = new ArrayList<>();
+            Map<String, Object> valueMap = new HashMap<>();
+            valueMap.put(objKey, prop2MapPutValue(value));
+            mapList.add(valueMap);
+            preResult.put(arrKey, mapList);
+        }
+        return null;
+    }
 
-	public static Object prop2MapPutValue(Object value) {
-		if(value == null){
-			return null;
-		}
-		String valueStr = String.valueOf(value).trim();
-		if (valueStr.startsWith("\"") && valueStr.endsWith("\"")) {
-			return valueStr.substring(1, valueStr.length() - 1);
-		}
-		if (valueStr.contains(",")) {
-			if(valueStr.contains("\\,")){
-				String[] split = valueStr.split("(?<!\\\\),");
-				for (int i = 0; i < split.length; i ++){
-					split[i] = split[i].replaceAll("\\\\,",",");
-				}
-				return split;
-			}
-			return valueStr.split(",");
-		}
-		return value;
-	}
+    public static Object prop2MapPutValue(Object value) {
+        if (value == null) {
+            return null;
+        }
+        String valueStr = String.valueOf(value).trim();
+        if (valueStr.startsWith("\"") && valueStr.endsWith("\"")) {
+            return valueStr.substring(1, valueStr.length() - 1);
+        }
+        if (valueStr.contains(",")) {
+            if (valueStr.contains("\\,")) {
+                String[] split = valueStr.split("(?<!\\\\),");
+                for (int i = 0; i < split.length; i++) {
+                    split[i] = split[i].replaceAll("\\\\,", ",");
+                }
+                return split;
+            }
+            return valueStr.split(",");
+        }
+        return value;
+    }
 
-	/**
-	 * 通过文件名获取到对应的配置文件map对象
-	 *
-	 * @param fileName prop/prop2map/文件夹下的文件名（不包含.properties）
-	 * @param prefix   配置文件中配置项的前缀
-	 * @return 配置文件指定前缀对应的map对象
-	 */
-	@Deprecated
-	public static Map<String, Object> getProperties2Map(String fileName, String prefix) {
-		String propertyPath = GCONST.getPropertyPath();
-		if (StringUtil.isNullOrEmpty(fileName)) {
-			return null;
-		}
-		if (fileName.contains(".properties")) {
-			fileName.replace(".properties", "");
-		}
-		String path = propertyPath + "prop2map" + File.separator + fileName + ".properties";
-		Properties prop = new Properties();
-		Map<String, Object> map = new HashMap<>();
-		InputStream inputStream = null;
-		try {
-			inputStream = new BufferedInputStream(new FileInputStream(path));
-			prop.load(inputStream);
-			Enumeration<?> enumeration = prop.propertyNames();
-			while (enumeration.hasMoreElements()) {
-				String key = (String) enumeration.nextElement();
-				if (key.contains(prefix + ".")) {
-					map.put(key.replace(prefix + ".", ""), prop.getProperty(key));
-				}
-			}
-		} catch (IOException e) {
-			throw new RuntimeException("找不到文件：" + path);
-		} finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return map;
-	}
+    /**
+     * 通过文件名获取到对应的配置文件map对象
+     *
+     * @param fileName prop/prop2map/文件夹下的文件名（不包含.properties）
+     * @param prefix   配置文件中配置项的前缀
+     * @return 配置文件指定前缀对应的map对象
+     */
+    @Deprecated
+    public static Map<String, Object> getProperties2Map(String fileName, String prefix) {
+        String propertyPath = GCONST.getPropertyPath();
+        if (StringUtil.isNullOrEmpty(fileName)) {
+            return null;
+        }
+        if (fileName.contains(".properties")) {
+            fileName.replace(".properties", "");
+        }
+        String path = propertyPath + "prop2map" + File.separator + fileName + ".properties";
+        Properties prop = new Properties();
+        Map<String, Object> map = new HashMap<>();
+        InputStream inputStream = null;
+        try {
+            inputStream = new BufferedInputStream(new FileInputStream(path));
+            prop.load(inputStream);
+            Enumeration<?> enumeration = prop.propertyNames();
+            while (enumeration.hasMoreElements()) {
+                String key = (String) enumeration.nextElement();
+                if (key.contains(prefix + ".")) {
+                    map.put(key.replace(prefix + ".", ""), prop.getProperty(key));
+                }
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("找不到文件：" + path);
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return map;
+    }
 
-	public static Map<String, List<String>> parsingSq2Map(String sql) {
-		Map<String, List<String>> map = new HashMap<>();
-		String pattern = "\\{{2}(?<table>((?!\\$)\\s\\S)+?)\\.(?<field>\\s\\S+?)}{2}";
-		Pattern compile = Pattern.compile(pattern);
-		Matcher matcher = compile.matcher(sql);
-		while (matcher.find()) {
-			if (map.containsKey(matcher.group("table"))) {
-				map.get(matcher.group("table")).add(matcher.group("field"));
-			} else {
-				map.put(matcher.group("table"), new ArrayList<String>() {{
-					add(matcher.group("field"));
-				}});
-			}
-		}
-		return map;
-	}
+    public static Map<String, List<String>> parsingSq2Map(String sql) {
+        Map<String, List<String>> map = new HashMap<>();
+        String pattern = "\\{{2}(?<table>((?!\\$)\\s\\S)+?)\\.(?<field>\\s\\S+?)}{2}";
+        Pattern compile = Pattern.compile(pattern);
+        Matcher matcher = compile.matcher(sql);
+        while (matcher.find()) {
+            if (map.containsKey(matcher.group("table"))) {
+                map.get(matcher.group("table")).add(matcher.group("field"));
+            } else {
+                map.put(matcher.group("table"), new ArrayList<String>() {{
+                    add(matcher.group("field"));
+                }});
+            }
+        }
+        return map;
+    }
 
-	public static Matcher parsingSql2Matcher(String sql) {
-		String pattern = "\\{{2}(?<table>((?!\\$)\\s\\S)+?)\\.(?<field>\\s\\S+?)}{2}";
-		Pattern compile = Pattern.compile(pattern);
-		return compile.matcher(sql);
-	}
+    public static Matcher parsingSql2Matcher(String sql) {
+        String pattern = "\\{{2}(?<table>((?!\\$)\\s\\S)+?)\\.(?<field>\\s\\S+?)}{2}";
+        Pattern compile = Pattern.compile(pattern);
+        return compile.matcher(sql);
+    }
 
-	public static String parsingSqlByRequestAndWorkflowId(String sql, String requestId, String workflowId) {
-		String requestIdPattern = "\\{{2}(\\$requestId)?}{2}";
-		String workflowIdIdPattern = "\\{{2}(\\$workflowId)?}{2}";
-		String result = sql.replaceAll(requestIdPattern, StringUtil.isNullOrEmpty(requestId) ? "''" : requestId);
-		result = result.replaceAll(workflowIdIdPattern, StringUtil.isNullOrEmpty(workflowId) ? "''" : workflowId);
-		return result;
-	}
+    public static String parsingSqlByRequestAndWorkflowId(String sql, String requestId, String workflowId) {
+        String requestIdPattern = "\\{{2}(\\$requestId)?}{2}";
+        String workflowIdIdPattern = "\\{{2}(\\$workflowId)?}{2}";
+        String result = sql.replaceAll(requestIdPattern, StringUtil.isNullOrEmpty(requestId) ? "''" : requestId);
+        result = result.replaceAll(workflowIdIdPattern, StringUtil.isNullOrEmpty(workflowId) ? "''" : workflowId);
+        return result;
+    }
 
-	public static String parsingSq(String sql, Map<String, Object> params) {
-		String result = sql;
-		String requestIdPattern = "\\{{2}(\\$requestId)?}{2}";
-		String workflowIdIdPattern = "\\{{2}(\\$workflowId)?}{2}";
-		result = result.replaceAll(requestIdPattern, ObjectUtil.isNull(params.get("requestId")) ? "''" : "'" + params.get("requestId") + "'");
-		result = result.replaceAll(workflowIdIdPattern, ObjectUtil.isNull(params.get("workflowId")) ? "''" : "'" + params.get("workflowId") + "'");
-		for (Map.Entry<String, Object> param : params.entrySet()) {
-			String pattern_ = "#\\{{2}(" + param.getKey() + ")?}{2}";
-			result = result.replaceAll(pattern_, ObjectUtil.isNull(param.getValue()) ? "''" : String.valueOf(param.getValue()));
-			String pattern = "\\{{2}(" + param.getKey() + ")?}{2}";
-			result = result.replaceAll(pattern, ObjectUtil.isNull(param.getValue()) ? "''" : "'" + param.getValue() + "'");
-		}
-		return result;
-	}
+    public static String parsingSq(String sql, Map<String, Object> params) {
+        String result = sql;
+        String requestIdPattern = "\\{{2}(\\$requestId)?}{2}";
+        String workflowIdIdPattern = "\\{{2}(\\$workflowId)?}{2}";
+        result = result.replaceAll(requestIdPattern, ObjectUtil.isNull(params.get("requestId")) ? "''" : "'" + params.get("requestId") + "'");
+        result = result.replaceAll(workflowIdIdPattern, ObjectUtil.isNull(params.get("workflowId")) ? "''" : "'" + params.get("workflowId") + "'");
+        for (Map.Entry<String, Object> param : params.entrySet()) {
+            String pattern_ = "#\\{{2}(" + param.getKey() + ")?}{2}";
+            result = result.replaceAll(pattern_, ObjectUtil.isNull(param.getValue()) ? "''" : String.valueOf(param.getValue()));
+            String pattern = "\\{{2}(" + param.getKey() + ")?}{2}";
+            result = result.replaceAll(pattern, ObjectUtil.isNull(param.getValue()) ? "''" : "'" + param.getValue() + "'");
+        }
+        return result;
+    }
 
-	public static <T> List<T> deWeight(List<T> list, Function<? super T, ?> keyExtractor) {
-		return list.stream().filter(distinctByKey(keyExtractor)).collect(Collectors.toList());
-	}
+    //	去重
+    public static <T> List<T> deWeight(List<T> list, Function<? super T, ?> keyExtractor) {
+        return list.stream().filter(distinctByKey(keyExtractor)).collect(Collectors.toList());
+    }
 
-	private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
-		Map<Object, Boolean> seen = new ConcurrentHashMap<>();
+    //
+    private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
+        Map<Object, Boolean> seen = new ConcurrentHashMap<>();
 //		putIfAbsent添加不存在的键，返回null，如果为null表示不重复
-		return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
-	}
+        return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null;
+    }
 
 
-	public static Map<String, Object> object2Map(Object obj) {
-		if (obj == null) {
-			return null;
-		}
-		Map<String, Object> map = new HashMap<>();
-		try {
-			BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
-			PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
-			for (PropertyDescriptor property : propertyDescriptors) {
-				String key = property.getName();
-				if (key.compareToIgnoreCase("class") == 0) {
-					continue;
-				}
-				Method getter = property.getReadMethod();
-				Object value = getter != null ? getter.invoke(obj) : null;
-				map.put(key, value);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return map;
-	}
+    public static Map<String, Object> object2Map(Object obj) {
+        if (obj == null) {
+            return null;
+        }
+        Map<String, Object> map = new HashMap<>();
+        try {
+            BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
+            PropertyDescriptor[] propertyDescriptors = beanInfo.getPropertyDescriptors();
+            for (PropertyDescriptor property : propertyDescriptors) {
+                String key = property.getName();
+                if (key.compareToIgnoreCase("class") == 0) {
+                    continue;
+                }
+                Method getter = property.getReadMethod();
+                Object value = getter != null ? getter.invoke(obj) : null;
+                map.put(key, value);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return map;
+    }
 
 
-	public static String getWorkflowNameById(String workflowid) {
-		RecordSet rs = new RecordSet();
-		String sql = "select workflowname from workflow_base where id = ?";
-		rs.executeQuery(sql, workflowid);
-		if (rs.next()) {
-			return rs.getString("workflowname");
-		}
-		return "";
-	}
+    public static String getWorkflowNameById(String workflowid) {
+        RecordSet rs = new RecordSet();
+        String sql = "select workflowname from workflow_base where id = ?";
+        rs.executeQuery(sql, workflowid);
+        if (rs.next()) {
+            return rs.getString("workflowname");
+        }
+        return "";
+    }
 
-	public static Object getRequestTitleById(String requestid) {
-		RecordSet rs = new RecordSet();
-		String sql = "select requestnamenew from workflow_requestbase where requestid = ?";
-		rs.executeQuery(sql, requestid);
-		if (rs.next()) {
-			return rs.getString("requestnamenew");
-		}
-		return "";
-	}
+    public static Object getRequestTitleById(String requestid) {
+        RecordSet rs = new RecordSet();
+        String sql = "select requestnamenew from workflow_requestbase where requestid = ?";
+        rs.executeQuery(sql, requestid);
+        if (rs.next()) {
+            return rs.getString("requestnamenew");
+        }
+        return "";
+    }
 
 
-	public static ApiConfigMainDTO queryApiConfig(String id) {
-		ApiConfigMainDTO apiConfigMain = utilService.getApiConfigMain(id);
+    public static ApiConfigMainDTO queryApiConfig(String id) {
+        ApiConfigMainDTO apiConfigMain = utilService.getApiConfigMain(id);
 //		System.out.println(JSON.toJSONString(apiConfigMain));
-		return apiConfigMain;
-	}
+        return apiConfigMain;
+    }
 
-	public static ApiConfigMainDTO queryApiConfigTree(String id) {
-		ApiConfigMainDTO apiConfigMain = utilService.getApiConfigMainTree(id);
+    public static ApiConfigMainDTO queryApiConfigTree(String id) {
+        ApiConfigMainDTO apiConfigMain = utilService.getApiConfigMainTree(id);
 //		System.out.println(JSON.toJSONString(apiConfigMain));
-		return apiConfigMain;
-	}
+        return apiConfigMain;
+    }
 
-	public static <T> AZipOutputStream createZip(List<T> inputList) throws IOException {
-		return createZip(inputList, File.separator);
-	}
+    public static <T> AZipOutputStream createZip(List<T> inputList) throws IOException {
+        return createZip(inputList, File.separator);
+    }
 
-	private static <T> AZipOutputStream createZip(List<T> inputList, String base) throws IOException {
-		FileOutputStream fileOutputStream = null;
+    private static <T> AZipOutputStream createZip(List<T> inputList, String base) throws IOException {
+        FileOutputStream fileOutputStream = null;
 
-		try {
-			File file = new File(AZipOutputStream.filePath);
-			if (!file.exists()) {
-				//先得到文件的上级目录，并创建上级目录，在创建文件
-				file.getParentFile().mkdirs();
-				try {
-					//创建文件
-					file.createNewFile();
-				} catch (IOException ex) {
-					ex.printStackTrace();
-				}
-			}
-			fileOutputStream = new FileOutputStream(file);
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		}
-		if (fileOutputStream == null) {
-			return null;
-		}
-		AZipOutputStream zipOut = new AZipOutputStream(fileOutputStream);
-		int catchLen = 10 * 1024;
-		for (int i = 0; i < inputList.size(); i++) {
-			T item = inputList.get(i);
-			if (item instanceof InputStream) {
+        try {
+            File file = new File(AZipOutputStream.filePath);
+            if (!file.exists()) {
+                //先得到文件的上级目录，并创建上级目录，在创建文件
+                file.getParentFile().mkdirs();
+                try {
+                    //创建文件
+                    file.createNewFile();
+                } catch (IOException ex) {
+                    ex.printStackTrace();
+                }
+            }
+            fileOutputStream = new FileOutputStream(file);
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+        if (fileOutputStream == null) {
+            return null;
+        }
+        AZipOutputStream zipOut = new AZipOutputStream(fileOutputStream);
+        int catchLen = 10 * 1024;
+        for (int i = 0; i < inputList.size(); i++) {
+            T item = inputList.get(i);
+            if (item instanceof InputStream) {
 //				属于单级文件，直接压缩并返回
-				try {
-					zipOut.putNextEntry(new ZipEntry(base + i));
-				} catch (IOException e) {
-					throw new IOException(e.toString());
-				}
-				byte[] buffer = new byte[catchLen];
-				int len = 0;
-				while ((len = ((InputStream) item).read(buffer)) != -1) {
-					zipOut.write(buffer, 0, len);
-				}
-				zipOut.closeEntry();
-			}
-			if (item instanceof AInputStream) {
-				try {
-					zipOut.putNextEntry(new ZipEntry(((AInputStream) item).getFileName()));
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-				byte[] buffer = new byte[catchLen];
-				int len = 0;
-				while ((len = ((AInputStream) item).getInputStream().read(buffer)) != -1) {
-					try {
-						zipOut.write(buffer, 0, len);
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-				}
-				zipOut.closeEntry();
-			}
-			if (item instanceof ListZipEntity) {
-				ListZipEntity listZipEntity = (ListZipEntity) item;
-				if (listZipEntity.isDirectory()) {
+                try {
+                    zipOut.putNextEntry(new ZipEntry(base + i));
+                } catch (IOException e) {
+                    throw new IOException(e.toString());
+                }
+                byte[] buffer = new byte[catchLen];
+                int len = 0;
+                while ((len = ((InputStream) item).read(buffer)) != -1) {
+                    zipOut.write(buffer, 0, len);
+                }
+                zipOut.closeEntry();
+            }
+            if (item instanceof AInputStream) {
+                try {
+                    zipOut.putNextEntry(new ZipEntry(((AInputStream) item).getFileName()));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                byte[] buffer = new byte[catchLen];
+                int len = 0;
+                while ((len = ((AInputStream) item).getInputStream().read(buffer)) != -1) {
+                    try {
+                        zipOut.write(buffer, 0, len);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                }
+                zipOut.closeEntry();
+            }
+            if (item instanceof ListZipEntity) {
+                ListZipEntity listZipEntity = (ListZipEntity) item;
+                if (listZipEntity.isDirectory()) {
 //					表示属于文件夹，循环添加处理文件夹
-					handlerDirectory(listZipEntity.getFileList(), zipOut, base + listZipEntity.getDirectory() + File.separator);
-				} else {
-					List<AInputStream> aInputStreams = listZipEntity.getaInputStreamList();
-					for (AInputStream aInputStream : aInputStreams) {
-						try {
-							zipOut.putNextEntry(new ZipEntry(aInputStream.getFileName()));
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-						byte[] buffer = new byte[catchLen];
-						int len = 0;
-						while ((len = (aInputStream.getInputStream()).read(buffer)) != -1) {
-							try {
-								zipOut.write(buffer, 0, len);
-							} catch (IOException e) {
-								e.printStackTrace();
-							}
-						}
-						zipOut.closeEntry();
-					}
-				}
-			}
-		}
-		return zipOut;
-	}
+                    handlerDirectory(listZipEntity.getFileList(), zipOut, base + listZipEntity.getDirectory() + File.separator);
+                } else {
+                    List<AInputStream> aInputStreams = listZipEntity.getaInputStreamList();
+                    for (AInputStream aInputStream : aInputStreams) {
+                        try {
+                            zipOut.putNextEntry(new ZipEntry(aInputStream.getFileName()));
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        byte[] buffer = new byte[catchLen];
+                        int len = 0;
+                        while ((len = (aInputStream.getInputStream()).read(buffer)) != -1) {
+                            try {
+                                zipOut.write(buffer, 0, len);
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        zipOut.closeEntry();
+                    }
+                }
+            }
+        }
+        return zipOut;
+    }
 
-	private static void handlerDirectory(List<ListZipEntity> fileList, AZipOutputStream zipOut, String base) throws IOException {
-		int catchLen = 10 * 1024;
-		for (ListZipEntity listZipEntity : fileList) {
-			if (listZipEntity.isDirectory()) {
+    private static void handlerDirectory(List<ListZipEntity> fileList, AZipOutputStream zipOut, String base) throws IOException {
+        int catchLen = 10 * 1024;
+        for (ListZipEntity listZipEntity : fileList) {
+            if (listZipEntity.isDirectory()) {
 //			    如果是文件夹
-				handlerDirectory(listZipEntity.getFileList(), zipOut, base + listZipEntity.getDirectory() + File.separator);
-			} else {
-				List<AInputStream> aInputStreams = listZipEntity.getaInputStreamList();
-				for (AInputStream aInputStream : aInputStreams) {
-					try {
-						zipOut.putNextEntry(new ZipEntry(aInputStream.getFileName()));
-					} catch (IOException e) {
-						e.printStackTrace();
-					}
-					byte[] buffer = new byte[catchLen];
-					int len = 0;
-					while ((len = (aInputStream.getInputStream()).read(buffer)) != -1) {
-						try {
-							zipOut.write(buffer, 0, len);
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-					}
-					zipOut.closeEntry();
-				}
-			}
-		}
-	}
+                handlerDirectory(listZipEntity.getFileList(), zipOut, base + listZipEntity.getDirectory() + File.separator);
+            } else {
+                List<AInputStream> aInputStreams = listZipEntity.getaInputStreamList();
+                for (AInputStream aInputStream : aInputStreams) {
+                    try {
+                        zipOut.putNextEntry(new ZipEntry(aInputStream.getFileName()));
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                    byte[] buffer = new byte[catchLen];
+                    int len = 0;
+                    while ((len = (aInputStream.getInputStream()).read(buffer)) != -1) {
+                        try {
+                            zipOut.write(buffer, 0, len);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    zipOut.closeEntry();
+                }
+            }
+        }
+    }
 
-	public static Map<String, String> queryLanguage(int groupId, int languageId) {
-		return utilService.queryLanguage(groupId, languageId);
-	}
+    public static Map<String, String> queryLanguage(int groupId, int languageId) {
+        return utilService.queryLanguage(groupId, languageId);
+    }
 
-	public static Map<String, String> queryLanguage(int groupId, HttpServletRequest request, HttpServletResponse response) {
-		User user = HrmUserVarify.getUser(request, response);
-		int languageId = user.getLanguage();
-		return utilService.queryLanguage(groupId, languageId);
-	}
+    public static Map<String, String> queryLanguage(int groupId, HttpServletRequest request, HttpServletResponse response) {
+        User user = HrmUserVarify.getUser(request, response);
+        int languageId = user.getLanguage();
+        return utilService.queryLanguage(groupId, languageId);
+    }
 
 
-	public static String getHtmlLabelName(int id, int languageId, String defaultStr){
-		String htmlLabelName = SystemEnv.getHtmlLabelName(id, languageId);
-		return  htmlLabelName == null ? defaultStr : htmlLabelName;
-	}
+    public static String getHtmlLabelName(int id, int languageId, String defaultStr) {
+        String htmlLabelName = SystemEnv.getHtmlLabelName(id, languageId);
+        return htmlLabelName == null ? defaultStr : htmlLabelName;
+    }
 
-	public static String getHtmlLabelName(int id, int languageId){
-		return SystemEnv.getHtmlLabelName(id, languageId);
-	}
+    public static String getHtmlLabelName(int id, int languageId) {
+        return SystemEnv.getHtmlLabelName(id, languageId);
+    }
 
 
-	/**
-	 * 获取流程主表
-	 *
-	 * @param workflowId
-	 * @return
-	 */
-	public static String getMainTable(String workflowId) {
-		String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
-		String query = "select tablename from workflow_bill " +
-				" where id in (select formid from workflow_base " +
-				" where id in (" + versionStringByWfid + ") )";
-		rs.executeQuery(query);
-		rs.next();
-		return rs.getString(1);
-	}
+    /**
+     * 获取流程主表
+     *
+     * @param workflowId
+     * @return
+     */
+    public static String getMainTable(String workflowId) {
+        String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+        String query = "select tablename from workflow_bill " +
+                " where id in (select formid from workflow_base " +
+                " where id in (" + versionStringByWfid + ") )";
+        rs.executeQuery(query);
+        rs.next();
+        return rs.getString(1);
+    }
 
 
-	/**
-	 * 根据流程和流程字段查询文档目录
-	 * @param workflowId
-	 * @param docField
-	 * @return
-	 */
-	public static String getDocCategorys(String workflowId,String docField){
-		RecordSet rs = new RecordSet();
-		rs.executeQuery("select formid from workflow_base where id = ?",workflowId);
-		String formId = Util.recordeSet2Entity(rs, String.class);
-		String query = "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
-		rs.executeQuery(query,docField,formId);
-		String docCategorys =Util.null2String(Util.recordeSet2Entity(rs, String.class));
-		if(StringUtils.isNullOrEmpty(docCategorys)){
-			query = "select doccategory from workflow_base where id = ?";
-			rs.executeQuery(query,workflowId);
-			rs.next();
-			docCategorys = Util.null2String(rs.getString(1));
-		}
-		if(StringUtils.isNullOrEmpty(docCategorys)){
-			docCategorys = ",,1";
-		}
-		return docCategorys;
-	}
+    /**
+     * 根据流程和流程字段查询文档目录
+     *
+     * @param workflowId
+     * @param docField
+     * @return
+     */
+    public static String getDocCategorys(String workflowId, String docField) {
+        RecordSet rs = new RecordSet();
+        rs.executeQuery("select formid from workflow_base where id = ?", workflowId);
+        String formId = Util.recordeSet2Entity(rs, String.class);
+        String query = "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
+        rs.executeQuery(query, docField, formId);
+        String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
+        if (StringUtils.isNullOrEmpty(docCategorys)) {
+            query = "select doccategory from workflow_base where id = ?";
+            rs.executeQuery(query, workflowId);
+            rs.next();
+            docCategorys = Util.null2String(rs.getString(1));
+        }
+        if (StringUtils.isNullOrEmpty(docCategorys)) {
+            docCategorys = ",,1";
+        }
+        return docCategorys;
+    }
 
-	/**
-	 * 根据流程和流程字段查询文档目录
-	 * @param workflowId
-	 * @param docFieldId
-	 * @return
-	 */
-	public static String getDocCategorysById(String workflowId,String docFieldId){
-		RecordSet rs = new RecordSet();
+    /**
+     * 根据流程和流程字段查询文档目录
+     *
+     * @param workflowId
+     * @param docFieldId
+     * @return
+     */
+    public static String getDocCategorysById(String workflowId, String docFieldId) {
+        RecordSet rs = new RecordSet();
 //		rs.executeQuery("select formid from workflow_base where id = ?",workflowId);
 //		String formId = Util.recordeSet2Entity(rs, String.class);
-		String query = "select doccategory from workflow_fileupload where workflowid = ? and fieldid = ?";
-		rs.executeQuery(query,workflowId,docFieldId);
-		String docCategorys =Util.null2String(Util.recordeSet2Entity(rs, String.class));
-		if(StringUtils.isNullOrEmpty(docCategorys)){
-			query = "select doccategory from workflow_base where id = ?";
-			rs.executeQuery(query,workflowId);
-			rs.next();
-			docCategorys = Util.null2String(rs.getString(1));
-		}
-		if(StringUtils.isNullOrEmpty(docCategorys)){
-			docCategorys = ",,1";
-		}
-		return docCategorys;
-	}
+        String query = "select doccategory from workflow_fileupload where workflowid = ? and fieldid = ?";
+        rs.executeQuery(query, workflowId, docFieldId);
+        String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
+        if (StringUtils.isNullOrEmpty(docCategorys)) {
+            query = "select doccategory from workflow_base where id = ?";
+            rs.executeQuery(query, workflowId);
+            rs.next();
+            docCategorys = Util.null2String(rs.getString(1));
+        }
+        if (StringUtils.isNullOrEmpty(docCategorys)) {
+            docCategorys = ",,1";
+        }
+        return docCategorys;
+    }
 
-	public static String null2DefaultStr(Object obj, String defaultStr){
-		String objStr = Util.null2String(obj);
-		if(StringUtils.isNullOrEmpty(objStr) && StringUtils.isNullOrEmpty(defaultStr)){
-			return "";
-		}
-		if(StringUtils.isNullOrEmpty(objStr) && !StringUtils.isNullOrEmpty(defaultStr)){
-			return defaultStr;
-		}
-		return objStr;
-	}
+    public static String null2DefaultStr(Object obj, String defaultStr) {
+        String objStr = Util.null2String(obj);
+        if (StringUtils.isNullOrEmpty(objStr) && StringUtils.isNullOrEmpty(defaultStr)) {
+            return "";
+        }
+        if (StringUtils.isNullOrEmpty(objStr) && !StringUtils.isNullOrEmpty(defaultStr)) {
+            return defaultStr;
+        }
+        return objStr;
+    }
 
 
-	public static <T>  T mapToObject(Map<String, Object> map, Class<T> t) throws Exception {
-		if (map == null) {
-			return null;
-		}
-		T obj = t.newInstance();
-		Field[] fields = obj.getClass().getDeclaredFields();
-		for (Field field : fields) {
-			int mod = field.getModifiers();
-			if (Modifier.isStatic(mod) || Modifier.isFinal(mod)) {
-				continue;
-			}
-			field.setAccessible(true);
-			if (map.containsKey(field.getName())) {
-				field.set(obj, map.get(field.getName()));
-			}
-		}
-		return obj;
-	}
+    public static <T> T mapToObject(Map<String, Object> map, Class<T> t) throws Exception {
+        if (map == null) {
+            return null;
+        }
+        T obj = t.newInstance();
+        Field[] fields = obj.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            int mod = field.getModifiers();
+            if (Modifier.isStatic(mod) || Modifier.isFinal(mod)) {
+                continue;
+            }
+            field.setAccessible(true);
+            if (field.getType().equals(String.class)) {
+                if (map.containsKey(field.getName())) {
+                    if (map.get(field.getName()) == null) {
+                        field.set(obj, null);
+                    } else {
+                        field.set(obj, String.valueOf(map.get(field.getName())));
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(Integer.class)) {
+                if (map.containsKey(field.getName())) {
+                    if (map.get(field.getName()) == null || "".equals(map.get(field.getName()))) {
+                        field.set(obj, null);
+                    } else {
+                        field.set(obj, Integer.valueOf(String.valueOf(map.get(field.getName()))));
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(Boolean.class)) {
+                if (map.containsKey(field.getName())) {
+                    if (map.get(field.getName()) == null || "".equals(map.get(field.getName()))) {
+                        field.set(obj, null);
+                    } else {
+                        field.set(obj, Boolean.valueOf(String.valueOf(map.get(field.getName()))));
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(Float.class)) {
+                if (map.containsKey(field.getName())) {
+                    if (map.get(field.getName()) == null || "".equals(map.get(field.getName()))) {
+                        field.set(obj, null);
+                    } else {
+                        field.set(obj, Float.valueOf(String.valueOf(map.get(field.getName()))));
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(Double.class)) {
+                if (map.containsKey(field.getName())) {
+                    if (map.get(field.getName()) == null || "".equals(map.get(field.getName()))) {
+                        field.set(obj, null);
+                    } else {
+                        field.set(obj, Double.valueOf(String.valueOf(map.get(field.getName()))));
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(int.class)) {
+                if (map.containsKey(field.getName())) {
+                    if (map.get(field.getName()) == null || "".equals(map.get(field.getName()))) {
+                        field.set(obj, null);
+                    } else {
+                        field.set(obj, Integer.parseInt(String.valueOf(map.get(field.getName()))));
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(float.class)) {
+                if (map.containsKey(field.getName())) {
+                    if (map.get(field.getName()) == null || "".equals(map.get(field.getName()))) {
+                        field.set(obj, null);
+                    } else {
+                        field.set(obj, Float.parseFloat(String.valueOf(map.get(field.getName()))));
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(double.class)) {
+                if (map.containsKey(field.getName())) {
+                    if (map.get(field.getName()) == null || "".equals(map.get(field.getName()))) {
+                        field.set(obj, null);
+                    } else {
+                        field.set(obj, Double.parseDouble(String.valueOf(map.get(field.getName()))));
+                    }
+                }
+                continue;
+            }
+            if (field.getType().equals(boolean.class)) {
+                if (map.containsKey(field.getName())) {
+                    if (map.get(field.getName()) == null || "".equals(map.get(field.getName()))) {
+                        field.set(obj, null);
+                    } else {
+                        field.set(obj, Boolean.parseBoolean(String.valueOf(map.get(field.getName()))));
+                    }
+                }
+                continue;
+            }
+        }
+        return obj;
+    }
+
+    public static <T> T strMapToObject(Map<String, String> map, Class<T> t) throws Exception {
+        if (map == null) {
+            return null;
+        }
+        T obj = t.newInstance();
+        Field[] fields = obj.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            int mod = field.getModifiers();
+            if (Modifier.isStatic(mod) || Modifier.isFinal(mod)) {
+                continue;
+            }
+            field.setAccessible(true);
+            if (map.containsKey(field.getName())) {
+                field.set(obj, map.get(field.getName()));
+            }
+        }
+        return obj;
+    }
 }
diff --git a/aiyh/utils/entity/LabelHtmlIndex.java b/aiyh/utils/entity/LabelHtmlIndex.java
new file mode 100644
index 0000000..2c2f7ca
--- /dev/null
+++ b/aiyh/utils/entity/LabelHtmlIndex.java
@@ -0,0 +1,39 @@
+package aiyh.utils.entity;
+
+/**
+ * @author EBU7-dev1-ayh
+ * create 2021/12/13 0013 11:19
+ */
+
+
+public class LabelHtmlIndex {
+    private Integer labelIndex;
+    private String defaultStr;
+
+    public LabelHtmlIndex() {
+
+    }
+
+    public LabelHtmlIndex(Integer labelIndex, String defaultStr) {
+        this.labelIndex = labelIndex;
+        this.defaultStr = defaultStr;
+    }
+
+    public Integer getLabelIndex() {
+        return labelIndex;
+    }
+
+
+    public String getDefaultStr() {
+        return defaultStr;
+    }
+
+
+    @Override
+    public String toString() {
+        return "LabelHtmlIndex{" +
+                "labelIndex='" + labelIndex + '\'' +
+                ", defaultStr='" + defaultStr + '\'' +
+                '}';
+    }
+}
diff --git a/com/api/aiyh_pcn/copy_attachment/service/CopyAttachmentService.java b/com/api/aiyh_pcn/copy_attachment/service/CopyAttachmentService.java
index e5e31bb..2a42a12 100644
--- a/com/api/aiyh_pcn/copy_attachment/service/CopyAttachmentService.java
+++ b/com/api/aiyh_pcn/copy_attachment/service/CopyAttachmentService.java
@@ -1,10 +1,10 @@
 package com.api.aiyh_pcn.copy_attachment.service;
 
+import aiyh.utils.ApiResult;
 import aiyh.utils.zwl.common.ToolUtil;
+import com.api.aiyh_pcn.copy_attachment.dao.DocTemplateDao;
 import com.api.workflow.constant.RequestAuthenticationConstant;
 import com.engine.workflow.biz.requestForm.FileBiz;
-import aiyh.utils.ApiResult;
-import com.api.aiyh_pcn.copy_attachment.dao.DocTemplateDao;
 import weaver.general.Util;
 import weaver.hrm.User;
 
@@ -19,80 +19,81 @@ import java.util.Map;
  */
 
 
-public class CopyAttachmentService  {
-	public static String copyFile(User user, Map<String, Object> params){
-		ToolUtil toolUtil = new ToolUtil();
+public class CopyAttachmentService {
+    public static String copyFile(User user, Map<String, Object> params) {
+        ToolUtil toolUtil = new ToolUtil();
 //		建模表名称
-		String tableName = String.valueOf(params.get("tableName"));
+        String tableName = String.valueOf(params.get("tableName"));
 //		建模字段名
-		String fieldName = String.valueOf(params.get("fieldName"));
+        String fieldName = String.valueOf(params.get("fieldName"));
 //		附件字段id
-		String fileFieldId = String.valueOf(params.get("fileFieldId"));
+        String fileFieldId = String.valueOf(params.get("fileFieldId"));
 //		配置id
-		String configId = String.valueOf(params.get("configId"));
+        String configId = String.valueOf(params.get("configId"));
 //		流程id
-		String workflowId = String.valueOf(params.get("workflowId"));
-		DocTemplateDao docTemplateDao = new DocTemplateDao();
-		int[] docIds = null;
-		try{
+        String workflowId = String.valueOf(params.get("workflowId"));
+        DocTemplateDao docTemplateDao = new DocTemplateDao();
+        int[] docIds = null;
+        try {
 //			docIds = docTemplateDao.copyFile(user.getUID(), tableName, fieldName, configId);
-			docIds = docTemplateDao.copyFile(user, tableName, fieldName, configId,workflowId,fileFieldId);
-		}catch(Exception e){
-			toolUtil.writeErrorLog("复制文件出错： " + e);
-			return null;
-		}
-		if(docIds == null){
-			return ApiResult.error("未查询到附件模板！");
-		}
+            docIds = docTemplateDao.copyFile(user, tableName, fieldName, configId, workflowId, fileFieldId);
+        } catch (Exception e) {
+            toolUtil.writeErrorLog("复制文件出错： " + e);
+            return ApiResult.error("复制文件出错！");
+        }
+        if (docIds == null) {
+            return ApiResult.error("未查询到附件模板！");
+        }
 		/*try{
 			docTemplateDao.updateFileInfo(workflowId,fileFieldId,docIds);
 		}catch(Exception e){
 		   toolUtil.writeErrorLog("复制文件更新权限和目录出错： " + e);
 			return null;
 		}*/
-		toolUtil.writeDebuggerLog("数据更新成功！" + Arrays.toString(docIds));
-		return ApiResult.success(docIds);
-	}
+        toolUtil.writeDebuggerLog("数据更新成功！" + Arrays.toString(docIds));
+        return ApiResult.success(docIds);
+    }
 
-	public static String deleteFile(String docIdStr) {
-		String[] docIds = docIdStr.split(",");
-		DocTemplateDao docTemplateDao = new DocTemplateDao();
-		int[] array = Arrays.stream(docIds).mapToInt(Integer::parseInt).toArray();
-		try {
-			docTemplateDao.deleteFile(array);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return ApiResult.error("删除失败！");
-		}
-		return ApiResult.success(array,"删除成功！");
-	}
+    public static String deleteFile(String docIdStr) {
+        String[] docIds = docIdStr.split(",");
+        DocTemplateDao docTemplateDao = new DocTemplateDao();
+        int[] array = Arrays.stream(docIds).mapToInt(Integer::parseInt).toArray();
+        try {
+            docTemplateDao.deleteFile(array);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ApiResult.error("删除失败！");
+        }
+        return ApiResult.success(array, "删除成功！");
+    }
 
-	/**
-	 * 查询文档信息
-	 * @param user user对象
-	 * @param params 前端参数
-	 * @return 文档信息
-	 */
-	public static String queryFilesData(User user, Map<String, Object> params){
-		String listType = Util.null2String(String.valueOf(params.get("listType")),"list");
-		int requestid = Util.getIntValue(Util.null2String(String.valueOf(params.get("requestid"))), -1);
-		int desrequestid = Util.getIntValue(Util.null2String(String.valueOf(params.get("desrequestid"))), -1);
-		int isprint = Util.getIntValue(Util.null2String(String.valueOf(params.get("isprint"))), 0);
-		int workflowid = Util.getIntValue(Util.null2String(String.valueOf(params.get("workflowid"))), 0);
-		String f_weaver_belongto_userid = Util.null2String(String.valueOf(params.get("f_weaver_belongto_userid")));
-		String f_weaver_belongto_usertype = Util.null2String(String.valueOf(params.get("f_weaver_belongto_usertype")));
-		String authStr = Util.null2String(String.valueOf(params.get(RequestAuthenticationConstant.AUTHORITY_STRING)));
-		String authSignatureStr = Util.null2String(String.valueOf(params.get(RequestAuthenticationConstant.AUTHORITY_SIGNATURESTRING)));
-		Map<String,Object> paramsMap = new HashMap<>();
-		paramsMap.put("user",user);
-		Map<String,Object> retobj;
-		try {
-			retobj = FileBiz.getFileDatas(Util.null2String(params.get("docIds")),listType,requestid,desrequestid,
-					isprint,f_weaver_belongto_userid,f_weaver_belongto_usertype,true,false,authStr,authSignatureStr,paramsMap);
-		} catch (Exception e) {
-			e.printStackTrace();
-			return ApiResult.error("查询附件信息失败：" + e);
-		}
-		return ApiResult.success(retobj);
-	}
+    /**
+     * 查询文档信息
+     *
+     * @param user   user对象
+     * @param params 前端参数
+     * @return 文档信息
+     */
+    public static String queryFilesData(User user, Map<String, Object> params) {
+        String listType = Util.null2String(String.valueOf(params.get("listType")), "list");
+        int requestid = Util.getIntValue(Util.null2String(String.valueOf(params.get("requestid"))), -1);
+        int desrequestid = Util.getIntValue(Util.null2String(String.valueOf(params.get("desrequestid"))), -1);
+        int isprint = Util.getIntValue(Util.null2String(String.valueOf(params.get("isprint"))), 0);
+        int workflowid = Util.getIntValue(Util.null2String(String.valueOf(params.get("workflowid"))), 0);
+        String f_weaver_belongto_userid = Util.null2String(String.valueOf(params.get("f_weaver_belongto_userid")));
+        String f_weaver_belongto_usertype = Util.null2String(String.valueOf(params.get("f_weaver_belongto_usertype")));
+        String authStr = Util.null2String(String.valueOf(params.get(RequestAuthenticationConstant.AUTHORITY_STRING)));
+        String authSignatureStr = Util.null2String(String.valueOf(params.get(RequestAuthenticationConstant.AUTHORITY_SIGNATURESTRING)));
+        Map<String, Object> paramsMap = new HashMap<>();
+        paramsMap.put("user", user);
+        Map<String, Object> retobj;
+        try {
+            retobj = FileBiz.getFileDatas(Util.null2String(params.get("docIds")), listType, requestid, desrequestid,
+                    isprint, f_weaver_belongto_userid, f_weaver_belongto_usertype, true, false, authStr, authSignatureStr, paramsMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ApiResult.error("查询附件信息失败：" + e);
+        }
+        return ApiResult.success(retobj);
+    }
 }
diff --git a/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java b/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java
index e65d67c..40484ea 100644
--- a/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java
+++ b/com/api/aiyh_pcn/fadada/service/impl/FaDDContractService.java
@@ -39,441 +39,443 @@ import java.util.zip.ZipOutputStream;
  * @create 2021/11/3 0003 14:51
  */
 public class FaDDContractService {
-  private final ToolUtil toolUtil = new ToolUtil();
-  private final String contractInfoTable = "uf_contract_info";
-  private final FaDDContractMapping faDDContractMapping = new FaDDContractMapping();
+    private final ToolUtil toolUtil = new ToolUtil();
+    private final String contractInfoTable = "uf_contract_info";
+    private final FaDDContractMapping faDDContractMapping = new FaDDContractMapping();
 
-  /**
-   * 获取全版本的流程id，节点id
-   *
-   * @param workflowId
-   * @return
-   */
-  public Map<String, Object> getAllVersion(String workflowId) {
-    String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
-    String newWorkflowId = faDDContractMapping.getAllVersion(versionStringByWfid);
-    String allVersion = WorkflowVersion.getVersionStringByWfid(newWorkflowId);
-    if (allVersion == null) {
-      allVersion = "";
+    /**
+     * 获取全版本的流程id，节点id
+     *
+     * @param workflowId
+     * @return
+     */
+    public Map<String, Object> getAllVersion(String workflowId) {
+        String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+        String newWorkflowId = faDDContractMapping.getAllVersion(versionStringByWfid);
+        String allVersion = WorkflowVersion.getVersionStringByWfid(newWorkflowId);
+        if (allVersion == null) {
+            allVersion = "";
+        }
+        String[] split = allVersion.split(",");
+        Map<String, Object> data = new HashMap<>();
+        String[] nodes = this.getNodes(workflowId);
+        data.put("workflowIds", split);
+        data.put("nodeIds", nodes);
+        return data;
     }
-    String[] split = allVersion.split(",");
-    Map<String, Object> data = new HashMap<>();
-    String[] nodes = this.getNodes(workflowId);
-    data.put("workflowIds", split);
-    data.put("nodeIds", nodes);
-    return data;
-  }
 
-  /**
-   * 获取节点id
-   *
-   * @param workflowId
-   * @return
-   */
-  public String[] getNodes(String workflowId) {
-    String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
-    String nods = faDDContractMapping.getNodes(versionStringByWfid);
-    if (nods == null) {
-      nods = "";
+    /**
+     * 获取节点id
+     *
+     * @param workflowId
+     * @return
+     */
+    public String[] getNodes(String workflowId) {
+        String versionStringByWfid = WorkflowVersion.getVersionStringByWfid(workflowId);
+        String nods = faDDContractMapping.getNodes(versionStringByWfid);
+        if (nods == null) {
+            nods = "";
+        }
+        return nods.split(",");
     }
-    return nods.split(",");
-  }
 
-  /**
-   * 获取替换SQL的数据
-   *
-   * @param requestId
-   * @param workflowId
-   * @param mainTableName
-   * @param tableName
-   * @return
-   */
-  public List<Map<String, Object>> getDataArr(
-      String requestId, String workflowId, String mainTableName, String tableName) {
-    Map<String, Object> mainMap = faDDContractMapping.queryMainMap(requestId, mainTableName);
-    String mainId = Util.null2String(mainMap.get("id"));
-    List<Map<String, Object>> detailMaps = faDDContractMapping.queryDetailMaps(mainId, tableName);
-    return getDataArr(requestId, workflowId, tableName, mainMap, detailMaps);
-  }
-
-  public List<Map<String, Object>> getDataArr(
-      String requestId,
-      String workflowId,
-      String mainTableName,
-      String tableName,
-      List<Map<String, Object>> detailMaps) {
-    Map<String, Object> mainMap = faDDContractMapping.queryMainMap(requestId, mainTableName);
-    String mainId = Util.null2String(mainMap.get("id"));
-    return getDataArr(requestId, workflowId, tableName, mainMap, detailMaps);
-  }
-
-  public List<Map<String, Object>> getDataArr(
-      String requestId,
-      String workflowId,
-      String tableName,
-      Map<String, Object> mainMap,
-      List<Map<String, Object>> detailMaps) {
-    List<Map<String, Object>> dataArr = new ArrayList<>();
-    String dt = tableName.substring(tableName.indexOf("_dt") + 3);
-    String main = "main.";
-    String detail = "detail_" + dt + ".";
-    for (Map<String, Object> detailMap : detailMaps) {
-      Map<String, Object> data = new HashMap<>();
-      for (Map.Entry<String, Object> entry : mainMap.entrySet()) {
-        data.put(main + entry.getKey(), entry.getValue());
-      }
-      for (Map.Entry<String, Object> entry : detailMap.entrySet()) {
-        data.put(detail + entry.getKey(), entry.getValue());
-      }
-      data.put("requestId", requestId);
-      data.put("workflowId", workflowId);
-      dataArr.add(data);
+    /**
+     * 获取替换SQL的数据
+     *
+     * @param requestId
+     * @param workflowId
+     * @param mainTableName
+     * @param tableName
+     * @return
+     */
+    public List<Map<String, Object>> getDataArr(
+            String requestId, String workflowId, String mainTableName, String tableName) {
+        Map<String, Object> mainMap = faDDContractMapping.queryMainMap(requestId, mainTableName);
+        String mainId = Util.null2String(mainMap.get("id"));
+        List<Map<String, Object>> detailMaps = faDDContractMapping.queryDetailMaps(mainId, tableName);
+        return getDataArr(requestId, workflowId, tableName, mainMap, detailMaps);
     }
-    return dataArr;
-  }
 
-  /**
-   * 获取处理object和List类型后的参数
-   *
-   * @param treeList
-   * @param dataArr
-   * @return
-   */
-  public List<Map<String, Object>> objectAndListHandle(
-      List<ApiConfigDetailDTO> treeList, List<Map<String, Object>> dataArr) {
-    List<Map<String, Object>> params = new ArrayList<>();
-    for (Map<String, Object> dataMap : dataArr) {
-      Map<String, Object> param = new HashMap<>();
-      for (ApiConfigDetailDTO apiConfigDetailDTO : treeList) {
-        Object value;
-        if (apiConfigDetailDTO.getParamType() == 3) {
-          Map<String, Object> map = new HashMap<>();
-          //                  object类型
-          for (ApiConfigDetailDTO child : apiConfigDetailDTO.getChildren()) {
-            if (child.getChildren() == null || child.getChildren().size() == 0) {
-              //							  handleChild(child.getChildren(), dataMap)
-              map.put(child.getParamName(), changeRuleHandle(child, dataMap));
-            } else {
-              map.put(child.getParamName(), handleChild(child.getChildren(), dataMap));
+    public List<Map<String, Object>> getDataArr(
+            String requestId,
+            String workflowId,
+            String mainTableName,
+            String tableName,
+            List<Map<String, Object>> detailMaps) {
+        Map<String, Object> mainMap = faDDContractMapping.queryMainMap(requestId, mainTableName);
+        String mainId = Util.null2String(mainMap.get("id"));
+        return getDataArr(requestId, workflowId, tableName, mainMap, detailMaps);
+    }
+
+    public List<Map<String, Object>> getDataArr(
+            String requestId,
+            String workflowId,
+            String tableName,
+            Map<String, Object> mainMap,
+            List<Map<String, Object>> detailMaps) {
+        List<Map<String, Object>> dataArr = new ArrayList<>();
+        String dt = tableName.substring(tableName.indexOf("_dt") + 3);
+        String main = "main.";
+        String detail = "detail_" + dt + ".";
+        for (Map<String, Object> detailMap : detailMaps) {
+            Map<String, Object> data = new HashMap<>();
+            for (Map.Entry<String, Object> entry : mainMap.entrySet()) {
+                data.put(main + entry.getKey(), entry.getValue());
+            }
+            for (Map.Entry<String, Object> entry : detailMap.entrySet()) {
+                data.put(detail + entry.getKey(), entry.getValue());
+            }
+            data.put("requestId", requestId);
+            data.put("workflowId", workflowId);
+            dataArr.add(data);
+        }
+        return dataArr;
+    }
+
+    /**
+     * 获取处理object和List类型后的参数
+     *
+     * @param treeList
+     * @param dataArr
+     * @return
+     */
+    public List<Map<String, Object>> objectAndListHandle(
+            List<ApiConfigDetailDTO> treeList, List<Map<String, Object>> dataArr) {
+        List<Map<String, Object>> params = new ArrayList<>();
+        for (Map<String, Object> dataMap : dataArr) {
+            Map<String, Object> param = new HashMap<>();
+            for (ApiConfigDetailDTO apiConfigDetailDTO : treeList) {
+                Object value;
+                if (apiConfigDetailDTO.getParamType() == 3) {
+                    Map<String, Object> map = new HashMap<>();
+                    //                  object类型
+                    for (ApiConfigDetailDTO child : apiConfigDetailDTO.getChildren()) {
+                        if (child.getChildren() == null || child.getChildren().size() == 0) {
+                            //							  handleChild(child.getChildren(), dataMap)
+                            map.put(child.getParamName(), changeRuleHandle(child, dataMap));
+                        } else {
+                            map.put(child.getParamName(), handleChild(child.getChildren(), dataMap));
+                        }
+                    }
+                    value = map;
+                } else if (apiConfigDetailDTO.getParamType() == 4) {
+                    String sql = apiConfigDetailDTO.getArraySql();
+                    String parsingSq = aiyh.utils.Util.parsingSq(sql, dataMap);
+                    //				    list类型
+                    if (parsingSq.contains("delete")
+                            || parsingSq.contains("update")
+                            || parsingSq.contains("exec")
+                            || parsingSq.contains("drop")
+                            || parsingSq.contains("truncate")) {
+                        value = new ArrayList<>();
+                    } else {
+                        RecordSet rs = new RecordSet();
+                        String replace =
+                                parsingSq
+                                        .replace("ｓｅｌｅｃｔ ", "select ")
+                                        .replaceAll(" ａｎｄ ", " and ")
+                                        .replaceAll(" ｏｒ ", " or ")
+                                        .replaceAll(" ｊｏｉｎ ", " join ")
+                                        .replaceAll(" ｉｎ ", " in ");
+                        rs.executeQuery(replace);
+                        value = aiyh.utils.Util.recordeSet2Array(rs, String.class);
+                    }
+                } else {
+                    value = changeRuleHandle(apiConfigDetailDTO, dataMap);
+                }
+                param.put(apiConfigDetailDTO.getParamName(), value);
+            }
+            params.add(param);
+        }
+        return params;
+    }
+
+    /**
+     * 处理子类
+     *
+     * @param children
+     * @param dataMap
+     * @return
+     */
+    private Object handleChild(List<ApiConfigDetailDTO> children, Map<String, Object> dataMap) {
+        Map<String, Object> params = new HashMap<>();
+        for (ApiConfigDetailDTO child : children) {
+            Object value;
+            if (child.getChildren() != null) {
+                value = handleChild(child.getChildren(), dataMap);
+            } else {
+                value = changeRuleHandle(child, dataMap);
+            }
+            params.put(child.getParamName(), value);
+        }
+        return params;
+    }
+
+    /**
+     * 根据转换规则生成对应的参数值
+     *
+     * @param apiConfigDetailDTO
+     * @param dataMap
+     * @return
+     */
+    private Object changeRuleHandle(
+            ApiConfigDetailDTO apiConfigDetailDTO, Map<String, Object> dataMap) {
+        Object value;
+        String tableName;
+        String table;
+        String sql;
+        String resultSql;
+        //			判断参数的转换规则
+        switch (apiConfigDetailDTO.getChangeRule()) {
+            case 0:
+                //					不转换
+            case 2:
+                //					流程字段值
+                table = apiConfigDetailDTO.getTablename();
+                if (!table.contains("_dt")) {
+                    //			        表示字段属于主表
+                    tableName = "main";
+                } else {
+                    //			        字段属于明细表
+                    String dt = table.substring(table.indexOf("_dt") + 3);
+                    tableName = "detail_" + dt;
+                }
+                value = dataMap.get(tableName + "." + apiConfigDetailDTO.getWorkflowField());
+                break;
+            case 1:
+                //					固定值
+                value = apiConfigDetailDTO.getParamValue();
+                break;
+            case 3:
+                //					系统日期
+                value = aiyh.utils.Util.getTime("yyyy-MM-dd");
+                break;
+            case 4:
+                //					系统时间
+                value = aiyh.utils.Util.getTime("HH:mm:ss");
+                break;
+            case 5:
+                //					系统日期-时间
+                value = aiyh.utils.Util.getTime("yyyy-MM-dd HH:mm:ss");
+                break;
+            case 6:
+                //					自定义SQL
+            case 7:
+                //					流程字段转SQL
+                sql = apiConfigDetailDTO.getParamValue();
+                resultSql = aiyh.utils.Util.parsingSq(sql, dataMap);
+                if (resultSql.contains("delete ")
+                        || resultSql.contains("update ")
+                        || resultSql.contains("exec ")
+                        || resultSql.contains("drop ")
+                        || resultSql.contains("truncate ")) {
+                    value = null;
+                } else {
+                    RecordSet rs = new RecordSet();
+                    String replace =
+                            resultSql
+                                    .replace("ｓｅｌｅｃｔ ", "select ")
+                                    .replaceAll(" ａｎｄ ", " and ")
+                                    .replaceAll(" ｏｒ ", " or ")
+                                    .replaceAll(" ｊｏｉｎ ", " join ")
+                                    .replaceAll(" ｉｎ ", " in ");
+                    rs.executeQuery(replace);
+                    rs.next();
+                    value = aiyh.utils.Util.null2String(rs.getString(1));
+                }
+                break;
+            case 8:
+                //
+                //					流程名称
+                value = aiyh.utils.Util.getWorkflowNameById(String.valueOf(dataMap.get("workflowid")));
+                break;
+            case 9:
+                //
+                //					请求标题
+                value = aiyh.utils.Util.getRequestTitleById(String.valueOf(dataMap.get("requestid")));
+                break;
+            case 10:
+                //					流程requestId
+                value = dataMap.get("requestid");
+                break;
+            default:
+                value = null;
+                break;
+        }
+        if (apiConfigDetailDTO.getParamType() == 1) {
+            //			Integer
+            value = Integer.parseInt(String.valueOf(value));
+        } else if (apiConfigDetailDTO.getParamType() == 2) {
+            //          Boolean
+            value = Boolean.parseBoolean(String.valueOf(value));
+        }
+        return value;
+    }
+
+    /**
+     * 合同签署回调逻辑处理
+     *
+     * @param contractNo
+     */
+    public void signedCallBack(String contractNo) {
+        //		查询合同信息表中的数据
+        UfContractInfoDTO ufContractInfoDTO = faDDContractMapping.queryContractInfo(contractNo);
+        toolUtil.writeDebuggerLog("回调，获取到合同信息参数：" + JSON.toJSONString(ufContractInfoDTO));
+        Map<String, Object> update = new HashMap<>();
+        if (ufContractInfoDTO.getQueueSigned() == 1) {
+            //			属于顺序签署合同,更新单份合同已签蜀几个文件
+            update.put("single_signed_num", ufContractInfoDTO.getSingleSignedNum() + 1);
+            toolUtil.writeDebuggerLog("单份合同签署成功");
+            //			如果单份合同签署数量等于合同文件数量，表示已经签署完成
+            if (ufContractInfoDTO.getSingleSignedNum() + 1
+                    == ufContractInfoDTO.getSingleContractFileNum()) {
+                toolUtil.writeDebuggerLog("单份合同全部签署成功");
+                update.put("signed_num", ufContractInfoDTO.getSignedNum() + 1);
+                //				查询下一位合同方并发起签署
+                if (ufContractInfoDTO.getSignedNum() + 1 < ufContractInfoDTO.getShouldSignedNum()) {
+                    toolUtil.writeDebuggerLog(
+                            "应签署合同比签署合同数量多，需要再次签署！" + (ufContractInfoDTO.getSignedNum() + 1));
+                    update.put("single_signed_num", 0);
+                    nextContractSigned(ufContractInfoDTO);
+                }
+            }
+            //			如果合同已签数量和应签数量相同，则状态为本方待签
+            if (ufContractInfoDTO.getSignedNum() + 1 == ufContractInfoDTO.getShouldSignedNum()) {
+                update.put("contract_status", 3);
+                //		判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署
+                if ("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
+                    update.put("contract_status", 4);
+                }
+                if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
+                    update.put("contract_status", 4);
+                    //					 仅对方签署完成后，添加用户信息
+                    //		        获取配置表信息
+                    FaDaDaConfigDTO faDaDaConfigDTO =
+                            faDDContractMapping.queryConfig(
+                                    String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
+                    RecordSet rs = new RecordSet();
+                    String userInfo = ufContractInfoDTO.getUserInfo();
+                    User user = JSON.parseObject(userInfo, new TypeReference<User>() {
+                    });
+                    //		获取流程中的合同字段的文档目录id
+                    rs.executeQuery(
+                            "select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
+                    String formId = Util.recordeSet2Entity(rs, String.class);
+                    String query =
+                            "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
+                    rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
+                    String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
+                    if (StringUtils.isNullOrEmpty(docCategorys)) {
+                        query = "select doccategory from workflow_base where id = ?";
+                        rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
+                        rs.next();
+                        docCategorys = Util.null2String(rs.getString(1));
+                    }
+                    if (StringUtils.isNullOrEmpty(docCategorys)) {
+                        docCategorys = ",,1";
+                    }
+                    //		            String[] docSplit = docCategorys.split(",");
+                    //		            String category = docSplit[docSplit.length - 1];
+                    //		            下载合同到文件服务器中
+                    String docIds = "";
+                    try {
+                        docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
+                    } catch (Exception e) {
+                        toolUtil.writeErrorLog("创建文档发生错误：" + e);
+                    }
+                    toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
+                    //		             将id保存到流程字段中
+                    PrepSqlResultImpl sqlResult =
+                            Util.createSqlBuilder()
+                                    .updateSql(
+                                            ufContractInfoDTO.getWorkflowMainTable(),
+                                            ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
+                                            Util.createPrepWhereImpl()
+                                                    .whereAnd("id")
+                                                    .whereEqual(ufContractInfoDTO.getMainId()));
+                    toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+                    rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+                }
             }
-          }
-          value = map;
-        } else if (apiConfigDetailDTO.getParamType() == 4) {
-          String sql = apiConfigDetailDTO.getArraySql();
-          String parsingSq = aiyh.utils.Util.parsingSq(sql, dataMap);
-          //				    list类型
-          if (parsingSq.contains("delete")
-              || parsingSq.contains("update")
-              || parsingSq.contains("exec")
-              || parsingSq.contains("drop")
-              || parsingSq.contains("truncate")) {
-            value = new ArrayList<>();
-          } else {
-            RecordSet rs = new RecordSet();
-            String replace =
-                parsingSq
-                    .replace("ｓｅｌｅｃｔ ", "select ")
-                    .replaceAll(" ａｎｄ ", " and ")
-                    .replaceAll(" ｏｒ ", " or ")
-                    .replaceAll(" ｊｏｉｎ ", " join ")
-                    .replaceAll(" ｉｎ ", " in ");
-            rs.executeQuery(replace);
-            value = aiyh.utils.Util.recordeSet2Array(rs, String.class);
-          }
         } else {
-          value = changeRuleHandle(apiConfigDetailDTO, dataMap);
+            //		    全部合同一起发送的签署信息
+            //			直接合同已签署+1
+            update.put("signed_num", ufContractInfoDTO.getSignedNum() + 1);
+            //			如果已签文件数等于需要签署的合同数乘以合同文件数相等，则代表对方已经签署完毕
+            if (ufContractInfoDTO.getSignedNum() + 1
+                    == ufContractInfoDTO.getShouldSignedNum()
+                    * ufContractInfoDTO.getSingleContractFileNum()) {
+                update.put("contract_status", 3);
+                //		判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署
+                if ("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
+                    update.put("contract_status", 4);
+                }
+                if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
+                    update.put("contract_status", 4);
+                    //					 仅对方签署完成后，添加用户信息
+                    //		        获取配置表信息
+                    FaDaDaConfigDTO faDaDaConfigDTO =
+                            faDDContractMapping.queryConfig(
+                                    String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
+                    RecordSet rs = new RecordSet();
+                    String userInfo = ufContractInfoDTO.getUserInfo();
+                    User user = JSON.parseObject(userInfo, new TypeReference<User>() {
+                    });
+                    //		获取流程中的合同字段的文档目录id
+                    rs.executeQuery(
+                            "select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
+                    String formId = Util.recordeSet2Entity(rs, String.class);
+                    String query =
+                            "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
+                    rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
+                    String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
+                    if (StringUtils.isNullOrEmpty(docCategorys)) {
+                        query = "select doccategory from workflow_base where id = ?";
+                        rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
+                        rs.next();
+                        docCategorys = Util.null2String(rs.getString(1));
+                    }
+                    if (StringUtils.isNullOrEmpty(docCategorys)) {
+                        docCategorys = ",,1";
+                    }
+                    //		            String[] docSplit = docCategorys.split(",");
+                    //		            String category = docSplit[docSplit.length - 1];
+                    //		            下载合同到文件服务器中
+                    String docIds = "";
+                    try {
+                        docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
+                    } catch (Exception e) {
+                        toolUtil.writeErrorLog("创建文档发生错误：" + e);
+                    }
+                    toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
+                    //		             将id保存到流程字段中
+                    PrepSqlResultImpl sqlResult =
+                            Util.createSqlBuilder()
+                                    .updateSql(
+                                            ufContractInfoDTO.getWorkflowMainTable(),
+                                            ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
+                                            Util.createPrepWhereImpl()
+                                                    .whereAnd("id")
+                                                    .whereEqual(ufContractInfoDTO.getMainId()));
+                    toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+                    rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+                }
+            }
         }
-        param.put(apiConfigDetailDTO.getParamName(), value);
-      }
-      params.add(param);
-    }
-    return params;
-  }
 
-  /**
-   * 处理子类
-   *
-   * @param children
-   * @param dataMap
-   * @return
-   */
-  private Object handleChild(List<ApiConfigDetailDTO> children, Map<String, Object> dataMap) {
-    Map<String, Object> params = new HashMap<>();
-    for (ApiConfigDetailDTO child : children) {
-      Object value;
-      if (child.getChildren() != null) {
-        value = handleChild(child.getChildren(), dataMap);
-      } else {
-        value = changeRuleHandle(child, dataMap);
-      }
-      params.put(child.getParamName(), value);
-    }
-    return params;
-  }
-
-  /**
-   * 根据转换规则生成对应的参数值
-   *
-   * @param apiConfigDetailDTO
-   * @param dataMap
-   * @return
-   */
-  private Object changeRuleHandle(
-      ApiConfigDetailDTO apiConfigDetailDTO, Map<String, Object> dataMap) {
-    Object value;
-    String tableName;
-    String table;
-    String sql;
-    String resultSql;
-    //			判断参数的转换规则
-    switch (apiConfigDetailDTO.getChangeRule()) {
-      case 0:
-        //					不转换
-      case 2:
-        //					流程字段值
-        table = apiConfigDetailDTO.getTablename();
-        if (!table.contains("_dt")) {
-          //			        表示字段属于主表
-          tableName = "main";
-        } else {
-          //			        字段属于明细表
-          String dt = table.substring(table.indexOf("_dt") + 3);
-          tableName = "detail_" + dt;
-        }
-        value = dataMap.get(tableName + "." + apiConfigDetailDTO.getWorkflowField());
-        break;
-      case 1:
-        //					固定值
-        value = apiConfigDetailDTO.getParamValue();
-        break;
-      case 3:
-        //					系统日期
-        value = aiyh.utils.Util.getTime("yyyy-MM-dd");
-        break;
-      case 4:
-        //					系统时间
-        value = aiyh.utils.Util.getTime("HH:mm:ss");
-        break;
-      case 5:
-        //					系统日期-时间
-        value = aiyh.utils.Util.getTime("yyyy-MM-dd HH:mm:ss");
-        break;
-      case 6:
-        //					自定义SQL
-      case 7:
-        //					流程字段转SQL
-        sql = apiConfigDetailDTO.getParamValue();
-        resultSql = aiyh.utils.Util.parsingSq(sql, dataMap);
-        if (resultSql.contains("delete ")
-            || resultSql.contains("update ")
-            || resultSql.contains("exec ")
-            || resultSql.contains("drop ")
-            || resultSql.contains("truncate ")) {
-          value = null;
-        } else {
-          RecordSet rs = new RecordSet();
-          String replace =
-              resultSql
-                  .replace("ｓｅｌｅｃｔ ", "select ")
-                  .replaceAll(" ａｎｄ ", " and ")
-                  .replaceAll(" ｏｒ ", " or ")
-                  .replaceAll(" ｊｏｉｎ ", " join ")
-                  .replaceAll(" ｉｎ ", " in ");
-          rs.executeQuery(replace);
-          rs.next();
-          value = aiyh.utils.Util.null2String(rs.getString(1));
-        }
-        break;
-      case 8:
-        //
-        //					流程名称
-        value = aiyh.utils.Util.getWorkflowNameById(String.valueOf(dataMap.get("workflowid")));
-        break;
-      case 9:
-        //
-        //					请求标题
-        value = aiyh.utils.Util.getRequestTitleById(String.valueOf(dataMap.get("requestid")));
-        break;
-      case 10:
-        //					流程requestId
-        value = dataMap.get("requestid");
-        break;
-      default:
-        value = null;
-        break;
-    }
-    if (apiConfigDetailDTO.getParamType() == 1) {
-      //			Integer
-      value = Integer.parseInt(String.valueOf(value));
-    } else if (apiConfigDetailDTO.getParamType() == 2) {
-      //          Boolean
-      value = Boolean.parseBoolean(String.valueOf(value));
-    }
-    return value;
-  }
-
-  /**
-   * 合同签署回调逻辑处理
-   *
-   * @param contractNo
-   */
-  public void signedCallBack(String contractNo) {
-    //		查询合同信息表中的数据
-    UfContractInfoDTO ufContractInfoDTO = faDDContractMapping.queryContractInfo(contractNo);
-    toolUtil.writeDebuggerLog("回调，获取到合同信息参数：" + JSON.toJSONString(ufContractInfoDTO));
-    Map<String, Object> update = new HashMap<>();
-    if (ufContractInfoDTO.getQueueSigned() == 1) {
-      //			属于顺序签署合同,更新单份合同已签蜀几个文件
-      update.put("single_signed_num", ufContractInfoDTO.getSingleSignedNum() + 1);
-      toolUtil.writeDebuggerLog("单份合同签署成功");
-      //			如果单份合同签署数量等于合同文件数量，表示已经签署完成
-      if (ufContractInfoDTO.getSingleSignedNum() + 1
-          == ufContractInfoDTO.getSingleContractFileNum()) {
-        toolUtil.writeDebuggerLog("单份合同全部签署成功");
-        update.put("signed_num", ufContractInfoDTO.getSignedNum() + 1);
-        //				查询下一位合同方并发起签署
-        if (ufContractInfoDTO.getSignedNum() + 1 < ufContractInfoDTO.getShouldSignedNum()) {
-          toolUtil.writeDebuggerLog(
-              "应签署合同比签署合同数量多，需要再次签署！" + (ufContractInfoDTO.getSignedNum() + 1));
-          update.put("single_signed_num", 0);
-          nextContractSigned(ufContractInfoDTO);
-        }
-      }
-      //			如果合同已签数量和应签数量相同，则状态为本方待签
-      if (ufContractInfoDTO.getSignedNum() + 1 == ufContractInfoDTO.getShouldSignedNum()) {
-        update.put("contract_status", 3);
-        //		判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署
-        if ("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
-          update.put("contract_status", 4);
-        }
-        if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
-          update.put("contract_status", 4);
-          //					 仅对方签署完成后，添加用户信息
-          //		        获取配置表信息
-          FaDaDaConfigDTO faDaDaConfigDTO =
-              faDDContractMapping.queryConfig(
-                  String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
-          RecordSet rs = new RecordSet();
-          String userInfo = ufContractInfoDTO.getUserInfo();
-          User user = JSON.parseObject(userInfo, new TypeReference<User>() {});
-          //		获取流程中的合同字段的文档目录id
-          rs.executeQuery(
-              "select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
-          String formId = Util.recordeSet2Entity(rs, String.class);
-          String query =
-              "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
-          rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
-          String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
-          if (StringUtils.isNullOrEmpty(docCategorys)) {
-            query = "select doccategory from workflow_base where id = ?";
-            rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
-            rs.next();
-            docCategorys = Util.null2String(rs.getString(1));
-          }
-          if (StringUtils.isNullOrEmpty(docCategorys)) {
-            docCategorys = ",,1";
-          }
-          //		            String[] docSplit = docCategorys.split(",");
-          //		            String category = docSplit[docSplit.length - 1];
-          //		            下载合同到文件服务器中
-          String docIds = "";
-          try {
-            docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
-          } catch (Exception e) {
-            toolUtil.writeErrorLog("创建文档发生错误：" + e);
-          }
-          toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
-          //		             将id保存到流程字段中
-          PrepSqlResultImpl sqlResult =
-              Util.createSqlBuilder()
-                  .updateSql(
-                      ufContractInfoDTO.getWorkflowMainTable(),
-                      ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
-                      Util.createPrepWhereImpl()
-                          .whereAnd("id")
-                          .whereEqual(ufContractInfoDTO.getMainId()));
-          toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
-          rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
-        }
-      }
-    } else {
-      //		    全部合同一起发送的签署信息
-      //			直接合同已签署+1
-      update.put("signed_num", ufContractInfoDTO.getSignedNum() + 1);
-      //			如果已签文件数等于需要签署的合同数乘以合同文件数相等，则代表对方已经签署完毕
-      if (ufContractInfoDTO.getSignedNum() + 1
-          == ufContractInfoDTO.getShouldSignedNum()
-              * ufContractInfoDTO.getSingleContractFileNum()) {
-        update.put("contract_status", 3);
-        //		判断是否控制签署规则 1-仅本方签署，2-仅对方签署，3-都签署
-        if ("1".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
-          update.put("contract_status", 4);
-        }
-        if ("2".equals(Util.null2String(ufContractInfoDTO.getSignedType()))) {
-          update.put("contract_status", 4);
-          //					 仅对方签署完成后，添加用户信息
-          //		        获取配置表信息
-          FaDaDaConfigDTO faDaDaConfigDTO =
-              faDDContractMapping.queryConfig(
-                  String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
-          RecordSet rs = new RecordSet();
-          String userInfo = ufContractInfoDTO.getUserInfo();
-          User user = JSON.parseObject(userInfo, new TypeReference<User>() {});
-          //		获取流程中的合同字段的文档目录id
-          rs.executeQuery(
-              "select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
-          String formId = Util.recordeSet2Entity(rs, String.class);
-          String query =
-              "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
-          rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
-          String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
-          if (StringUtils.isNullOrEmpty(docCategorys)) {
-            query = "select doccategory from workflow_base where id = ?";
-            rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
-            rs.next();
-            docCategorys = Util.null2String(rs.getString(1));
-          }
-          if (StringUtils.isNullOrEmpty(docCategorys)) {
-            docCategorys = ",,1";
-          }
-          //		            String[] docSplit = docCategorys.split(",");
-          //		            String category = docSplit[docSplit.length - 1];
-          //		            下载合同到文件服务器中
-          String docIds = "";
-          try {
-            docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
-          } catch (Exception e) {
-            toolUtil.writeErrorLog("创建文档发生错误：" + e);
-          }
-          toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
-          //		             将id保存到流程字段中
-          PrepSqlResultImpl sqlResult =
-              Util.createSqlBuilder()
-                  .updateSql(
-                      ufContractInfoDTO.getWorkflowMainTable(),
-                      ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
-                      Util.createPrepWhereImpl()
-                          .whereAnd("id")
-                          .whereEqual(ufContractInfoDTO.getMainId()));
-          toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
-          rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
-        }
-      }
-    }
-
-    //		更新状态
-    PrepSqlResultImpl sqlResult =
-        Util.createSqlBuilder()
-            .updateSql(
-                "uf_contract_info",
-                update,
-                Util.createPrepWhereImpl().whereAnd("id").whereEqual(ufContractInfoDTO.getId()));
-    RecordSet rs = new RecordSet();
-    toolUtil.writeDebuggerLog(
-        String.format(
-            "合同签署回调，更新合同状态，更新语句{%s},更新参数{%s}", sqlResult.getSqlStr(), sqlResult.getArgs()));
-    rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
-    //		查询合同状态，更新明细表
+        //		更新状态
+        PrepSqlResultImpl sqlResult =
+                Util.createSqlBuilder()
+                        .updateSql(
+                                "uf_contract_info",
+                                update,
+                                Util.createPrepWhereImpl().whereAnd("id").whereEqual(ufContractInfoDTO.getId()));
+        RecordSet rs = new RecordSet();
+        toolUtil.writeDebuggerLog(
+                String.format(
+                        "合同签署回调，更新合同状态，更新语句{%s},更新参数{%s}", sqlResult.getSqlStr(), sqlResult.getArgs()));
+        rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+        //		查询合同状态，更新明细表
     /*	Map<String,Object> data = new HashMap<>();
     		data.put("contractNo","6a265befb3944d93a7a8b32b8d5ca33d");
     		Map<String, Object> faResult = null;
@@ -503,66 +505,66 @@ public class FaDDContractService {
     			e.printStackTrace();
     			toolUtil.writeErrorLog("查询合同失败，失败原因：" + e);
     		}*/
-  }
+    }
 
-  /**
-   * 查询下一个合同方并发起合同签署
-   *
-   * @param ufContractInfoDTO
-   */
-  private void nextContractSigned(UfContractInfoDTO ufContractInfoDTO) {
-    String query =
-        "select * from "
-            + ufContractInfoDTO.getWorkflowDetailTable()
-            + " where mainid = ? and signed_status is null";
-    RecordSet rs = new RecordSet();
-    rs.executeQuery(query, ufContractInfoDTO.getMainId());
-    List<Map<String, Object>> detailMaps = Util.recordSet2MapList(rs);
-    toolUtil.writeDebuggerLog("查询到明细数据：" + JSON.toJSONString(detailMaps));
-    query = "select * from " + ufContractInfoDTO.getWorkflowMainTable() + " where requestid = ?";
-    RecordSet rs1 = new RecordSet();
-    rs1.executeQuery(query, ufContractInfoDTO.getWorkflowRequestId());
-    Map<String, Object> mainMap = Util.recordSet2Map(rs1);
-    if (mainMap == null) {
-      toolUtil.writeErrorLog("mainMap 查询到null -------> " + JSON.toJSONString(ufContractInfoDTO));
-      throw new RuntimeException("mainMap查询到null!");
-    }
-    //		        获取配置表信息
-    FaDaDaConfigDTO faDaDaConfigDTO =
-        faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 3);
-    //              查询接口配置树形结构
-    ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
-    //		查询签署数据
-    List<Map<String, Object>> dataArr =
-        getDataArr(
-            ufContractInfoDTO.getWorkflowRequestId(),
-            String.valueOf(ufContractInfoDTO.getWorkflowType()),
-            ufContractInfoDTO.getWorkflowMainTable(),
-            ufContractInfoDTO.getWorkflowDetailTable(),
-            detailMaps);
-    //				处理数据
-    List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
-    if (maps == null) {
-      toolUtil.writeDebuggerLog("service签署合同错误，错误原因：maps为null!");
-      throw new RuntimeException("service签署合同错误，错误原因：maps为null！");
-    }
-    if (maps.size() == 0 || maps.size() <= 1) {
-      return;
-    }
-    Map<String, Object> updateData = new HashMap<>();
-    Map<String, Object> map = maps.get(1);
-    //		如果进行控制签署规则
-    if (faDaDaConfigDTO.getSignedType() == 1) {
-      if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1())))
-          == faDaDaConfigDTO.getOnlyOther()) {
-        //				仅对方签署
-        if (maps.size() == 1) {
-          //					map.put("signType", 1);
-          //					如果是最后一个人了，就直接归档
-          map.put("autoArchive", 1);
+    /**
+     * 查询下一个合同方并发起合同签署
+     *
+     * @param ufContractInfoDTO
+     */
+    private void nextContractSigned(UfContractInfoDTO ufContractInfoDTO) {
+        String query =
+                "select * from "
+                        + ufContractInfoDTO.getWorkflowDetailTable()
+                        + " where mainid = ? and signed_status is null";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(query, ufContractInfoDTO.getMainId());
+        List<Map<String, Object>> detailMaps = Util.recordSet2MapList(rs);
+        toolUtil.writeDebuggerLog("查询到明细数据：" + JSON.toJSONString(detailMaps));
+        query = "select * from " + ufContractInfoDTO.getWorkflowMainTable() + " where requestid = ?";
+        RecordSet rs1 = new RecordSet();
+        rs1.executeQuery(query, ufContractInfoDTO.getWorkflowRequestId());
+        Map<String, Object> mainMap = Util.recordSet2Map(rs1);
+        if (mainMap == null) {
+            toolUtil.writeErrorLog("mainMap 查询到null -------> " + JSON.toJSONString(ufContractInfoDTO));
+            throw new RuntimeException("mainMap查询到null!");
+        }
+        //		        获取配置表信息
+        FaDaDaConfigDTO faDaDaConfigDTO =
+                faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 3);
+        //              查询接口配置树形结构
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+        //		查询签署数据
+        List<Map<String, Object>> dataArr =
+                getDataArr(
+                        ufContractInfoDTO.getWorkflowRequestId(),
+                        String.valueOf(ufContractInfoDTO.getWorkflowType()),
+                        ufContractInfoDTO.getWorkflowMainTable(),
+                        ufContractInfoDTO.getWorkflowDetailTable(),
+                        detailMaps);
+        //				处理数据
+        List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
+        if (maps == null) {
+            toolUtil.writeDebuggerLog("service签署合同错误，错误原因：maps为null!");
+            throw new RuntimeException("service签署合同错误，错误原因：maps为null！");
+        }
+        if (maps.size() == 0 || maps.size() <= 1) {
+            return;
+        }
+        Map<String, Object> updateData = new HashMap<>();
+        Map<String, Object> map = maps.get(1);
+        //		如果进行控制签署规则
+        if (faDaDaConfigDTO.getSignedType() == 1) {
+            if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1())))
+                    == faDaDaConfigDTO.getOnlyOther()) {
+                //				仅对方签署
+                if (maps.size() == 1) {
+                    //					map.put("signType", 1);
+                    //					如果是最后一个人了，就直接归档
+                    map.put("autoArchive", 1);
+                }
+            }
         }
-      }
-    }
     /*		if (faDaDaConfigDTO.getSignedType() == 1) {
     //			需要控制签署规则
     			if (Integer.parseInt(Util.null2String(mainMap.get(faDaDaConfigDTO.getFieldControl1()))) == faDaDaConfigDTO.getOnlyOther()) {
@@ -571,369 +573,369 @@ public class FaDDContractService {
     			}
     //			双方签署
     		}*/
-    //		签署下一次
-    toolUtil.writeDebuggerLog("下一个供应商签署合同，签署数据：" + JSON.toJSONString(map));
-    signedRequest(map, apiConfigMainDTO);
-    //			    将合同签署信息更新到合同信息表中
-    updateData.put("single_signed_num", 0);
-    PrepSqlResultImpl sqlResult =
-        Util.createSqlBuilder()
-            .updateSql(
-                contractInfoTable,
-                updateData,
-                Util.createPrepWhereImpl()
-                    .whereAnd("workflow_request_id")
-                    .whereEqual(ufContractInfoDTO.getWorkflowRequestId()));
-    rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
-    updateData.clear();
-    //			    更新明细表合同信息  明细表添加字段，signed_status（合同方签署状态）
-    //			    签署状态，1 已发送待签署，2 已签蜀
-    updateData.put("signed_status", 1);
-    sqlResult =
-        Util.createSqlBuilder()
-            .updateSql(
-                ufContractInfoDTO.getWorkflowDetailTable(),
-                updateData,
-                Util.createPrepWhereImpl()
-                    .whereAnd("id")
-                    .whereEqual(String.valueOf(map.get("id"))));
-    rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
-  }
-
-  /**
-   * 合同签署发送请求
-   *
-   * @param map
-   * @param apiConfigMainDTO
-   */
-  private void signedRequest(Map<String, Object> map, ApiConfigMainDTO apiConfigMainDTO) {
-    String contractNos = Util.null2String(map.get("contractNo"));
-    String[] split = contractNos.split(",");
-    //		RecordSet rs = new RecordSet();
-    for (String s : split) {
-      map.put("contractNo", s);
-      ResponeVo responeVo = FaDDRequestUtils.signedContract(map, apiConfigMainDTO.getApiUrl());
-      Map<String, Object> response = null;
-      try {
-        response = responeVo.getEntityMap();
-      } catch (JsonProcessingException e) {
-        e.printStackTrace();
-      }
-      if (!"200".equals(response.get("code"))) {
-        toolUtil.writeDebuggerLog("法大大接口签署合同失败！");
-        throw new RuntimeException("法大大接口签署合同失败!");
-      }
+        //		签署下一次
+        toolUtil.writeDebuggerLog("下一个供应商签署合同，签署数据：" + JSON.toJSONString(map));
+        signedRequest(map, apiConfigMainDTO);
+        //			    将合同签署信息更新到合同信息表中
+        updateData.put("single_signed_num", 0);
+        PrepSqlResultImpl sqlResult =
+                Util.createSqlBuilder()
+                        .updateSql(
+                                contractInfoTable,
+                                updateData,
+                                Util.createPrepWhereImpl()
+                                        .whereAnd("workflow_request_id")
+                                        .whereEqual(ufContractInfoDTO.getWorkflowRequestId()));
+        rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+        updateData.clear();
+        //			    更新明细表合同信息  明细表添加字段，signed_status（合同方签署状态）
+        //			    签署状态，1 已发送待签署，2 已签蜀
+        updateData.put("signed_status", 1);
+        sqlResult =
+                Util.createSqlBuilder()
+                        .updateSql(
+                                ufContractInfoDTO.getWorkflowDetailTable(),
+                                updateData,
+                                Util.createPrepWhereImpl()
+                                        .whereAnd("id")
+                                        .whereEqual(String.valueOf(map.get("id"))));
+        rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
     }
-  }
 
-  /**
-   * 查询合同的状态信息
-   *
-   * @param requestId
-   * @return
-   */
-  public Map<String, Object> querySignedStatus(String requestId) {
-    //		查询合同状态
-    String query = "select * from " + contractInfoTable + " where workflow_request_id = ?";
-    RecordSet rs = new RecordSet();
-    rs.executeQuery(query, requestId);
-    Map<String, Object> result = Util.recordSet2Map(rs);
-    this.toolUtil.writeDebuggerLog(result.toString());
-    boolean isAllSinged = false;
-    boolean isSingedOneself = false;
-    if (result == null) {
-      toolUtil.writeDebuggerLog("查询到状态为null；sql：" + query + " ---> " + requestId);
-      return ParaMap.create().put("isAllSinged", false).put("isSingedOneself", false);
+    /**
+     * 合同签署发送请求
+     *
+     * @param map
+     * @param apiConfigMainDTO
+     */
+    private void signedRequest(Map<String, Object> map, ApiConfigMainDTO apiConfigMainDTO) {
+        String contractNos = Util.null2String(map.get("contractNo"));
+        String[] split = contractNos.split(",");
+        //		RecordSet rs = new RecordSet();
+        for (String s : split) {
+            map.put("contractNo", s);
+            ResponeVo responeVo = FaDDRequestUtils.signedContract(map, apiConfigMainDTO.getApiUrl());
+            Map<String, Object> response = null;
+            try {
+                response = responeVo.getEntityMap();
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            if (!"200".equals(response.get("code"))) {
+                toolUtil.writeDebuggerLog("法大大接口签署合同失败！");
+                throw new RuntimeException("法大大接口签署合同失败!");
+            }
+        }
     }
-    //		等待对方签署
+
+    /**
+     * 查询合同的状态信息
+     *
+     * @param requestId
+     * @return
+     */
+    public Map<String, Object> querySignedStatus(String requestId) {
+        //		查询合同状态
+        String query = "select * from " + contractInfoTable + " where workflow_request_id = ?";
+        RecordSet rs = new RecordSet();
+        rs.executeQuery(query, requestId);
+        Map<String, Object> result = Util.recordSet2Map(rs);
+        this.toolUtil.writeDebuggerLog(result.toString());
+        boolean isAllSinged = false;
+        boolean isSingedOneself = false;
+        if (result == null) {
+            toolUtil.writeDebuggerLog("查询到状态为null；sql：" + query + " ---> " + requestId);
+            return ParaMap.create().put("isAllSinged", false).put("isSingedOneself", false);
+        }
+        //		等待对方签署
     /*		if("2".equals(result.get("contract_status"))){
     	isAllSinged = false;
     }*/
-    //		等待我方签署
-    if ("3".equals(Util.null2String(result.get("contract_status")))) {
-      isAllSinged = true;
+        //		等待我方签署
+        if ("3".equals(Util.null2String(result.get("contract_status")))) {
+            isAllSinged = true;
+        }
+        //		签署完毕
+        if ("4".equals(Util.null2String(result.get("contract_status")))) {
+            isAllSinged = true;
+            isSingedOneself = true;
+        }
+        return ParaMap.create().put("isAllSinged", isAllSinged).put("isSingedOneself", isSingedOneself);
     }
-    //		签署完毕
-    if ("4".equals(Util.null2String(result.get("contract_status")))) {
-      isAllSinged = true;
-      isSingedOneself = true;
-    }
-    return ParaMap.create().put("isAllSinged", isAllSinged).put("isSingedOneself", isSingedOneself);
-  }
 
-  public void signedContractOwn(String requestId, User user) {
-    //		查询合同信息
-    UfContractInfoDTO ufContractInfoDTO =
-        faDDContractMapping.queryContractInfoByRequestId(requestId);
-    //		        获取配置表信息
-    FaDaDaConfigDTO faDaDaConfigDTO =
-        faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
-    //              查询接口配置树形结构
-    ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
-    //		查询签署数据
-    List<Map<String, Object>> dataArr =
-        getDataArr(
-            ufContractInfoDTO.getWorkflowRequestId(),
-            String.valueOf(ufContractInfoDTO.getWorkflowType()),
-            ufContractInfoDTO.getWorkflowMainTable(),
-            ufContractInfoDTO.getWorkflowDetailTable());
-    //				处理数据
-    List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
-    if (maps == null) {
-      toolUtil.writeErrorLog("service签署合同错误，错误原因：maps为null!");
-      throw new RuntimeException("service签署合同错误，错误原因：maps为null！");
+    public void signedContractOwn(String requestId, User user) {
+        //		查询合同信息
+        UfContractInfoDTO ufContractInfoDTO =
+                faDDContractMapping.queryContractInfoByRequestId(requestId);
+        //		        获取配置表信息
+        FaDaDaConfigDTO faDaDaConfigDTO =
+                faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 4);
+        //              查询接口配置树形结构
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfigTree(faDaDaConfigDTO.getParamsConfig());
+        //		查询签署数据
+        List<Map<String, Object>> dataArr =
+                getDataArr(
+                        ufContractInfoDTO.getWorkflowRequestId(),
+                        String.valueOf(ufContractInfoDTO.getWorkflowType()),
+                        ufContractInfoDTO.getWorkflowMainTable(),
+                        ufContractInfoDTO.getWorkflowDetailTable());
+        //				处理数据
+        List<Map<String, Object>> maps = objectAndListHandle(apiConfigMainDTO.getDetails(), dataArr);
+        if (maps == null) {
+            toolUtil.writeErrorLog("service签署合同错误，错误原因：maps为null!");
+            throw new RuntimeException("service签署合同错误，错误原因：maps为null！");
+        }
+        if (maps.size() == 0) {
+            return;
+        }
+        Map<String, Object> data = maps.get(0);
+        String contractNos = String.valueOf(data.get("contractNo"));
+        String[] split = contractNos.split(",");
+        List<String> downloadUrlList = new ArrayList<>();
+        List<String> viewUrlList = new ArrayList<>();
+        for (String s : split) {
+            data.put("contractNo", s);
+            ResponeVo responeVo = FaDDRequestUtils.signedContract(data, apiConfigMainDTO.getApiUrl());
+            Map<String, Object> response = null;
+            try {
+                response = responeVo.getEntityMap();
+            } catch (JsonProcessingException e) {
+                e.printStackTrace();
+            }
+            if (!"200".equals(response.get("code"))) {
+                this.toolUtil.writeErrorLog("签署参数：" + responeVo.getEntityString());
+                throw new RuntimeException("本方签署失败！法大大请求接口错误！");
+            } else {
+                Map<String, Object> result = (Map<String, Object>) response.get("data");
+                downloadUrlList.add(Util.null2String(result.get("downloadUrl")));
+                viewUrlList.add(Util.null2String(result.get("viewUrl")));
+            }
+        }
+        //		更新合同状态
+        RecordSet rs = new RecordSet();
+        Map<String, Object> update = new HashMap<>();
+        update.put("contract_status", 4);
+        update.put("contract_view_url", String.join(";", viewUrlList));
+        update.put("contract_down_url", String.join(";", downloadUrlList));
+        PrepSqlResultImpl sqlResult =
+                Util.createSqlBuilder()
+                        .updateSql(
+                                contractInfoTable,
+                                update,
+                                Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(requestId));
+        toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+        rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
+        //		获取流程中的合同字段的文档目录id
+        rs.executeQuery(
+                "select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
+        String formId = Util.recordeSet2Entity(rs, String.class);
+        String query =
+                "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
+        rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
+        String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
+        if (StringUtils.isNullOrEmpty(docCategorys)) {
+            query = "select doccategory from workflow_base where id = ?";
+            rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
+            rs.next();
+            docCategorys = Util.null2String(rs.getString(1));
+        }
+        if (StringUtils.isNullOrEmpty(docCategorys)) {
+            docCategorys = ",,1";
+        }
+        //		String[] docSplit = docCategorys.split(",");
+        //		String category = docSplit[docSplit.length - 1];
+        //		下载合同到文件服务器中
+        String docIds = "";
+        try {
+            docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
+        } catch (Exception e) {
+            toolUtil.writeErrorLog("创建文档发生错误：" + e);
+        }
+        toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
+        //		将id保存到流程字段中
+        sqlResult =
+                Util.createSqlBuilder()
+                        .updateSql(
+                                ufContractInfoDTO.getWorkflowMainTable(),
+                                ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
+                                Util.createPrepWhereImpl()
+                                        .whereAnd("id")
+                                        .whereEqual(ufContractInfoDTO.getMainId()));
+        toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
+        rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
     }
-    if (maps.size() == 0) {
-      return;
-    }
-    Map<String, Object> data = maps.get(0);
-    String contractNos = String.valueOf(data.get("contractNo"));
-    String[] split = contractNos.split(",");
-    List<String> downloadUrlList = new ArrayList<>();
-    List<String> viewUrlList = new ArrayList<>();
-    for (String s : split) {
-      data.put("contractNo", s);
-      ResponeVo responeVo = FaDDRequestUtils.signedContract(data, apiConfigMainDTO.getApiUrl());
-      Map<String, Object> response = null;
-      try {
-        response = responeVo.getEntityMap();
-      } catch (JsonProcessingException e) {
-        e.printStackTrace();
-      }
-      if (!"200".equals(response.get("code"))) {
-        this.toolUtil.writeErrorLog("签署参数：" + responeVo.getEntityString());
-        throw new RuntimeException("本方签署失败！法大大请求接口错误！");
-      } else {
-        Map<String, Object> result = (Map<String, Object>) response.get("data");
-        downloadUrlList.add(Util.null2String(result.get("downloadUrl")));
-        viewUrlList.add(Util.null2String(result.get("viewUrl")));
-      }
-    }
-    //		更新合同状态
-    RecordSet rs = new RecordSet();
-    Map<String, Object> update = new HashMap<>();
-    update.put("contract_status", 4);
-    update.put("contract_view_url", String.join(";", viewUrlList));
-    update.put("contract_down_url", String.join(";", downloadUrlList));
-    PrepSqlResultImpl sqlResult =
-        Util.createSqlBuilder()
-            .updateSql(
-                contractInfoTable,
-                update,
-                Util.createPrepWhereImpl().whereAnd("workflow_request_id").whereEqual(requestId));
-    toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
-    rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
-    //		获取流程中的合同字段的文档目录id
-    rs.executeQuery(
-        "select formid from workflow_base where id = ?", ufContractInfoDTO.getWorkflowType());
-    String formId = Util.recordeSet2Entity(rs, String.class);
-    String query =
-        "select doccategory from workflow_fileupload where fieldid = (select id from workflow_billfield where fieldname = ? and billid = ?)";
-    rs.executeQuery(query, faDaDaConfigDTO.getContractDoc(), formId);
-    String docCategorys = Util.null2String(Util.recordeSet2Entity(rs, String.class));
-    if (StringUtils.isNullOrEmpty(docCategorys)) {
-      query = "select doccategory from workflow_base where id = ?";
-      rs.executeQuery(query, ufContractInfoDTO.getWorkflowType());
-      rs.next();
-      docCategorys = Util.null2String(rs.getString(1));
-    }
-    if (StringUtils.isNullOrEmpty(docCategorys)) {
-      docCategorys = ",,1";
-    }
-    //		String[] docSplit = docCategorys.split(",");
-    //		String category = docSplit[docSplit.length - 1];
-    //		下载合同到文件服务器中
-    String docIds = "";
-    try {
-      docIds = downloadContract2FileSystem(ufContractInfoDTO, docCategorys, user);
-    } catch (Exception e) {
-      toolUtil.writeErrorLog("创建文档发生错误：" + e);
-    }
-    toolUtil.writeDebuggerLog("生成的文档的id：" + docIds);
-    //		将id保存到流程字段中
-    sqlResult =
-        Util.createSqlBuilder()
-            .updateSql(
-                ufContractInfoDTO.getWorkflowMainTable(),
-                ParaMap.create().put(faDaDaConfigDTO.getContractDoc(), docIds),
-                Util.createPrepWhereImpl()
-                    .whereAnd("id")
-                    .whereEqual(ufContractInfoDTO.getMainId()));
-    toolUtil.writeDebuggerLog(sqlResult.getSqlStr() + "，参数：" + sqlResult.getArgs());
-    rs.executeUpdate(sqlResult.getSqlStr(), sqlResult.getArgs());
-  }
 
-  public String downloadContract2FileSystem(
-      UfContractInfoDTO ufContractInfoDTO, String category, User user) {
+    public String downloadContract2FileSystem(
+            UfContractInfoDTO ufContractInfoDTO, String category, User user) {
 
     /*	ImageFileManager fileManager = new ImageFileManager();
     int fileId = fileManager.saveImageFileByInputStream(downloadContract(ufContractInfoDTO.getContractNo(),
     		String.valueOf(ufContractInfoDTO.getWorkflowType())), ufContractInfoDTO.getFileName());*/
-    //		 获取配置表信息
-    FaDaDaConfigDTO faDaDaConfigDTO =
-        faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 5);
-    ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
-    String contractNos = Util.null2String(ufContractInfoDTO.getContractNo());
-    String[] split = contractNos.split(",");
-    List<String> docIds = new ArrayList<>();
-    for (String contractNo : split) {
-      //			InputStream inputStream = downloadContract(s,
-      // String.valueOf(ufContractInfoDTO.getWorkflowType()));
-      Map<String, Object> data = new HashMap<>();
-      data.put("contractNo", contractNo);
-      AtomicReference<InputStream> content = new AtomicReference<>();
-      FaDDRequestUtils.downContract(
-          data,
-          response -> {
-            HttpEntity entity = response.getEntity();
-            if (response.getStatusLine().getStatusCode() != 200) {
-              throw new RuntimeException("法大大请求接口错误！");
-            }
-            try {
-              content.set(entity.getContent());
-            } catch (IOException e) {
-              e.printStackTrace();
-            }
-            byte[] byteArray = null;
-            try {
-              byteArray = IOUtils.toByteArray(content.get());
-            } catch (IOException e) {
-              e.printStackTrace();
-              toolUtil.writeErrorLog("文件流处理错误，将inputStream转换为byte数组出错：" + e);
-            }
-            this.toolUtil.writeErrorLog(ufContractInfoDTO.toString());
-            String base64 = Base64Utils.encode(byteArray);
-            FileProcessor fileProcessor = new FileProcessor();
-            //				toolUtil.writeDebuggerLog("base64：" + "base64:" + base64);
-            toolUtil.writeDebuggerLog("category：" + category);
-            //				toolUtil.writeDebuggerLog("user：" + JSON.toJSONString(user));
-            toolUtil.writeDebuggerLog("fileName：" + ufContractInfoDTO.getFileName());
-            docIds.add(
-                String.valueOf(
-                    fileProcessor.Process(
-                        "base64:" + base64, category, user, ufContractInfoDTO.getFileName())));
-          },
-          apiConfigMainDTO.getApiUrl());
-    }
-    return String.join(",", docIds);
-  }
-
-  public InputStream downloadContract(String contractNo, String workflowId) {
-    //		 获取配置表信息
-    FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(workflowId, 5);
-    ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
-    Map<String, Object> data = new HashMap<>();
-    data.put("contractNo", contractNo);
-    AtomicReference<InputStream> content = new AtomicReference<>();
-    FaDDRequestUtils.downContract(
-        data,
-        response -> {
-          HttpEntity entity = response.getEntity();
-          if (response.getStatusLine().getStatusCode() != 200) {
-            throw new RuntimeException("法大大请求接口错误！");
-          }
-          try {
-            content.set(entity.getContent());
-          } catch (IOException e) {
-            e.printStackTrace();
-          }
-        },
-        apiConfigMainDTO.getApiUrl());
-    return content.get();
-  }
-
-  /**
-   * 直接从法大大系统下载文件
-   *
-   * @param ufContractInfoDTO 合同相关信息
-   * @return
-   */
-  public StreamingOutput download4mFDD(UfContractInfoDTO ufContractInfoDTO) {
-    //		 获取配置表信息
-    FaDaDaConfigDTO faDaDaConfigDTO =
-        faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 5);
-    ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
-    //		查询合同信息
-    //		UfContractInfoDTO ufContractInfoDTO =
-    // faDDContractMapping.queryContractInfoByRequestId(requestId);
-    String contractNos = Util.null2String(ufContractInfoDTO.getContractNo());
-    String fileNames = Util.null2String(ufContractInfoDTO.getFileName());
-    String[] contractNoArr = contractNos.split(",");
-    String[] fileNameArr = fileNames.split(",");
-    toolUtil.writeDebuggerLog("下载合同download4mFDD！");
-    if (contractNoArr.length >= 2) {
-      //			多个文件，需要下载压缩包
-      return outputStream -> {
-        ZipOutputStream zipOut = new ZipOutputStream(outputStream);
-        int catchLen = 10 * 1024;
-        for (int i = 0; i < contractNoArr.length; i++) {
-          //					InputStream inputStream = downloadContract(contractNoArr[i],
-          // String.valueOf(ufContractInfoDTO.getWorkflowType()));
-          Map<String, Object> data = new HashMap<>();
-          data.put("contractNo", contractNoArr[i]);
-          AtomicReference<InputStream> content = new AtomicReference<>();
-          int finalI = i;
-          FaDDRequestUtils.downContract(
-              data,
-              response -> {
-                HttpEntity entity = response.getEntity();
-                if (response.getStatusLine().getStatusCode() != 200) {
-                  throw new RuntimeException("法大大请求接口错误！");
-                }
-                try {
-                  content.set(entity.getContent());
-                  zipOut.putNextEntry(new ZipEntry(fileNameArr[finalI]));
-                  byte[] buffer = new byte[catchLen];
-                  int len = 0;
-                  while ((len = content.get().read(buffer)) != -1) {
-                    zipOut.write(buffer, 0, len);
-                  }
-                  content.get().close();
-                  zipOut.closeEntry();
-                } catch (IOException e) {
-                  e.printStackTrace();
-                  toolUtil.writeErrorLog("文件压缩处理出现问题！" + e);
-                }
-              },
-              apiConfigMainDTO.getApiUrl());
+        //		 获取配置表信息
+        FaDaDaConfigDTO faDaDaConfigDTO =
+                faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 5);
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
+        String contractNos = Util.null2String(ufContractInfoDTO.getContractNo());
+        String[] split = contractNos.split(",");
+        List<String> docIds = new ArrayList<>();
+        for (String contractNo : split) {
+            //			InputStream inputStream = downloadContract(s,
+            // String.valueOf(ufContractInfoDTO.getWorkflowType()));
+            Map<String, Object> data = new HashMap<>();
+            data.put("contractNo", contractNo);
+            AtomicReference<InputStream> content = new AtomicReference<>();
+            FaDDRequestUtils.downContract(
+                    data,
+                    response -> {
+                        HttpEntity entity = response.getEntity();
+                        if (response.getStatusLine().getStatusCode() != 200) {
+                            throw new RuntimeException("法大大请求接口错误！");
+                        }
+                        try {
+                            content.set(entity.getContent());
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                        }
+                        byte[] byteArray = null;
+                        try {
+                            byteArray = IOUtils.toByteArray(content.get());
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            toolUtil.writeErrorLog("文件流处理错误，将inputStream转换为byte数组出错：" + e);
+                        }
+                        this.toolUtil.writeErrorLog(ufContractInfoDTO.toString());
+                        String base64 = Base64Utils.encode(byteArray);
+                        FileProcessor fileProcessor = new FileProcessor();
+                        //				toolUtil.writeDebuggerLog("base64：" + "base64:" + base64);
+                        toolUtil.writeDebuggerLog("category：" + category);
+                        //				toolUtil.writeDebuggerLog("user：" + JSON.toJSONString(user));
+                        toolUtil.writeDebuggerLog("fileName：" + ufContractInfoDTO.getFileName());
+                        docIds.add(
+                                String.valueOf(
+                                        fileProcessor.Process(
+                                                "base64:" + base64, category, user, ufContractInfoDTO.getFileName())));
+                    },
+                    apiConfigMainDTO.getApiUrl());
         }
-        zipOut.flush();
-        zipOut.close();
-        outputStream.flush();
-        outputStream.close();
-      };
+        return String.join(",", docIds);
+    }
+
+    public InputStream downloadContract(String contractNo, String workflowId) {
+        //		 获取配置表信息
+        FaDaDaConfigDTO faDaDaConfigDTO = faDDContractMapping.queryConfig(workflowId, 5);
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
+        Map<String, Object> data = new HashMap<>();
+        data.put("contractNo", contractNo);
+        AtomicReference<InputStream> content = new AtomicReference<>();
+        FaDDRequestUtils.downContract(
+                data,
+                response -> {
+                    HttpEntity entity = response.getEntity();
+                    if (response.getStatusLine().getStatusCode() != 200) {
+                        throw new RuntimeException("法大大请求接口错误！");
+                    }
+                    try {
+                        content.set(entity.getContent());
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                },
+                apiConfigMainDTO.getApiUrl());
+        return content.get();
+    }
+
+    /**
+     * 直接从法大大系统下载文件
+     *
+     * @param ufContractInfoDTO 合同相关信息
+     * @return
+     */
+    public StreamingOutput download4mFDD(UfContractInfoDTO ufContractInfoDTO) {
+        //		 获取配置表信息
+        FaDaDaConfigDTO faDaDaConfigDTO =
+                faDDContractMapping.queryConfig(String.valueOf(ufContractInfoDTO.getWorkflowType()), 5);
+        ApiConfigMainDTO apiConfigMainDTO = Util.queryApiConfig(faDaDaConfigDTO.getParamsConfig());
+        //		查询合同信息
+        //		UfContractInfoDTO ufContractInfoDTO =
+        // faDDContractMapping.queryContractInfoByRequestId(requestId);
+        String contractNos = Util.null2String(ufContractInfoDTO.getContractNo());
+        String fileNames = Util.null2String(ufContractInfoDTO.getFileName());
+        String[] contractNoArr = contractNos.split(",");
+        String[] fileNameArr = fileNames.split(",");
+        toolUtil.writeDebuggerLog("下载合同download4mFDD！");
+        if (contractNoArr.length >= 2) {
+            //			多个文件，需要下载压缩包
+            return outputStream -> {
+                ZipOutputStream zipOut = new ZipOutputStream(outputStream);
+                int catchLen = 10 * 1024;
+                for (int i = 0; i < contractNoArr.length; i++) {
+                    //					InputStream inputStream = downloadContract(contractNoArr[i],
+                    // String.valueOf(ufContractInfoDTO.getWorkflowType()));
+                    Map<String, Object> data = new HashMap<>();
+                    data.put("contractNo", contractNoArr[i]);
+                    AtomicReference<InputStream> content = new AtomicReference<>();
+                    int finalI = i;
+                    FaDDRequestUtils.downContract(
+                            data,
+                            response -> {
+                                HttpEntity entity = response.getEntity();
+                                if (response.getStatusLine().getStatusCode() != 200) {
+                                    throw new RuntimeException("法大大请求接口错误！");
+                                }
+                                try {
+                                    content.set(entity.getContent());
+                                    zipOut.putNextEntry(new ZipEntry(fileNameArr[finalI]));
+                                    byte[] buffer = new byte[catchLen];
+                                    int len = 0;
+                                    while ((len = content.get().read(buffer)) != -1) {
+                                        zipOut.write(buffer, 0, len);
+                                    }
+                                    content.get().close();
+                                    zipOut.closeEntry();
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                    toolUtil.writeErrorLog("文件压缩处理出现问题！" + e);
+                                }
+                            },
+                            apiConfigMainDTO.getApiUrl());
+                }
+                zipOut.flush();
+                zipOut.close();
+                outputStream.flush();
+                outputStream.close();
+            };
+        }
+        return outputStream -> {
+            toolUtil.writeDebuggerLog("download4mFDD单文件下载！");
+            //			InputStream inputStream =
+            // downloadContract(contractNos,String.valueOf(ufContractInfoDTO.getWorkflowType()));
+            Map<String, Object> data = new HashMap<>();
+            data.put("contractNo", contractNos);
+            AtomicReference<InputStream> content = new AtomicReference<>();
+            FaDDRequestUtils.downContract(
+                    data,
+                    response -> {
+                        HttpEntity entity = response.getEntity();
+                        if (response.getStatusLine().getStatusCode() != 200) {
+                            throw new RuntimeException("法大大请求接口错误！");
+                        }
+                        try {
+                            content.set(entity.getContent());
+                            int catchLen = 10 * 1024;
+                            byte[] buffer = new byte[catchLen];
+                            int len = 0;
+                            while ((len = content.get().read(buffer)) != -1) {
+                                outputStream.write(buffer, 0, len);
+                            }
+                            content.get().close();
+                            outputStream.flush();
+                            outputStream.close();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            toolUtil.writeErrorLog("单文件下载处理出现问题！" + e);
+                        }
+                    },
+                    apiConfigMainDTO.getApiUrl());
+        };
     }
-    return outputStream -> {
-      toolUtil.writeDebuggerLog("download4mFDD单文件下载！");
-      //			InputStream inputStream =
-      // downloadContract(contractNos,String.valueOf(ufContractInfoDTO.getWorkflowType()));
-      Map<String, Object> data = new HashMap<>();
-      data.put("contractNo", contractNos);
-      AtomicReference<InputStream> content = new AtomicReference<>();
-      FaDDRequestUtils.downContract(
-          data,
-          response -> {
-            HttpEntity entity = response.getEntity();
-            if (response.getStatusLine().getStatusCode() != 200) {
-              throw new RuntimeException("法大大请求接口错误！");
-            }
-            try {
-              content.set(entity.getContent());
-              int catchLen = 10 * 1024;
-              byte[] buffer = new byte[catchLen];
-              int len = 0;
-              while ((len = content.get().read(buffer)) != -1) {
-                outputStream.write(buffer, 0, len);
-              }
-              content.get().close();
-              outputStream.flush();
-              outputStream.close();
-            } catch (IOException e) {
-              e.printStackTrace();
-              toolUtil.writeErrorLog("单文件下载处理出现问题！" + e);
-            }
-          },
-          apiConfigMainDTO.getApiUrl());
-    };
-  }
 }
diff --git a/customization/test/NewUtilTest.java b/customization/test/NewUtilTest.java
index c6fde67..8e04ce4 100644
--- a/customization/test/NewUtilTest.java
+++ b/customization/test/NewUtilTest.java
@@ -1,6 +1,8 @@
 package customization.test;
 
+import aiyh.utils.LabelHtmlUtils;
 import aiyh.utils.Util;
+import aiyh.utils.entity.LabelHtmlIndex;
 import aiyh.utils.fileUtil.ProperUtil;
 import com.alibaba.fastjson.JSON;
 import com.api.aiyh_pcn.patentWall.service.PatentWallService;
@@ -28,380 +30,396 @@ import java.util.regex.Pattern;
 
 
 public class NewUtilTest {
-	@Before
-	public void before() throws Exception {
-		GCONST.setServerName("ecology");
-		GCONST.setRootPath("H:\\e-cology-dev\\web\\");
-	}
+    @Before
+    public void before() throws Exception {
+        GCONST.setServerName("ecology");
+        GCONST.setRootPath("H:\\e-cology-dev\\web\\");
+    }
 
-	@AfterClass
-	public static void after() {
-		System.out.println("单元测试结束！");
-	}
+    @AfterClass
+    public static void after() {
+        System.out.println("单元测试结束！");
+    }
 
 
-	@Test
-	public void testKey() {
-		String key = "aiyh.patent.config[11].public";
-		String pattern = "^(aiyh.patent\\.)(?<key>(\\w+))$";
-		String pattern1 = "^(aiyh.patent\\.)(?<key>(?<objKey>(\\w+))\\.(\\S)+(?!\\[))";
-		String pattern2 = "^(aiyh.patent\\.)(?<key>(\\w+))(\\[([0-9])+])$";
-		String pattern3 = "^(aiyh.patent\\.)(?<key>(\\w+))(\\[(?<index>([0-9])+)])\\.(?<objKey>(\\S)+)$";
-		Pattern compile = Pattern.compile(pattern);
-		Matcher matcher = compile.matcher(key);
-		while (matcher.find()) {
-			System.out.println("单一值");
-			System.out.println(matcher.group("key"));
-		}
+    @Test
+    public void testKey() {
+        String key = "aiyh.patent.config[11].public";
+        String pattern = "^(aiyh.patent\\.)(?<key>(\\w+))$";
+        String pattern1 = "^(aiyh.patent\\.)(?<key>(?<objKey>(\\w+))\\.(\\S)+(?!\\[))";
+        String pattern2 = "^(aiyh.patent\\.)(?<key>(\\w+))(\\[([0-9])+])$";
+        String pattern3 = "^(aiyh.patent\\.)(?<key>(\\w+))(\\[(?<index>([0-9])+)])\\.(?<objKey>(\\S)+)$";
+        Pattern compile = Pattern.compile(pattern);
+        Matcher matcher = compile.matcher(key);
+        while (matcher.find()) {
+            System.out.println("单一值");
+            System.out.println(matcher.group("key"));
+        }
 
-		compile = Pattern.compile(pattern2);
-		matcher = compile.matcher(key);
-		while (matcher.find()) {
-			System.out.println("数组");
-			System.out.println(matcher.group("key"));
-		}
+        compile = Pattern.compile(pattern2);
+        matcher = compile.matcher(key);
+        while (matcher.find()) {
+            System.out.println("数组");
+            System.out.println(matcher.group("key"));
+        }
 
-		compile = Pattern.compile(pattern3);
-		matcher = compile.matcher(key);
-		while (matcher.find()) {
-			System.out.println("对象数组");
-			System.out.println(matcher.group("key"));
-			System.out.println(matcher.group("objKey"));
-			System.out.println(matcher.group("index"));
-		}
+        compile = Pattern.compile(pattern3);
+        matcher = compile.matcher(key);
+        while (matcher.find()) {
+            System.out.println("对象数组");
+            System.out.println(matcher.group("key"));
+            System.out.println(matcher.group("objKey"));
+            System.out.println(matcher.group("index"));
+        }
 
-		compile = Pattern.compile(pattern1);
-		matcher = compile.matcher(key);
-		while (matcher.find()) {
-			System.out.println("多个");
-			System.out.println(matcher.group("key"));
-			System.out.println(matcher.group("objKey"));
-		}
-	}
+        compile = Pattern.compile(pattern1);
+        matcher = compile.matcher(key);
+        while (matcher.find()) {
+            System.out.println("多个");
+            System.out.println(matcher.group("key"));
+            System.out.println(matcher.group("objKey"));
+        }
+    }
 
-	@Test
-	public void testGetPro() {
-		String key = "aiyh.patent.config[0]";
-		String prefix = "aiyh.patent";
-		String value = "第一个元素";
-		getPro(prefix, key, value);
-	}
+    @Test
+    public void testGetPro() {
+        String key = "aiyh.patent.config[0]";
+        String prefix = "aiyh.patent";
+        String value = "第一个元素";
+        getPro(prefix, key, value);
+    }
 
 
-	public void getPro(String prefix, String key, Object value) {
-		Map<String, Object> result = new HashMap<>();
+    public void getPro(String prefix, String key, Object value) {
+        Map<String, Object> result = new HashMap<>();
 //		result = keyHandler(prefix, key, value, result);
-		String key2 = "aiyh.patent.config[1]";
+        String key2 = "aiyh.patent.config[1]";
 //		result = keyHandler(prefix, key2, "第二个元素", result);
-		System.out.println(JSON.toJSONString(result));
-	}
+        System.out.println(JSON.toJSONString(result));
+    }
 
-	@Test
-	public void redPro() {
-		String fileName = "test";
-		String prefix = "aiyh.patentWall";
-		Map<String, Object> result = Util.readProperties2Map(fileName, prefix);
-		System.out.println(JSON.toJSONString(result));
-	}
+    @Test
+    public void redPro() {
+        String fileName = "test";
+        String prefix = "aiyh.patentWall";
+        Map<String, Object> result = Util.readProperties2Map(fileName, prefix);
+        System.out.println(JSON.toJSONString(result));
+    }
 
-	public Map<String, Object> getProperties2Map(String fileName, String prefix) {
-		String propertyPath = GCONST.getPropertyPath();
-		if (StringUtil.isNullOrEmpty(fileName)) {
-			return null;
-		}
-		if (fileName.contains(".properties")) {
-			fileName.replace(".properties", "");
-		}
-		String path = propertyPath + "prop2map" + File.separator + fileName + ".properties";
-		ProperUtil prop = new ProperUtil();
-		Map<String, Object> map = new HashMap<>();
-		InputStream inputStream = null;
-		try {
-			inputStream = new BufferedInputStream(new FileInputStream(path));
-			prop.load(inputStream);
+    public Map<String, Object> getProperties2Map(String fileName, String prefix) {
+        String propertyPath = GCONST.getPropertyPath();
+        if (StringUtil.isNullOrEmpty(fileName)) {
+            return null;
+        }
+        if (fileName.contains(".properties")) {
+            fileName.replace(".properties", "");
+        }
+        String path = propertyPath + "prop2map" + File.separator + fileName + ".properties";
+        ProperUtil prop = new ProperUtil();
+        Map<String, Object> map = new HashMap<>();
+        InputStream inputStream = null;
+        try {
+            inputStream = new BufferedInputStream(new FileInputStream(path));
+            prop.load(inputStream);
 //			Enumeration<?> enumeration = prop.propertyNames();
 //			顺序读取
-			Enumeration<?> enumeration = prop.keys();
-			while (enumeration.hasMoreElements()) {
-				String key = (String) enumeration.nextElement();
-				String value = prop.getProperty(key);
-				System.out.println(key);
-				keyHandler(prefix, key, value, map);
-				;
-			}
-		} catch (IOException e) {
-			throw new RuntimeException("找不到文件：" + path);
-		} finally {
-			try {
-				if (inputStream != null) {
-					inputStream.close();
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return map;
-	}
+            Enumeration<?> enumeration = prop.keys();
+            while (enumeration.hasMoreElements()) {
+                String key = (String) enumeration.nextElement();
+                String value = prop.getProperty(key);
+                System.out.println(key);
+                keyHandler(prefix, key, value, map);
+                ;
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("找不到文件：" + path);
+        } finally {
+            try {
+                if (inputStream != null) {
+                    inputStream.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return map;
+    }
 
 
-	public Map<String, Object> keyHandler(String prePrefix, String key, Object value, Map<String, Object> preResult) {
-		String objRegex = "^(" + prePrefix + "\\.)(?<key>(\\w+))$";
-		Pattern compile = Pattern.compile(objRegex);
-		Matcher matcher = compile.matcher(key);
-		if (matcher.find()) {
+    public Map<String, Object> keyHandler(String prePrefix, String key, Object value, Map<String, Object> preResult) {
+        String objRegex = "^(" + prePrefix + "\\.)(?<key>(\\w+))$";
+        Pattern compile = Pattern.compile(objRegex);
+        Matcher matcher = compile.matcher(key);
+        if (matcher.find()) {
 //			只匹配前缀.key=value模式的
-			String resultKey = matcher.group("key");
-			preResult.put(resultKey, prop2MapPutValue(value));
-		}
-		String moreKey = "^(" + prePrefix + "\\.)(?<key>(?<objKey>(\\w+))\\.(\\S)+(?!\\[))";
-		compile = Pattern.compile(moreKey);
-		matcher = compile.matcher(key);
-		if (matcher.find()) {
+            String resultKey = matcher.group("key");
+            preResult.put(resultKey, prop2MapPutValue(value));
+        }
+        String moreKey = "^(" + prePrefix + "\\.)(?<key>(?<objKey>(\\w+))\\.(\\S)+(?!\\[))";
+        compile = Pattern.compile(moreKey);
+        matcher = compile.matcher(key);
+        if (matcher.find()) {
 //			匹配前缀.key1.key2=value模式的
-			String objKey = matcher.group("objKey");
-			String prefixStr = prePrefix + "." + objKey;
-			Map<String, Object> valueMap;
-			if (preResult.containsKey(objKey)) {
-				valueMap = (Map<String, Object>) preResult.get(objKey);
-				keyHandler(prefixStr, key, value, valueMap);
-				return null;
-			}
-			valueMap = new HashMap<>();
-			keyHandler(prefixStr, key, value, valueMap);
-			preResult.put(objKey, valueMap);
-			return null;
-		}
-		String strList = "^(" + prePrefix + "\\.)(?<key>(\\w+))(\\[(?<index>([0-9])+)])$";
-		compile = Pattern.compile(strList);
-		matcher = compile.matcher(key);
-		if (matcher.find()) {
+            String objKey = matcher.group("objKey");
+            String prefixStr = prePrefix + "." + objKey;
+            Map<String, Object> valueMap;
+            if (preResult.containsKey(objKey)) {
+                valueMap = (Map<String, Object>) preResult.get(objKey);
+                keyHandler(prefixStr, key, value, valueMap);
+                return null;
+            }
+            valueMap = new HashMap<>();
+            keyHandler(prefixStr, key, value, valueMap);
+            preResult.put(objKey, valueMap);
+            return null;
+        }
+        String strList = "^(" + prePrefix + "\\.)(?<key>(\\w+))(\\[(?<index>([0-9])+)])$";
+        compile = Pattern.compile(strList);
+        matcher = compile.matcher(key);
+        if (matcher.find()) {
 //			匹配前缀.key[0]=value模式的
-			String objKey = matcher.group("key");
-			int index = Integer.parseInt(matcher.group("index"));
-			if (preResult.containsKey(objKey)) {
+            String objKey = matcher.group("key");
+            int index = Integer.parseInt(matcher.group("index"));
+            if (preResult.containsKey(objKey)) {
 //				存在值
-				List<Object> valueList = (List<Object>) preResult.get(objKey);
-				if (index >= valueList.size()) {
-					valueList.add(prop2MapPutValue(value));
-				} else {
-					valueList.set(index, prop2MapPutValue(value));
-				}
-				return null;
-			}
-			List<Object> valueList = new ArrayList<>();
-			valueList.add(prop2MapPutValue(value));
-			preResult.put(objKey, valueList);
-			return null;
-		}
-		String objArray = "^(" + prePrefix + "\\.)(?<arrKey>(\\w+))(\\[(?<index>([0-9])+)])\\.(?<objKey>(\\S)+)$";
+                List<Object> valueList = (List<Object>) preResult.get(objKey);
+                if (index >= valueList.size()) {
+                    valueList.add(prop2MapPutValue(value));
+                } else {
+                    valueList.set(index, prop2MapPutValue(value));
+                }
+                return null;
+            }
+            List<Object> valueList = new ArrayList<>();
+            valueList.add(prop2MapPutValue(value));
+            preResult.put(objKey, valueList);
+            return null;
+        }
+        String objArray = "^(" + prePrefix + "\\.)(?<arrKey>(\\w+))(\\[(?<index>([0-9])+)])\\.(?<objKey>(\\S)+)$";
 //		String objArray = "^("+prePrefix+"\\.)(?<arrKey>(\\w+))(\\[(?<index>([0-9])+)])(\\.(?<objKey>(\\S)+))+";
-		compile = Pattern.compile(objArray);
-		matcher = compile.matcher(key);
-		if (matcher.find()) {
+        compile = Pattern.compile(objArray);
+        matcher = compile.matcher(key);
+        if (matcher.find()) {
 //			匹配前缀.key[0].name=value的模式
-			String arrKey = matcher.group("arrKey");
-			String objKey = matcher.group("objKey");
-			int index = Integer.parseInt(matcher.group("index"));
-			List<Map<String, Object>> mapList;
-			if (preResult.containsKey(arrKey)) {
+            String arrKey = matcher.group("arrKey");
+            String objKey = matcher.group("objKey");
+            int index = Integer.parseInt(matcher.group("index"));
+            List<Map<String, Object>> mapList;
+            if (preResult.containsKey(arrKey)) {
 //				存在
-				mapList = (List<Map<String, Object>>) preResult.get(arrKey);
+                mapList = (List<Map<String, Object>>) preResult.get(arrKey);
 //				mapList
-				Map<String, Object> valueMap;
-				if (index >= mapList.size()) {
-					valueMap = new HashMap<>();
-					valueMap.put(objKey, prop2MapPutValue(value));
-					mapList.add(valueMap);
-					return null;
-				}
-				valueMap = mapList.get(index);
-				String arrMoreKey = "(?<key>(\\w+))\\.(\\S)+(?!\\[)";
-				Pattern arrMoreKeyCompile = Pattern.compile(arrMoreKey);
-				Matcher arrMoreKeyMatcher = arrMoreKeyCompile.matcher(objKey);
-				if (arrMoreKeyMatcher.find()) {
-					String arrMoreObjKey = arrMoreKeyMatcher.group("key");
-					Map<String, Object> arrMoreValue;
-					if (valueMap.containsKey(arrMoreObjKey)) {
-						arrMoreValue = (Map<String, Object>) valueMap.get(arrMoreObjKey);
-						keyHandler(arrMoreObjKey, objKey, value, arrMoreValue);
-						return null;
-					}
-					arrMoreValue = new HashMap<>();
-					keyHandler(arrMoreObjKey, objKey, value, arrMoreValue);
-					valueMap.put(arrMoreObjKey, arrMoreValue);
-					return null;
-				}
-				arrMoreKey = "(?<key>(\\w+))(\\[(?<index>([0-9])+)])$";
-				arrMoreKeyCompile = Pattern.compile(arrMoreKey);
-				arrMoreKeyMatcher = arrMoreKeyCompile.matcher(objKey);
-				if (arrMoreKeyMatcher.find()) {
-					String arrMoreArrKey = arrMoreKeyMatcher.group("key");
-					int arrMoreIndex = Integer.parseInt(arrMoreKeyMatcher.group("index"));
-					List<Object> arrMoreListValue;
-					if (valueMap.containsKey(arrMoreArrKey)) {
+                Map<String, Object> valueMap;
+                if (index >= mapList.size()) {
+                    valueMap = new HashMap<>();
+                    valueMap.put(objKey, prop2MapPutValue(value));
+                    mapList.add(valueMap);
+                    return null;
+                }
+                valueMap = mapList.get(index);
+                String arrMoreKey = "(?<key>(\\w+))\\.(\\S)+(?!\\[)";
+                Pattern arrMoreKeyCompile = Pattern.compile(arrMoreKey);
+                Matcher arrMoreKeyMatcher = arrMoreKeyCompile.matcher(objKey);
+                if (arrMoreKeyMatcher.find()) {
+                    String arrMoreObjKey = arrMoreKeyMatcher.group("key");
+                    Map<String, Object> arrMoreValue;
+                    if (valueMap.containsKey(arrMoreObjKey)) {
+                        arrMoreValue = (Map<String, Object>) valueMap.get(arrMoreObjKey);
+                        keyHandler(arrMoreObjKey, objKey, value, arrMoreValue);
+                        return null;
+                    }
+                    arrMoreValue = new HashMap<>();
+                    keyHandler(arrMoreObjKey, objKey, value, arrMoreValue);
+                    valueMap.put(arrMoreObjKey, arrMoreValue);
+                    return null;
+                }
+                arrMoreKey = "(?<key>(\\w+))(\\[(?<index>([0-9])+)])$";
+                arrMoreKeyCompile = Pattern.compile(arrMoreKey);
+                arrMoreKeyMatcher = arrMoreKeyCompile.matcher(objKey);
+                if (arrMoreKeyMatcher.find()) {
+                    String arrMoreArrKey = arrMoreKeyMatcher.group("key");
+                    int arrMoreIndex = Integer.parseInt(arrMoreKeyMatcher.group("index"));
+                    List<Object> arrMoreListValue;
+                    if (valueMap.containsKey(arrMoreArrKey)) {
 //						存在值
-						arrMoreListValue = (List<Object>) valueMap.get(arrMoreArrKey);
-						if (arrMoreIndex >= arrMoreListValue.size()) {
-							arrMoreListValue.add(prop2MapPutValue(value));
-						} else {
-							arrMoreListValue.set(arrMoreIndex, prop2MapPutValue(value));
-						}
-						return null;
-					}
-					arrMoreListValue = new ArrayList<>();
-					arrMoreListValue.add(prop2MapPutValue(value));
-					valueMap.put(arrMoreArrKey, arrMoreListValue);
-					return null;
-				}
+                        arrMoreListValue = (List<Object>) valueMap.get(arrMoreArrKey);
+                        if (arrMoreIndex >= arrMoreListValue.size()) {
+                            arrMoreListValue.add(prop2MapPutValue(value));
+                        } else {
+                            arrMoreListValue.set(arrMoreIndex, prop2MapPutValue(value));
+                        }
+                        return null;
+                    }
+                    arrMoreListValue = new ArrayList<>();
+                    arrMoreListValue.add(prop2MapPutValue(value));
+                    valueMap.put(arrMoreArrKey, arrMoreListValue);
+                    return null;
+                }
 
 //				直接添加
-				valueMap.put(objKey, prop2MapPutValue(value));
-				return null;
-			}
+                valueMap.put(objKey, prop2MapPutValue(value));
+                return null;
+            }
 //			不存在
-			mapList = new ArrayList<>();
-			Map<String, Object> valueMap = new HashMap<>();
-			valueMap.put(objKey, prop2MapPutValue(value));
-			mapList.add(valueMap);
-			preResult.put(arrKey, mapList);
-		}
-		return null;
-	}
+            mapList = new ArrayList<>();
+            Map<String, Object> valueMap = new HashMap<>();
+            valueMap.put(objKey, prop2MapPutValue(value));
+            mapList.add(valueMap);
+            preResult.put(arrKey, mapList);
+        }
+        return null;
+    }
 
-	public Object prop2MapPutValue(Object value) {
-		if (value == null) {
-			return null;
-		}
-		String valueStr = String.valueOf(value).trim();
-		if (valueStr.startsWith("\"") && valueStr.endsWith("\"")) {
-			return valueStr.substring(1, valueStr.length() - 1);
-		}
-		if (valueStr.contains(",")) {
-			return valueStr.split(",");
-		}
-		return value;
-	}
+    public Object prop2MapPutValue(Object value) {
+        if (value == null) {
+            return null;
+        }
+        String valueStr = String.valueOf(value).trim();
+        if (valueStr.startsWith("\"") && valueStr.endsWith("\"")) {
+            return valueStr.substring(1, valueStr.length() - 1);
+        }
+        if (valueStr.contains(",")) {
+            return valueStr.split(",");
+        }
+        return value;
+    }
 
-	@Test
-	public void testSubstr() {
-		System.out.println("\"这个是文本框\"".trim().substring(1, "\"这个是文本框\"".trim().length() - 1));
-	}
+    @Test
+    public void testSubstr() {
+        System.out.println("\"这个是文本框\"".trim().substring(1, "\"这个是文本框\"".trim().length() - 1));
+    }
 
-	@Test
-	public void testSplit() {
-		String str = "12,343,89\\,99";
-		String str1 = "abcd'efg'hig?'klmn";
-		String[] data = str1.split("(?<!\\?)'");
-		System.out.println(Arrays.toString(data));
-		String[] split = str.split("(?<!\\\\),");
-		System.out.println(Arrays.toString(split));
-		for (int i = 0; i < split.length; i++) {
-			split[i] = split[i].replaceAll("\\\\,", ",");
-		}
-		for (String s : split) {
-			System.out.println(s);
-		}
-	}
+    @Test
+    public void testSplit() {
+        String str = "12,343,89\\,99";
+        String str1 = "abcd'efg'hig?'klmn";
+        String[] data = str1.split("(?<!\\?)'");
+        System.out.println(Arrays.toString(data));
+        String[] split = str.split("(?<!\\\\),");
+        System.out.println(Arrays.toString(split));
+        for (int i = 0; i < split.length; i++) {
+            split[i] = split[i].replaceAll("\\\\,", ",");
+        }
+        for (String s : split) {
+            System.out.println(s);
+        }
+    }
 
 
-	@Test
-	public void testLanguage() {
-		String selectName = "~`~`7 其它 不知道 管他呢，阿斯顿发的`~`8 other`~`9 其它`~`~";
-		String showName = selectName;
-		if (selectName.startsWith("~`~`") && selectName.endsWith("`~`~")) {
-			String pattern = "(`~`7 )(?<lable>(\\w*|\\W*|[\\u4e00-\\u9fa5]*))(`~`)";
-			Pattern compile = Pattern.compile(pattern);
-			Matcher matcher = compile.matcher(selectName);
-			if (matcher.find()) {
-				showName = matcher.group("lable");
-			}
-		}
-		System.out.println(showName);
-	}
+    @Test
+    public void testLanguage() {
+        String selectName = "~`~`7 其它 不知道 管他呢，阿斯顿发的`~`8 other`~`9 其它`~`~";
+        String showName = selectName;
+        if (selectName.startsWith("~`~`") && selectName.endsWith("`~`~")) {
+            String pattern = "(`~`7 )(?<lable>(\\w*|\\W*|[\\u4e00-\\u9fa5]*))(`~`)";
+            Pattern compile = Pattern.compile(pattern);
+            Matcher matcher = compile.matcher(selectName);
+            if (matcher.find()) {
+                showName = matcher.group("lable");
+            }
+        }
+        System.out.println(showName);
+    }
 
-	@Test
-	public void testPatentServer() {
-		PatentWallService patentWallService = new PatentWallService();
-		List<SearchInputVO> inputList = patentWallService.getSearchList("patentWall", 8);
-		System.out.println(JSON.toJSONString(inputList));
-		List<PatentVO> patentWallList = patentWallService.getList(null, "patentWall");
-		System.out.println(JSON.toJSONString(patentWallList));
-	}
+    @Test
+    public void testPatentServer() {
+        PatentWallService patentWallService = new PatentWallService();
+        List<SearchInputVO> inputList = patentWallService.getSearchList("patentWall", 8);
+        System.out.println(JSON.toJSONString(inputList));
+        List<PatentVO> patentWallList = patentWallService.getList(null, "patentWall");
+        System.out.println(JSON.toJSONString(patentWallList));
+    }
 
-	@Test
-	public void testRegx() {
-		String pattern = "\\$\\{(?<field>(\\s|\\S)+?)}";
-		Pattern compile = Pattern.compile(pattern);
-		Matcher matcher = compile.matcher("${id}");
-		if (matcher.find()) {
-			System.out.println(matcher.group("field"));
-		}
-	}
+    @Test
+    public void testRegx() {
+        String pattern = "\\$\\{(?<field>(\\s|\\S)+?)}";
+        Pattern compile = Pattern.compile(pattern);
+        Matcher matcher = compile.matcher("${id}");
+        if (matcher.find()) {
+            System.out.println(matcher.group("field"));
+        }
+    }
 
 
-	@Test
-	public void testSplic() {
-		List<Integer> list = new ArrayList<>();
-		list.add(0);
-		list.add(1);
-		list.add(2);
-		list.add(3);
-		list.add(4);
-		list.add(5);
-		list.add(6);
-		System.out.println(list);
-		System.out.println(list.subList(0, 2));
-		list.removeAll(list.subList(0, 2));
-		System.out.println(list);
-	}
+    @Test
+    public void testSplic() {
+        List<Integer> list = new ArrayList<>();
+        list.add(0);
+        list.add(1);
+        list.add(2);
+        list.add(3);
+        list.add(4);
+        list.add(5);
+        list.add(6);
+        System.out.println(list);
+        System.out.println(list.subList(0, 2));
+        list.removeAll(list.subList(0, 2));
+        System.out.println(list);
+    }
 
 
-	@Test
-	public void test() {
-		String bizContent = "{\"contractExtension\":\".pdf\",\"contractTitle\":\"PCN Template - Non-Disclosure Agreement (Corporate).pdf\",\"uploadType\":1,\"customerNo\":\"ecef845ba95a409393cb66271a41b0a6\"}";
-		System.out.println(cn.hutool.core.util.URLUtil.encodeAll(bizContent, Charset.forName("UTF-8")));
-	}
+    @Test
+    public void test() {
+        String bizContent = "{\"contractExtension\":\".pdf\",\"contractTitle\":\"PCN Template - Non-Disclosure Agreement (Corporate).pdf\",\"uploadType\":1,\"customerNo\":\"ecef845ba95a409393cb66271a41b0a6\"}";
+        System.out.println(cn.hutool.core.util.URLUtil.encodeAll(bizContent, Charset.forName("UTF-8")));
+    }
 
 
-	@Test
-	public void testReg() {
-		String var15 = "<html> \n" +
-				" <head> \n" +
-				" <title></title> \n" +
-				" <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/weaver/contents.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
-				" <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/plugins/copyformatting/styles/copyformatting.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
-				" <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/plugins/tableselection/styles/tableselection.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
-				" <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/plugins/image2/styles/image2.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
-				" <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/plugins/widget/styles/widget.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
-				" </head> \n" +
-				" <body style=\"height: 747px;\"> \n" +
-				" <p>< img alt=\"\" src=\"/weaver/weaver.file.FileDownload?fileid=acdde79d8027d30e809be35a885a28eb184a3d7609b33666049ac12a48c5c8c3c10908eae8d1f6d650bfffce6db986fb5069726005eaf18c1\" /></p > \n" +
-				" </body> \n" +
-				" </html> \n" +
-				" ";
+    @Test
+    public void testReg() {
+        String var15 = "<html> \n" +
+                " <head> \n" +
+                " <title></title> \n" +
+                " <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/weaver/contents.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
+                " <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/plugins/copyformatting/styles/copyformatting.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
+                " <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/plugins/tableselection/styles/tableselection.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
+                " <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/plugins/image2/styles/image2.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
+                " <link href=\"/cloudstore/resource/pc/ckeditor-4.6.2/plugins/widget/styles/widget.css\" rel=\"stylesheet\" type=\"text/css\" /> \n" +
+                " </head> \n" +
+                " <body style=\"height: 747px;\"> \n" +
+                " <p>< img alt=\"\" src=\"/weaver/weaver.file.FileDownload?fileid=acdde79d8027d30e809be35a885a28eb184a3d7609b33666049ac12a48c5c8c3c10908eae8d1f6d650bfffce6db986fb5069726005eaf18c1\" /></p > \n" +
+                " </body> \n" +
+                " </html> \n" +
+                " ";
 
-		ArrayList var17 = Util.matchAll(var15, "/weaver/weaver.file.FileDownload\\?fileid=([a-z0-9]+)", 1, 1);
+        ArrayList var17 = Util.matchAll(var15, "/weaver/weaver.file.FileDownload\\?fileid=([a-z0-9]+)", 1, 1);
 
-		System.out.println(var17.size());
-		System.out.println(var17);
-	}
+        System.out.println(var17.size());
+        System.out.println(var17);
+    }
 
 
-	@Test
-	public void testMessage() {
-		Set<String> userIdList = new HashSet<>(); //接收人id
-		userIdList.add("22");
-		userIdList.add("1");
-		String linkUrl = "/spa/cube/index.html#/main/cube/search?customid=36"; //PC端链接
-		String linkMobileUrl = ""; //移动端链接
-		String title = "我是标题淦";
-		String context = "我是内容啊啊啊";
-		try {
-			MessageBean messageBean = Util_Message.createMessage(MessageType.newInstance(1146), userIdList, title, context, linkUrl, linkMobileUrl);
-			messageBean.setCreater(1);//创建人id
-			Util_Message.store(messageBean);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
+    @Test
+    public void testMessage() {
+        Set<String> userIdList = new HashSet<>(); //接收人id
+        userIdList.add("22");
+        userIdList.add("1");
+        String linkUrl = "/spa/cube/index.html#/main/cube/search?customid=36"; //PC端链接
+        String linkMobileUrl = ""; //移动端链接
+        String title = "我是标题淦";
+        String context = "我是内容啊啊啊";
+        try {
+            MessageBean messageBean = Util_Message.createMessage(MessageType.newInstance(1146), userIdList, title, context, linkUrl, linkMobileUrl);
+            messageBean.setCreater(1);//创建人id
+            Util_Message.store(messageBean);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testGetTime() {
+        System.out.println(System.currentTimeMillis());
+        System.out.println(System.currentTimeMillis());
+    }
+
+
+    @Test
+    public void testPro() {
+        LabelHtmlUtils labelHtmlUtils = new LabelHtmlUtils("aiyh.htmlLabel.porsche");
+        Map<String, Object> faDDContractController = labelHtmlUtils.getHtmlLabelMap("FaDDContractController");
+        System.out.println(faDDContractController);
+        LabelHtmlIndex labelHtmlIndex = labelHtmlUtils.getLabelHtmlIndex(faDDContractController, "singedErr");
+        System.out.println(labelHtmlIndex);
+    }
 }
diff --git a/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java b/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java
index a615c9b..60e3a7e 100644
--- a/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java
+++ b/weaver/aiyh_pcn/workflow_to_customer/AddCustomer_Action.java
@@ -117,13 +117,15 @@ public class AddCustomer_Action extends ToolUtil implements Action {
             }
         } catch (LoginIdRepeatException e) {
             this.writeErrorLog(e + "\n");
-            this.request.getRequestManager().setMessagecontent("登录名重复，请重新输入登录名");
-            this.request.getRequestManager().setMessageid("登录名重复");
+            this.request.getRequestManager().setMessagecontent(aiyh.utils.Util.getHtmlLabelName(-91703,
+                    request.getRequestManager().getUser().getLanguage(), "登录名重复，请重新输入登录名"));
+            this.request.getRequestManager().setMessageid("1");
             return Action.FAILURE_AND_CONTINUE;
         } catch (Exception e) {
             this.writeDebuggerLog("insert customer error!");
             this.writeDebuggerLog(e + "\n");
-            this.request.getRequestManager().setMessagecontent("生成外部用户错误，请联系管理员！");
+            this.request.getRequestManager().setMessagecontent(aiyh.utils.Util.getHtmlLabelName(-91704,
+                    request.getRequestManager().getUser().getLanguage(), "生成外部用户错误，请联系管理员！"));
             this.request.getRequestManager().setMessageid("2");
         } finally {
             this.writeDebuggerLog(className, "------------" + className + " End -----------------");