|
@@ -1262,17 +1262,17 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
}
|
|
}
|
|
|
|
|
|
//表单是否存储在
|
|
//表单是否存储在
|
|
- /* String tabName = wbsTreeContract.getInitTableName();
|
|
|
|
|
|
+ String tabName = wbsTreeContract.getInitTableName();
|
|
String isExitSql = " select * from information_schema.TABLES where TABLE_NAME='" + tabName + "'";
|
|
String isExitSql = " select * from information_schema.TABLES where TABLE_NAME='" + tabName + "'";
|
|
List<Map<String, Object>> tabList = jdbcTemplate.queryForList(isExitSql);
|
|
List<Map<String, Object>> tabList = jdbcTemplate.queryForList(isExitSql);
|
|
if (tabList == null || tabList.size() <= 0) {
|
|
if (tabList == null || tabList.size() <= 0) {
|
|
return reData;
|
|
return reData;
|
|
}
|
|
}
|
|
|
|
|
|
- String querySql = "select * from " + wbsTreeContract.getInitTableName() + " where p_key_id=" + pkeyId;*/
|
|
|
|
|
|
+ String querySql = "select * from " + wbsTreeContract.getInitTableName() + " where p_key_id=" + pkeyId;
|
|
|
|
|
|
|
|
|
|
- String querySql = "select * from table_data_info where p_key_id=" + pkeyId;
|
|
|
|
|
|
+ //String querySql = "select * from table_data_info where p_key_id=" + pkeyId;
|
|
List<Map<String, Object>> dataIn = jdbcTemplate.queryForList(querySql);
|
|
List<Map<String, Object>> dataIn = jdbcTemplate.queryForList(querySql);
|
|
|
|
|
|
// 匹配关联
|
|
// 匹配关联
|
|
@@ -1404,13 +1404,13 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
|
|
|
|
- if (dataIn != null && dataIn.size() >= 1) {
|
|
|
|
|
|
+ /* if (dataIn != null && dataIn.size() >= 1) {
|
|
for (Map<String, Object> data : dataIn) {
|
|
for (Map<String, Object> data : dataIn) {
|
|
reData.put(data.get("tab_key")+"",data.get("key_val"));
|
|
reData.put(data.get("tab_key")+"",data.get("key_val"));
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
- /*if (dataIn != null && dataIn.size() >= 1) {
|
|
|
|
|
|
+ if (dataIn != null && dataIn.size() >= 1) {
|
|
Map<String, Object> mysqlData = dataIn.get(0);
|
|
Map<String, Object> mysqlData = dataIn.get(0);
|
|
for (String key : mysqlData.keySet()) {
|
|
for (String key : mysqlData.keySet()) {
|
|
String tabVal = mysqlData.get(key) + "";
|
|
String tabVal = mysqlData.get(key) + "";
|
|
@@ -1475,7 +1475,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }*/
|
|
|
|
|
|
+ }
|
|
|
|
|
|
// 获取默认值
|
|
// 获取默认值
|
|
QueryWrapper<TextdictInfo> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<TextdictInfo> queryWrapper = new QueryWrapper<>();
|