|
@@ -655,6 +655,7 @@ public class WbsTreeContractController extends BladeController {
|
|
@ApiOperationSupport(order = 14)
|
|
@ApiOperationSupport(order = 14)
|
|
@ApiOperation(value = "客户端-导入excel数据到对应元素表中(批量)", notes = "传入表的pKeyId、excel文件file")
|
|
@ApiOperation(value = "客户端-导入excel数据到对应元素表中(批量)", notes = "传入表的pKeyId、excel文件file")
|
|
public R<Map<String, Object>> importExcelList(@RequestParam Long pKeyId,
|
|
public R<Map<String, Object>> importExcelList(@RequestParam Long pKeyId,
|
|
|
|
+ @RequestParam Integer pageSize,
|
|
@RequestPart MultipartFile file) {
|
|
@RequestPart MultipartFile file) {
|
|
WbsTreeContract byId = wbsTreeContractServiceImpl.getById(pKeyId);
|
|
WbsTreeContract byId = wbsTreeContractServiceImpl.getById(pKeyId);
|
|
List<String> integers = new ArrayList<>();
|
|
List<String> integers = new ArrayList<>();
|
|
@@ -717,6 +718,10 @@ public class WbsTreeContractController extends BladeController {
|
|
WorksheetsCollection worksheets = workbook.getWorksheets();
|
|
WorksheetsCollection worksheets = workbook.getWorksheets();
|
|
workbook.saveToFile(importExcelTOHtmlPath, FileFormat.HTML);
|
|
workbook.saveToFile(importExcelTOHtmlPath, FileFormat.HTML);
|
|
int size = worksheets.size();
|
|
int size = worksheets.size();
|
|
|
|
+ //手动输入的导入数量
|
|
|
|
+ if(pageSize != null && pageSize < size){
|
|
|
|
+ size = pageSize;
|
|
|
|
+ }
|
|
|
|
|
|
//获取第一张表的行和列,然后其他表与第一张表的行、列不匹配,就说明表格错误
|
|
//获取第一张表的行和列,然后其他表与第一张表的行、列不匹配,就说明表格错误
|
|
Worksheet worksheet = worksheets.get(0);
|
|
Worksheet worksheet = worksheets.get(0);
|