解决试验汇总数据数量错误问题

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

@@ -197,6 +197,7 @@ public class TrialSummaryController {
                     .eq(TrialSelfInspectionRecord::getContractId, dto.getContractId())
                     .eq(TrialSelfInspectionRecord::getDetectionCategory, dto.getDetectionType())
                     .eq(TrialSelfInspectionRecord::getType, dto.getUnitType())
+                    .eq(TrialSelfInspectionRecord::getTaskStatus, "已审批")
                     .between(TrialSelfInspectionRecord::getReportDate, startDate, endDate)
             );
             if (records.size() <= 0) {
@@ -253,7 +254,7 @@ public class TrialSummaryController {
                                 String[] splitValues = valueRow.split(Pattern.quote("_^_"));
                                 String valueInput = splitValues[0];
                                 /*String indexKey = splitValues[1];*/
-                                String keyName = elementKey + "__";
+                                String keyName = elementKey + "__" + tabPkeyId;
 
                                 if (map.containsKey(keyName)) {
                                     String existingValue = (String) map.get(keyName);
@@ -269,7 +270,7 @@ public class TrialSummaryController {
                                 String[] splitValues = tabDataStr.split(Pattern.quote("_^_"));
                                 String valueInput = splitValues[0];
                                 /*String indexKey = splitValues[1];*/
-                                String keyName = elementKey + "__";
+                                String keyName = elementKey + "__" + tabPkeyId;
 
                                 //范围日期
                                 String[] split = valueInput.split(",");
@@ -293,7 +294,7 @@ public class TrialSummaryController {
                                 String[] splitValues = tabDataStr.split(Pattern.quote("_^_"));
                                 String valueInput = splitValues[0];
                                 /*String indexKey = splitValues[1];*/
-                                String keyName = elementKey + "__";
+                                String keyName = elementKey + "__" + tabPkeyId;
 
                                 //单日期
                                 LocalDateTime time = LocalDateTime.parse(valueInput, DateTimeFormatter.ISO_DATE_TIME);
@@ -311,7 +312,7 @@ public class TrialSummaryController {
                                 String[] splitValues = tabDataStr.split(Pattern.quote("_^_"));
                                 String valueInput = splitValues[0];
                                 /*String indexKey = splitValues[1];*/
-                                String keyName = elementKey + "__";
+                                String keyName = elementKey + "__" + tabPkeyId;
 
                                 if (map.containsKey(keyName)) {
                                     String existingValue = (String) map.get(keyName);
@@ -329,8 +330,9 @@ public class TrialSummaryController {
 
             Map<String, Object> map2 = new HashMap<>();
              for(String mapKey : map.keySet()){
+                 String key = mapKey.split("__")[0];
                  for(TrialSummaryExcelTabReflection data: excelTabReflections){
-                    if(mapKey.equals((data.getElementKey()+"__"))){
+                    if(key.equals(data.getElementKey())){
                         map2.put(data.getHtmlKeyName().split("__")[0]+"__",map.get(mapKey));
                     }
                  }