diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java index 105afef..282c308 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableCell.java @@ -15,6 +15,8 @@ import java.util.Date; @Data public class DynTableCell { + // 单元格名称 + private String cellKey; // 排序 private Integer cellSeq; // 单元格名称 diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java index 93e5814..391cbf2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTablePackTool.java @@ -54,23 +54,25 @@ public class DynTablePackTool { * @return */ public static DynTableCell getTableCell(Integer seq,String name,Object value) { - return getTableCell(seq, name, null, value,null); + return getTableCell(seq,seq.toString(), name, null, value,null); } public static DynTableCell getTableCell(Integer seq,String name,Object value,Integer valueType) { - return getTableCell(seq, name, null, value,valueType); + return getTableCell(seq,seq.toString(), name, null, value,valueType); } /** * 创建一个单元格 * @param seq 单元格排序 + * @param key 单元格Key * @param name 单元格名称 * @param nameEn 单元格名称En * @param value 单元格数据 * @return */ - public static DynTableCell getTableCell(Integer seq,String name,String nameEn,Object value,Integer valueType){ + public static DynTableCell getTableCell(Integer seq,String key,String name,String nameEn,Object value,Integer valueType){ DynTableCell cell = new DynTableCell(); + cell.setCellKey(key); cell.setCellSeq(seq); cell.setCellName(name); cell.setCellNameEn(nameEn); diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java index 3ab4697..0475165 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/dynamic/table/DynTableRow.java @@ -27,16 +27,16 @@ public class DynTableRow { private Integer cellSize = 0; // 行数据 - private List cellList = new ArrayList<>(); + private Map cellMap = new HashMap<>(); - public DynTableRow addList(DynTableCell cell){ - this.cellList.add(cell); + public DynTableRow putCell(DynTableCell cell){ + this.cellMap.put(cell.getCellKey(),cell); return this; } public Integer getCellSize() { - return cellList != null ? cellList.size() : 0; + return cellMap != null ? cellMap.size() : 0; } /**