From 61be8c0aaac5906027172dbad2b6950124f36dc2 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 10 Sep 2021 15:59:10 +0800
Subject: [PATCH] =?UTF-8?q?excl=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=20=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ImportExcelServiceImpl.java  | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
index 79489ba1..d0c82511 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
@@ -258,7 +258,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
     }
 
 
-    @Value("file.importPath")
+    @Value("${file.importFilePath}")
     private String importPath;
 
     private List<ImportDto> error = new ArrayList<>();
@@ -268,6 +268,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
     @Autowired
     private ISarStandardsInfoService sarStandardsInfoService;
 
+    @Autowired
     private ISarBussionessStandService sarBussionessStandService;
     @Override
     public List<ImportDto> storageExclData(Map<String, List<ImportDto>> importListMap) {
@@ -456,7 +457,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
         /**
          * 截取发布日期 年月日
          */
-        String issueDate = importDto.getPublishTime().substring(0, 9);
+        String issueDate = importDto.getPublishTime().substring(0, 19);
         sarStandardsInfoEO.setIssueTime(issueDate);//标准发布日期
 
         String standStatus = importDto.getStandStatus();
@@ -468,8 +469,10 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
          * 标准属性字段
          */
         HashMap<String, String> attrInfoMap = new HashMap<>();
+        attrInfoMap.put("new","构建映射");
         attrInfoMap.put("DTBJH", importDto.getReplaceId());
-        attrInfoMap.put("SSRQ", importDto.getImplementedTime().substring(0, 9));
+        attrInfoMap.put("SSRQ", importDto.getImplementedTime().substring(0, 19));
+
 
         /**
          * 文件
@@ -484,9 +487,9 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
 
             try {
-//              File file = new File("C:\\Users\\22501\\Desktop\\foton\\2021\\" + realPath);
+              File file = new File("C:\\Users\\22501\\Desktop\\foton\\2021\\" + realPath);
 //              File file = new File(importPath + realPath);
-                File file = new File("/home/file/2021/" + realPath);
+//                File file = new File("/home/file/2021/" + realPath);
                 if (file.exists()) {
                     AttFileVo fileInfo = attFileEOService.saveFileInfo(file);
 
@@ -552,6 +555,7 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
              */
 
             HashMap<String, String> attrInfoMap = new HashMap<>();
+            attrInfoMap.put("new","构建映射");
             if (importDto.getPath() != null) {
                 String path[] = importDto.getPath().split("/");
                 String realPath = "";
@@ -562,9 +566,9 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
 
                 try {
-//            File file = new File("C:\\Users\\22501\\Desktop\\foton\\2021\\" + realPath);
+            File file = new File("C:\\Users\\22501\\Desktop\\foton\\2021\\" + realPath);
 //            File file = new File(importPath + realPath);
-                    File file = new File("/home/file/2021/" + realPath);
+//                    File file = new File("/home/file/2021/" + realPath);
 
                     if (file.exists()) {
                         AttFileVo fileInfo = attFileEOService.saveFileInfo(file);
@@ -593,7 +597,8 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
 
             }
 
-
+            String attrInfoJson = new Gson().toJson(attrInfoMap);
+            sarBussionessStand.setSarStandAttrEOStr(attrInfoJson);//新增修改时属性表信息
             return sarBussionessStand;
         }