From 0b069efd95e2dbe6b08203c2daf10094fe262e3b Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 28 Jul 2021 16:14:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=20=E5=A4=9A=E6=96=87=E6=A1=A3=20=E6=93=8D=E4=BD=9C=20?=
 =?UTF-8?q?=E5=8F=8A=20=E5=88=A0=E9=99=A4=20=E5=9B=BD=E5=AE=B6=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sarStandAttrInfo/entity/SarStandAttrInfo.java    | 12 ------------
 .../service/impl/SarStandardsInfoServiceImpl.java    |  9 +++++++--
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
index 55893831..ab0dacf0 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandAttrInfo/entity/SarStandAttrInfo.java
@@ -158,18 +158,6 @@ public class SarStandAttrInfo extends BaseEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private String ssrq;
 
-    @ApiModelProperty(value = "实施日期(国际）")
-    @TableField("SSRQGJ")
-    private String ssrqgj;
-
-    @ApiModelProperty(value = "新车型实施日期(国家）")
-    @TableField("XCXSSRQGJ")
-    private String xcxssrqgj;
-
-    @ApiModelProperty(value = "在产车实施日期(国家）")
-    @TableField("ZCCSSRQGJ")
-    private String zccssrqgj;
-
     @ApiModelProperty(value = "修改单")
     @TableField("XGD")
     private String xgd;
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 29b00573..247f3cc1 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -608,8 +608,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             sarStandFileEO.setFileSuffix(fileInfo.getFileSuffix());
             sarStandFileEO.setOriAttId(fileInfo.getId());
             standFileList.add(sarStandFileEO);
-            //文档转换
-            if ("pdf".equals(fileInfo.getFileSuffix()) || "PDF".equals(fileInfo.getFileSuffix())) {
+            //多文档转换 PPT|PPTX|ppt|pptx|PDF|pdf|DOC|doc|DOCX|docx
+            if (verifyFileType(fileInfo.getFileSuffix())) {
                 SarStandFile newFileEO = new SarStandFile();
                 newFileEO.setCreationUser(LoginUserUtil.getUserId());
                 newFileEO.setCreationTime(new Date());
@@ -640,6 +640,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
+    private Boolean verifyFileType(String str){
+        String verifyType = "^PPT|PPTX|ppt|pptx|PDF|pdf|DOC|doc|DOCX|docx*$";
+        return Pattern.matches(verifyType,str);
+    }
+
     public void createStandPutTime(String standId, Map<String, String> multiTimeMap) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (multiTimeMap != null && multiTimeMap.size() > 0) {