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 3494d461..b788c68e 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 @@ -19,6 +19,7 @@ import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.Split import com.jero.modules.activiti.process.standardComplianceCheck.service.IProcessStandardComplianceCheckService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; @@ -28,6 +29,7 @@ import org.jeecgframework.poi.excel.entity.enmus.ExcelType; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; @@ -182,5 +184,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); + } + return Result.OK(); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java index 2ff159d3..949dc3a5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/IProcessStandardComplianceCheckService.java @@ -6,6 +6,7 @@ import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessS import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail; import com.jero.modules.activiti.process.standardComplianceCheck.entity.vo.ProcessSccVO; import org.activiti.engine.delegate.DelegateTask; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -31,4 +32,5 @@ public interface IProcessStandardComplianceCheckService extends IService importExcelWithData(MultipartFile file); } 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 8d3a1806..656c3e5e 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 @@ -473,6 +473,11 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl importExcelWithData(MultipartFile file) { + return null; + } + private List getSplitDataByStandard(ProcessStandardComplianceCheck scc) { String standardId = scc.getStandardId(); String fileType = scc.getSplitFileSource();