|
@@ -3,6 +3,7 @@ package org.springblade.manager.controller;
|
|
|
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
@@ -131,6 +132,8 @@ public class ExcelTabController extends BladeController {
|
|
|
// 项目信息
|
|
|
private final IProjectInfoService projectInfoService;
|
|
|
|
|
|
+ private final ITableInfoService tableInfoService;
|
|
|
+
|
|
|
/**
|
|
|
* 详情
|
|
|
*/
|
|
@@ -489,6 +492,12 @@ public class ExcelTabController extends BladeController {
|
|
|
//解析
|
|
|
Element table = doc.select("table").first();
|
|
|
Elements trs = table.select("tr");
|
|
|
+ if (aPrivate.getInitTableId() == null){
|
|
|
+ org.springblade.manager.entity.TableInfo tableInfo = tableInfoService.getOne(new LambdaQueryWrapper<org.springblade.manager.entity.TableInfo>()
|
|
|
+ .eq(org.springblade.manager.entity.TableInfo::getTabEnName, aPrivate.getInitTableName()));
|
|
|
+ aPrivate.setInitTableId(tableInfo.getId()+"");
|
|
|
+ updateWrapper.set("init_table_id", tableInfo.getId()+"");
|
|
|
+ }
|
|
|
|
|
|
List<WbsFormElement> elementList = wbsFormElementService.selectElementListByFid(aPrivate.getInitTableId() + "");
|
|
|
|