试验关联表单,万盛电签ID

blade-service/blade-business/src/main/java/org/springblade/business/controller/TrialSummaryController.java

@@ -177,7 +177,6 @@ public class TrialSummaryController {
         if (ObjectUtil.isEmpty(sn)) {
             throw new ServiceException("汇总编号构造异常");
         }
-
         String sql_1 = "SELECT * FROM m_trial_summary_classification_configuration WHERE is_deleted = 0 AND status = 1 AND id = ?";
         TrialSummaryClassificationConfiguration classC = jdbcTemplate.query(sql_1, new Object[]{dto.getClassId()}, new BeanPropertyRowMapper<>(TrialSummaryClassificationConfiguration.class)).stream().findAny().orElse(null);
         if (classC != null && ObjectUtil.isNotEmpty(classC.getExcelId())
@@ -312,8 +311,21 @@ public class TrialSummaryController {
                 }
             }
 
+
+            Map<String, Object> map2 = new HashMap<>();
+             for(String mapKey : map.keySet()){
+                 for(TrialSummaryExcelTabReflection data: excelTabReflections){
+                    if(mapKey.equals((data.getElementKey()+"__"))){
+                        map2.put(data.getHtmlKeyName().split("__")[0]+"__",map.get(mapKey));
+                    }
+                 }
+             }
+
+
+
             String htmlString = this.html(classC.getHtmlUrl());
-            Map<String, String> indexMap = this.indexMap(htmlString, map);
+            Map<String, String> indexMap = this.indexMap(htmlString, map2);
+
             if (indexMap.size() > 0) {
                 ExcelTab excelTab = jdbcTemplate.query("SELECT file_url FROM m_excel_tab WHERE id = ?", new Object[]{classC.getExcelId()}, new BeanPropertyRowMapper<>(ExcelTab.class)).stream().findAny().orElse(null);
                 if (excelTab != null) {
@@ -525,13 +537,11 @@ public class TrialSummaryController {
                 "hc-table-form-upload", "hc-form-checkbox-group", "el-radio-group", "el-select"};
         for (String tagName : tagNames) {
             Elements matchedElements = doc.select(tagName);
-
             for (Map.Entry<String, Object> map : values.entrySet()) {
                 /*key：key_1__*/
                 String key = map.getKey();
                 String value = (String) map.getValue();
                 String[] data = value.split("@@@###");
-
                 /*排序，取data[]个数标签，依次构造数据*/
                 Elements keyElementGroup = new Elements();
                 for (Element element : matchedElements) {
@@ -540,7 +550,6 @@ public class TrialSummaryController {
                         keyElementGroup.add(element);
                     }
                 }
-
                 if (keyElementGroup.size() <= 0) {
                     continue;
                 }