wangchengming/Contract-Manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
李文飞 2025-12-22 13:34:44 +08:00
parent 613a94eb1d
commit 13447953cb
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/contract/controller/ConPurchaseController.java
View File

@ -225,7 +225,7 @@ public class ConPurchaseController extends BaseController {
@PostMapping("/importData")
public R<List<ConPurchaseImportVO>> 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());

3
ruoyi-system/src/main/java/com/ruoyi/contract/service/IConPurchaseService.java
View File

@ -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<ConPurchaseImportVO> importPurchase(MultipartFile file) throws Exception;
R<List<ConPurchaseImportVO>> importPurchase(MultipartFile file) throws Exception;
}

7
ruoyi-system/src/main/java/com/ruoyi/contract/service/impl/ConPurchaseServiceImpl.java
View File

@ -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<ConPurchaseImportVO> importPurchase(MultipartFile file) throws Exception {
public R<List<ConPurchaseImportVO>> importPurchase(MultipartFile file) throws Exception {
ExcelReader reader = ExcelUtil.getReader(file.getInputStream());
List<ConPurchaseImportVO> 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);
}
/**