Revert "后管-元素中间表"

This reverts commit e97b4f1faad1c0cc8a7e1ab8556b9f5b3a98f98a.

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsFormElement.java

@@ -77,11 +77,4 @@ public class WbsFormElement extends BaseEntity {
      */
     @ApiModelProperty(value = "exid")
     private Long exid;
-
-    /**
-     * 是否辅助（1-是，0-不是）
-     */
-    @ApiModelProperty(value = "是否辅助（1-是，0-不是）")
-    private Integer assist;
-
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -407,7 +407,6 @@
     <select id="selectFormElements" resultMap="wbsFormElementMap">
         select f_id,
                e_key,
-               a.assist,
                a.id,
                a.dynamic_dict,
                e_name,
@@ -426,7 +425,6 @@
         union
         select f_id,
                e_key,
-               a.assist,
                a.id,
                a.dynamic_dict,
                e_name,
@@ -447,7 +445,6 @@
         select b.id
              , IF(c.formula_id > 0, 1, 0)           globalFormula
              , b.e_name
-             , b.assist
              , e_type
              , e_length
              , e_allow_deviation

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -704,18 +704,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             } else {
                 List<WbsTreeContract> list = wbsTreeContractService.getBaseMapper().selectList(Wrappers.<WbsTreeContract>query().lambda().in(WbsTreeContract::getPKeyId, pkeyIds));
                 if (list.size() > 0) {
-                    list.forEach(e -> {
-                        Map<String, String> elementCell = FormulaUtils.getElementCell(e.getHtmlUrl());
-                        //扩展中间元素开发
-                        List<String> collect = keyMappers.stream().map(KeyMapper::getField).filter(f -> f.split("_").length == 2
-                                && Integer.parseInt(f.split("_")[1]) >= 1000
-                                && Integer.parseInt(f.split("_")[1]) <= 1100
-                                && elementCell.get(f) == null).collect(Collectors.toList());
-                        collect.forEach(f->{
-                            elementCell.put(f,"0_0");
-                        });
-                        coordinateMap.computeIfAbsent(e.getInitTableName(), k -> elementCell);
-                    });
+                    list.forEach(e -> coordinateMap.computeIfAbsent(e.getInitTableName(), k -> FormulaUtils.getElementCell(e.getHtmlUrl())));
                 }
             }
         }