فهرست منبع

质检公式执行前解析key201

lvy 1 ماه پیش
والد
کامیت
dc36202797

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

@@ -474,6 +474,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         List<Map<String, Object>> dataMap = this.jdbcTemplate.queryForList(selSql);
                         if (dataMap.size() > 0) {
                             dataMap.forEach(map -> {
+                                DataStructureFormatUtils.parseDataByKey(map);
                                 TableInfo e = new TableInfo();
                                 e.setPkeyId(map.get("p_key_id").toString());
                                 e.setDataMap(new LinkedHashMap<>());
@@ -1511,6 +1512,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         dataMap2.remove("id");
         dataMap2.remove("group_id");
         dataMap2.remove("p_key_id");
+        String key201 = dataMap2.remove("key_201");
         String fields = dataMap2.keySet().stream().map(key -> "'" + key + "'").collect(Collectors.joining(","));
         Map<String, Integer> map = new HashMap<>();
         if (!fields.isEmpty()) {
@@ -1529,6 +1531,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 e.printStackTrace();
             }
         }
+        if (key201 != null) {
+            Map<String, String> map1 = DataStructureFormatUtils.parseDataByKey(key201);
+            if (!map1.isEmpty()) {
+                opsParamMap.putAll(map1);
+            }
+        }
         for (String key : dataMap2.keySet()) {
             String[] split = key.split("_");
             if (split.length > 1 && Integer.parseInt(split[1]) > 80) {