[用户模版修改]

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

@@ -8,7 +8,6 @@ import com.itextpdf.text.pdf.PdfWriter;
 import com.tykj.dev.config.swagger.AutoDocument;
 import com.tykj.dev.device.file.entity.*;
 import com.tykj.dev.device.file.service.UseReportFIleService;
-import com.tykj.dev.device.file.util.ArrayUtil;
 import com.tykj.dev.device.file.util.JavaToPdfHtmlFreeMarker;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -28,8 +27,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @author zjm

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

@@ -28,6 +28,9 @@ public class DocumentDevice {
     @ApiModelProperty(value = "部件")
     private String parts;
 
+    @ApiModelProperty(value = "类型")
+    private String type;
+
     @ApiModelProperty(value = "类型")
     private String category;
 

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

@@ -33,4 +33,8 @@ public class ExportDevice {
 
     private String ownUnit;
 
+    private int titleCount;
+
+    private String type;
+
 }

dev-file/src/main/java/com/tykj/dev/device/file/service/Impl/PdfServiceImpl.java

@@ -5,7 +5,6 @@ import com.tykj.dev.device.file.entity.Documents;
 import com.tykj.dev.device.file.entity.FileRet;
 import com.tykj.dev.device.file.service.PdfService;
 import com.tykj.dev.device.file.util.JavaToPdfHtmlFreeMarker;
-import com.tykj.dev.device.library.subject.vo.Script;
 import com.tykj.dev.device.library.subject.vo.ScriptSaveVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -37,7 +36,8 @@ public class PdfServiceImpl implements PdfService {
     }
 
     private DocumentDevice toDocDev(ScriptSaveVo scriptSaveVo){
-       return new DocumentDevice(null,scriptSaveVo.getModel(),null,scriptSaveVo.getType(),scriptSaveVo.getSecretLevel(),scriptSaveVo.getInvisibleRange(),scriptSaveVo.getNum(),scriptSaveVo.getSeqNumber(),null,scriptSaveVo.getRemark(),null,null,null,null,null);
+//       return new DocumentDevice(null,scriptSaveVo.getModel(),null,scriptSaveVo.getType(),scriptSaveVo.getSecretLevel(),scriptSaveVo.getInvisibleRange(),scriptSaveVo.getNum(),scriptSaveVo.getSeqNumber(),null,scriptSaveVo.getRemark(),null,null,null,null,null,null);
+    return new DocumentDevice();
     }
 
 }

dev-file/src/main/java/com/tykj/dev/device/file/service/PdfService.java

@@ -2,7 +2,6 @@ package com.tykj.dev.device.file.service;
 
 import com.tykj.dev.device.file.entity.Documents;
 import com.tykj.dev.device.file.entity.FileRet;
-import com.tykj.dev.device.file.util.JavaToPdfHtmlFreeMarker;
 
 /**
  * @author zjm