Преглед на файлове

merge 合并hotfix分支,解决冲突

DYH2020 преди 2 години
родител
ревизия
b1fe2c6f5b
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      src/main/java/com/ywt/mg/services/NatOrderService.java
  2. 1 1
      src/main/java/com/ywt/mg/services/PrescriptionServices.java

+ 1 - 1
src/main/java/com/ywt/mg/services/NatOrderService.java

@@ -315,7 +315,7 @@ public class NatOrderService {
             }
             int size = natOrderList.size();
             List<ExcelCollectPojo> itemList = new ArrayList<>();
-            downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList);
+            downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList, size);
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 1 - 1
src/main/java/com/ywt/mg/services/PrescriptionServices.java

@@ -953,7 +953,7 @@ public class PrescriptionServices {
             }
             int size = prescriptionInfoList.size();
             List<ExcelCollectPojo> itemList = new ArrayList<>();
-            downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList);
+            downloadRecordService.createFileAndUploadOssAndSaveToDataBase(fileName, downloadRecordId, map, itemList, size);
         } catch (Exception e) {
             e.printStackTrace();
         }