diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/controller/ConPurchaseController.java b/ruoyi-system/src/main/java/com/ruoyi/contract/controller/ConPurchaseController.java index b7e7c52..df6b134 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/controller/ConPurchaseController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/controller/ConPurchaseController.java @@ -225,7 +225,7 @@ public class ConPurchaseController extends BaseController { @PostMapping("/importData") public R> importData(MultipartFile file) { try { - return R.ok(iConPurchaseService.importPurchase(file)); + return iConPurchaseService.importPurchase(file); } catch (Exception e) { logger.error("采购合同导入异常,异常信息:{}",e.getMessage(),e); return R.fail(e.getMessage()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/IConPurchaseService.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/IConPurchaseService.java index 5e63194..b1044d6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/IConPurchaseService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/IConPurchaseService.java @@ -1,5 +1,6 @@ package com.ruoyi.contract.service; +import com.ruoyi.common.core.domain.R; import com.ruoyi.contract.domain.bo.conpurchase.ConPurchaseBoExtend; import com.ruoyi.contract.domain.vo.ConPurchaseImportVO; import com.ruoyi.contract.domain.vo.ConPurchaseVo; @@ -107,5 +108,5 @@ public interface IConPurchaseService { * @return 结果 * @throws Exception */ - List importPurchase(MultipartFile file) throws Exception; + R> importPurchase(MultipartFile file) throws Exception; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java index d8632d7..3585e03 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java @@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.PageQuery; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateSpeciUtil; @@ -135,7 +136,7 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { */ @Override @Transactional(rollbackFor = Exception.class) - public List importPurchase(MultipartFile file) throws Exception { + public R> importPurchase(MultipartFile file) throws Exception { ExcelReader reader = ExcelUtil.getReader(file.getInputStream()); List list = reader.readAll(ConPurchaseImportVO.class); reader.close(); @@ -199,7 +200,7 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { firstRow.setState("0" ); firstRow.setNotes(city+"城市信息填写有误" ); res.add(firstRow); - return res; + return R.fail(res); } purchaseBo.setCityId(conCityVo.getId()); //赋予数组值 @@ -261,7 +262,7 @@ public class ConPurchaseServiceImpl implements IConPurchaseService { this.updateByBo(purchaseBo); } } - return res; + return R.ok(res); } /**