hmhj原始记录优化

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalTemplateServiceImpl.java

@@ -237,12 +237,6 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
         RestAssert.fail(StringUtils.isBlank(someParam) || 4 != someParam.split("&").length, "参数传递有误");
         String[] arr = someParam.split("&");
         Long businessId = Long.parseLong(arr[0]);
-        String userName = null;
-        try {
-            userName = java.net.URLDecoder.decode(arr[2], "utf-8");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
         Long userId = Long.parseLong(arr[1]);
         Long companyId = Long.parseLong(arr[3]);
         OriginalRecord report = originalRecordService.getById(businessId);
@@ -263,8 +257,6 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
             return false;
 
         }
-        XSSFSheet sheet = xssfWorkbook.getSheetAt(0);
-
         if (null == report.getTemplateId()) {
             return true;
         }
@@ -274,6 +266,13 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
         if (null == template) {
             return true;
         }
+        int sheetSize = xssfWorkbook.getNumberOfSheets();
+
+
+
+
+
+
 
         Integer moreSheet = template.getMoreSheet();
         List<OriginalTemplateConfig> configList = originalTemplateConfigService.list(Condition.create().eq("template_id", template.getId()));
@@ -308,8 +307,8 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
         for (EntrustSampleItemIndexVO soilItemVO : indexList) {
             stringMap.put(soilItemVO.getSampleCode() + soilItemVO.getEntrustSampleItemId() + soilItemVO.getName(), soilItemVO.getId());
         }
-
-        if (null == moreSheet || 0 == moreSheet) {
+        for (int k = 0; k < sheetSize; k++) {
+            XSSFSheet sheet = xssfWorkbook.getSheetAt(k);
             int sampleBeginRow = template.getSampleBeginRow();
             int sampleMergerNum = template.getSampleMergerNum();
             int lastRowNum = sheet.getLastRowNum();
@@ -533,9 +532,8 @@ public class OriginalTemplateServiceImpl extends BaseServiceImpl<OriginalTemplat
             if (CollectionUtils.isNotEmpty(updateList)) {
                 entrustSampleItemIndexService.updateBatchById(updateList);
             }
-
-
         }
+
         return true;
     }