diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index 2ba73e8c3..fb3f82b0e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -206,8 +206,8 @@ public class LawsTechnologyEvaluationEOController extends JeroController> importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception { + public Result importItemExcel(MultipartFile file, @RequestParam(name = "cut") String cut, HttpServletRequest request) throws Exception { List> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); - return result; + return Result.OK(result); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index f621b8719..df16067d3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -394,17 +394,18 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl itemInfoMap = new HashMap<>(); - String itemId = UUID.randomUUID().toString().replace("-", ""); - itemInfoMap.put("itemId",itemId); - itemInfoMap.put("itemNum",itemNum); - itemInfoMap.put("itemName",itemName); - itemInfoMap.put("itemContent",itemContents); - result.add(itemInfoMap); + if(row != null){ + String itemNum = row.getCell(0, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); + String itemName = row.getCell(1, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); + String itemContents = row.getCell(2, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK).toString(); + Map itemInfoMap = new HashMap<>(); + String itemId = UUID.randomUUID().toString().replace("-", ""); + itemInfoMap.put("itemId",itemId); + itemInfoMap.put("itemNum",itemNum); + itemInfoMap.put("itemName",itemName); + itemInfoMap.put("itemContent",itemContents); + result.add(itemInfoMap); + } } } }