|
@@ -16,6 +16,8 @@ import org.springblade.manager.dto.Coords;
|
|
|
import org.springblade.manager.entity.WbsTreeContract;
|
|
|
import org.springblade.manager.formula.ITableElementConverter;
|
|
|
import org.springblade.manager.formula.KeyMapper;
|
|
|
+import org.springblade.manager.vo.AppWbsTreeContractVO;
|
|
|
+
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
import java.util.regex.Matcher;
|
|
@@ -43,9 +45,10 @@ public class TableElementConverter implements ITableElementConverter {
|
|
|
Map<String,Map<String,String>> coordinateMap;
|
|
|
Map<String,ElementData> elementDataMap = new HashMap<>();
|
|
|
WbsTreeContract one;
|
|
|
+ List<AppWbsTreeContractVO> tableAll;
|
|
|
|
|
|
|
|
|
- public TableElementConverter(List<TableInfo> tableInfoList, List<KeyMapper> keyMappers, List<Formula> formulas, Map<String,Map<String,String>> coordinateMap, WbsTreeContract wtc) {
|
|
|
+ public TableElementConverter(List<TableInfo> tableInfoList, List<KeyMapper> keyMappers, List<Formula> formulas, Map<String,Map<String,String>> coordinateMap, WbsTreeContract wtc,List<AppWbsTreeContractVO> tableAll) {
|
|
|
this.tableInfoList = tableInfoList;
|
|
|
this.keyMappers = keyMappers;
|
|
|
this.formulas = formulas;
|
|
@@ -56,6 +59,7 @@ public class TableElementConverter implements ITableElementConverter {
|
|
|
this.contractId = Long.parseLong(tableInfoList.get(0).getContractId());
|
|
|
}
|
|
|
this.one=wtc;
|
|
|
+ this.tableAll=tableAll;
|
|
|
}
|
|
|
|
|
|
public TableElementConverter() {
|