From 58fb851aaa75019316708cdc5cc533390d490098 Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Mon, 10 Apr 2023 14:06:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   |  2 +-
 .../controller/SarStandItemsController.java   | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index ddf01dd5..ff260176 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -4435,7 +4435,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
     @Override
     public ResponseMessage selectByIdAtt(String id) {
         SarBussStandAttrInfo sarBussStandAttrInfo = sarBussStandAttrInfoService.selectByIdAtt(id);
-        AttFileEO byId = iAttFileEOService.getById(sarBussStandAttrInfo.getFbgbuss());
+        AttFileEO byId = iAttFileEOService.getFileInfo(sarBussStandAttrInfo.getFbgbuss());
         sarBussStandAttrInfo.setFbgbussNmae(byId.getOldFileName());
         return Result.success(sarBussStandAttrInfo);
     }
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
index e6312d31..b8642d51 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
@@ -1,6 +1,10 @@
 package com.adc.da.slrs.sarStandItems.controller;
 
 
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import com.adc.da.common.FileUnZip;
+import com.adc.da.common.SplitTableInfo;
 import com.adc.da.http.PageInfo;
 import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
@@ -8,18 +12,32 @@ import com.adc.da.http.Result;
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
 import com.adc.da.slrs.sarStandItems.entity.*;
 import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
+import com.adc.da.slrs.standardSplit.dto.SarFileSplitItemsImportDto;
+import com.adc.da.slrs.standardSplit.entity.SarFileSplitInfoEO;
 import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsEO;
+import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsEOService;
 import com.adc.da.util.UUIDUtils;
+import com.adc.da.utils.util.POIReadExcelToHtml;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import com.adc.da.base.web.BaseController;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.util.*;
 
+import static com.adc.da.utils.util.ExcelUtil.checkObjAllFieldsIsNull;
+
 /**
 * <p>
     *  前端控制器
@@ -36,6 +54,12 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
     @Autowired
     private SarStandItemsServiceImpl ServiceImpl;
 
+    @Autowired
+    private SarFileSplitItemsEOService sarFileSplitItemsEOService;
+
+    @Value("${file.path}")
+    private String filePath;
+
     @ApiOperation(value = "分解单查询")
     @GetMapping("/findAllItems")
     public ResponseMessage findAllItems( @RequestParam("type") String type,@RequestParam("ids") String ids){
@@ -152,4 +176,6 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         List<SarStandItemsDto> ItemDto = ServiceImpl.findTermsConditions(idList);
         return Result.success("200",ItemDto);
     }
+
+
 }