|
|
|
@ -342,8 +342,14 @@ public class StuDigitalMarketingModelServiceImpl implements StuDigitalMarketingM
|
|
|
|
|
}else {
|
|
|
|
|
//查询导入的表数据
|
|
|
|
|
|
|
|
|
|
List<String> stringList=new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
List<String> stringList=uploadExcelUserMapper.selectByString(userId,tableName);
|
|
|
|
|
stringList=uploadExcelUserMapper.selectByString(userId,tableName);
|
|
|
|
|
|
|
|
|
|
//查询默认数据
|
|
|
|
|
if(stringList.isEmpty()){
|
|
|
|
|
stringList=uploadExcelUserMapper.selectByString("999999999",tableName);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (String s : stringList) {
|
|
|
|
@ -401,7 +407,13 @@ public class StuDigitalMarketingModelServiceImpl implements StuDigitalMarketingM
|
|
|
|
|
String userId = analyzeDataDTO.getUserId();
|
|
|
|
|
String tableName = analyzeDataDTO.getTableName();
|
|
|
|
|
|
|
|
|
|
List<Map<String,Object>> attributes = stuTableNameMapper.selectBuildTable(fieldList,table,userId,tableName);
|
|
|
|
|
List<Map<String,Object>> attributes=new ArrayList<>();
|
|
|
|
|
|
|
|
|
|
attributes = stuTableNameMapper.selectBuildTable(fieldList,table,userId,tableName);
|
|
|
|
|
|
|
|
|
|
if(attributes.isEmpty()){
|
|
|
|
|
attributes = stuTableNameMapper.selectBuildTable(fieldList,table,"999999999",tableName);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < attributes.size(); i++) {
|
|
|
|
|