fix(维修模块): 维修撤回bug

dev-file/src/main/java/com/tykj/dev/device/file/Controller/FileController.java

@@ -222,7 +222,7 @@ public class FileController {
         documents.setReplyNum("123123123131");
         documents.setSenderUnit("浙江省");
         documents.setTitle("密码装备清退单");
-        documents.setId(1);
+        documents.setId(null);
         List<DocumentDevice> documentDevices=new ArrayList<>();
         for (int i=0;i<20;i++){
             DocumentDevice documentDevice=new DocumentDevice();
@@ -238,8 +238,8 @@ public class FileController {
             documentDevices.add(documentDevice);
         }
         documents.setDocumentDevices(documentDevices);
-        String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRender(documents,url+"htmlModel/");
-
+//        String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRender(documents,url+"htmlModel/");
+        String[] content = JavaToPdfHtmlFreeMarker.freeMarkerRenderRepair(documents,url+"htmlModel/");
 
         log.info("[file] 调用了生成出入单据对接口 documents");
         return ResponseEntity.ok(JavaToPdfHtmlFreeMarker.createPdf(content,url,preview,"documents/"));

dev-file/src/main/java/com/tykj/dev/device/file/entity/DocumentDevice.java

@@ -92,18 +92,17 @@ public class DocumentDevice {
     }
 
     public String changeWord(String keyword) {
-        String returnVal = keyword;
         if (StringUtils.isNotBlank(keyword)) {
             if (keyword.contains("&")) {
-                returnVal = keyword.replace("&", "&");
+                keyword = keyword.replace("&", "&");
             }
             if (keyword.contains("<")) {
-                returnVal = keyword.replace("<", "&lt;");
+                keyword = keyword.replace("<", "&lt;");
             }
             if (keyword.contains(">")) {
-                returnVal = keyword.replace(">", "&gt;");
+                keyword = keyword.replace(">", "&gt;");
             }
         }
-        return returnVal;
+        return keyword;
     }
 }

dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java

@@ -115,7 +115,7 @@ public class JavaToPdfHtmlFreeMarker {
                     String url = new File(htmlFile).toURI().toURL().toString();
                     ByteArrayOutputStream os = new ByteArrayOutputStream();
                     ITextRenderer renderer = new ITextRenderer();
-                    renderer.setDocument(htmlFile);
+                    renderer.setDocument(url);
                     // 解决中文不显示问题
                     ITextFontResolver fontResolver = renderer.getFontResolver();
                     fontResolver.addFont(ResourceUtils.getURL("classpath:").getPath()+"font/simhei.ttf", BaseFont.IDENTITY_H, BaseFont.NOT_EMBEDDED);

dev-repair/src/main/java/com/tykj/dev/device/repair/service/impl/RepairBackBillServiceImpl.java

@@ -73,7 +73,8 @@ public class RepairBackBillServiceImpl implements RepairBackBillService {
 
     @Override
     public boolean delete(Integer id) {
-        return false;
+        deviceRepairBackBillDao.deleteById(id);
+        return true;
     }
 
     @Override

dev-union/src/main/resources/application-dev.properties

@@ -13,7 +13,8 @@ spring.jpa.hibernate.ddl-auto=update
 #spring.jpa.hibernate.ddl-auto=update
 #file.path=C:/Users/dengdiyi/Documents/file/
 # spring boot admin
-file.path=/Users/ozoz/data/
+#file.path=/Users/ozoz/data/
+file.path=/Users/zhoushaopan/Desktop/data/
 preview.path=http://192.168.102.169:8087/file/
 spring.boot.admin.client.url=http://localhost:8769
 spring.boot.admin.client.instance.serviceBaseUrl=http://localhost:8087