From 7b88dd2cb6c8b0ebe08b4077159a87bb23b4b496 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Tue, 7 Sep 2021 11:06:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=EF=BC=8C2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/CorpExportLogController.java        |  2 +-
 .../basic/UdiInfoExportLogController.java     |  2 +-
 .../admin/thread/BasicGenExcelService.java    | 50 +++++++++++++++++--
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java
index 66a9322a..b6a3ba9f 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpExportLogController.java
@@ -128,7 +128,7 @@ public class CorpExportLogController {
         corpExportLogEntity.setDlCount(0);
         corpExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP);
         corpExportLogService.insertCorpExportLog(corpExportLogEntity);
-        basicGenExcelService.exportCorp(genKey, corpsExportRequest);
+        basicGenExcelService.uploadCorpSmp(genKey, corpsExportRequest);
         return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!");
     }
     
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java
index 66927269..c6f2f8ee 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java
@@ -127,7 +127,7 @@ public class UdiInfoExportLogController {
 
     }
 
-    //产品信息导出生成Excel，并创建生成记录
+    //产品信息上传SMP，并创建生成记录
     @PostMapping("/udiwms/products/importLog/uploadSmp")
     public BaseResponse uploadSmp(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
 
diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java
index 21da0fc3..aa0c3ebf 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java
@@ -1,10 +1,7 @@
 package com.glxp.api.admin.thread;
 
 import com.glxp.api.admin.constant.BasicProcessStatus;
-import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity;
-import com.glxp.api.admin.entity.basic.CorpExportLogEntity;
-import com.glxp.api.admin.entity.basic.UdiInfoExportLogEntity;
-import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity;
+import com.glxp.api.admin.entity.basic.*;
 import com.glxp.api.admin.req.basic.*;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
@@ -95,6 +92,51 @@ public class BasicGenExcelService {
         corpExportLogService.updateCorpExportLog(corpExportLogEntity);
     }
 
+    //上传往来单位SMP
+    @Async
+    public void uploadCorpSmp(String genKey, CorpsExportRequest corpsExportRequest) {
+        PostCorpsRequest postCorpsRequest = new PostCorpsRequest();
+        postCorpsRequest.setGenKey(genKey);
+        List<CorpImportDetailEntity> corpImportDetailEntities = new ArrayList<>();
+        CorpExportLogEntity corpExportLogEntity = corpExportLogService.selectByGenKey(genKey);
+        //选中导出
+        if (corpsExportRequest.getIds() != null && corpsExportRequest.getIds().size() > 0) {
+            List<Integer> ids = corpsExportRequest.getIds();
+            for (Integer id : ids) {
+                BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest();
+                filterRequest.setId(id);
+                List<List<String>> excelData = new ArrayList<>();
+                List<BasicUnitMaintainEntity> unitMaintainEntities = basicUnitMaintainService.filterList(filterRequest);
+                if (unitMaintainEntities != null && unitMaintainEntities.size() > 0) {
+                    for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) {
+                        CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity();
+                        BeanUtils.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity);
+                        corpImportDetailEntities.add(corpImportDetailEntity);
+                    }
+
+                }
+            }
+
+
+        } else {//一键导出
+            BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest();
+            BeanUtils.copyProperties(corpsExportRequest, filterRequest);
+
+            List<BasicUnitMaintainEntity> unitMaintainEntities = basicUnitMaintainService.filterList(filterRequest);
+            if (unitMaintainEntities != null && unitMaintainEntities.size() > 0) {
+                for (BasicUnitMaintainEntity basicUnitMaintainEntity : unitMaintainEntities) {
+                    CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity();
+                    BeanUtils.copyProperties(basicUnitMaintainEntity, corpImportDetailEntity);
+                    corpImportDetailEntities.add(corpImportDetailEntity);
+                }
+
+            }
+        }
+        //todo 上传SMP
+        corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
+        corpExportLogService.updateCorpExportLog(corpExportLogEntity);
+    }
+
     @Async
     public void exportUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
         UdiInfoExportLogEntity udiInfoExportLogEntity = udiInfoExportLogService.selectByGenKey(genKey);