1

src/main/java/com/fdkankan/sale/service/impl/RepairSaleService.java

@@ -210,10 +210,10 @@ public class RepairSaleService {
             if(priceList.getPriceListId() != null){
                 PriceList priceList1 = priceListHashMap.get(priceList.getPriceListId());
                 if(priceList1 != null){
-                    BeanUtils.copyProperties(priceList,priceList1);
-                    priceList1.setPriceListId(null);
-                    priceListService.save(priceList1);
+                    priceList.setStatus(priceList1.getStatus());
                 }
+                priceList.setPriceListId(null);
+                priceListService.save(priceList);
             }else {
                 priceListService.save(priceList);
             }

src/main/java/com/fdkankan/sale/util/pdf/TestForExcel2PDF.java

@@ -117,6 +117,10 @@ public class TestForExcel2PDF {
         }
         try {
             Workbook wb = new Workbook(sourceFilePath);// 原始excel路径
+            IndividualFontConfigs configs = new IndividualFontConfigs();
+            configs.setFontFolder("/usr/share/fonts/chinese", true);
+            LoadOptions loadOptions  = new LoadOptions();
+            loadOptions.setFontConfigs(configs);
 
             FileOutputStream fileOS = new FileOutputStream(desFilePathd);
             PdfSaveOptions pdfSaveOptions = new PdfSaveOptions();