土工平台修改

src/main/java/com/patzn/cloud/service/lims/common/AsposeUtil.java

@@ -3,12 +3,14 @@ package com.patzn.cloud.service.lims.common;
 import com.aspose.cells.SaveFormat;
 import com.aspose.cells.Workbook;
 import com.baomidou.mybatisplus.toolkit.CollectionUtils;
+import com.patzn.cloud.commons.toolkit.DateUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.FileOutputStream;
+import java.util.Date;
 import java.util.List;
 
 public class AsposeUtil {
@@ -20,21 +22,26 @@ public class AsposeUtil {
         FileOutputStream fileOutputStream=null;
         FileOutputStream fileOut=null;
         try {
+
+            logger.error("mergeWork----------1");
             for (Workbook book:workbooksList) {
                 workbook.combine(book);
             }
+            logger.error("mergeWork----------2");
 
-            File tempFile = File.createTempFile(name+"pre",".xlsx");
+            File tempFile = File.createTempFile(DateUtils.toYearMonthDayEasy(new Date())+"shiyan",".xlsx");
+            logger.error("mergeWork----------3");
             fileOut =new FileOutputStream(tempFile);
+            logger.error("mergeWork----------4");
             workbook.save(fileOut, SaveFormat.XLSX);
-
+            logger.error("mergeWork----------5");
 
             XSSFWorkbook workbookOk = new XSSFWorkbook(tempFile);
             workbookOk.setActiveSheet(0);
             workbookOk.removeSheetAt(workbookOk.getNumberOfSheets()-1);
-
-            File file = File.createTempFile(name,".xlsx");
-
+            logger.error("mergeWork----------6");
+            File file = File.createTempFile(DateUtils.toYearMonthDayEasy(new Date())+name,".xlsx");
+            logger.error("mergeWork----------7");
             fileOutputStream=new FileOutputStream(file);
             workbookOk.write(fileOutputStream);
             fileOut.flush();

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

@@ -15,6 +15,7 @@ import com.patzn.cloud.service.lims.common.StringHandleUtils;
 import com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleItemMapper;
 import com.patzn.cloud.service.lims.hmhj.service.*;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import com.patzn.poibox.xwpf.HSSFWorkbookUtil;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;