diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java index b788c68e..4d282e85 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java @@ -5,6 +5,7 @@ import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.aspect.annotation.Translation; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.MessageUtils; import com.jero.modules.activiti.enums.ProcessTypeEnum; @@ -188,10 +189,14 @@ public class ProcessStandardComplianceCheckController extends JeroController importExcelWithData(@RequestParam("file") @ApiParam("文件") MultipartFile file) { - List errorMessages = sccService.importExcelWithData(file); - if (!errorMessages.isEmpty()) { - return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages); + Map resultMap = sccService.importExcelWithData(file); + Object flag = resultMap.get("flag"); + if (flag == YesOrNoEnum.YES.getValue()) { + List dataList = (List) resultMap.get("dataList"); + return Result.OK(dataList); + } else { + List msg = (List) resultMap.get("msg"); + return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), msg); } - return Result.OK(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 656c3e5e..cd8d8db0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -474,7 +474,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl importExcelWithData(MultipartFile file) { + public Map importExcelWithData(MultipartFile file) { return null; }