QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: scc流程导入接口修正

Browse Source
This commit is contained in:
mzaxd
2024-07-18 19:10:48 +08:00
parent 539b0f4396
commit cdadaece57
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/controller/ProcessStandardComplianceCheckController.java
+9 -4
View File
@@ -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<Pro
@ApiOperation(value="法规符合性排查流程-导入", notes="法规符合性排查流程-导入")
@PostMapping("/importExcelWithData")
public Result<?> importExcelWithData(@RequestParam("file") @ApiParam("文件") MultipartFile file) {
List<String> errorMessages = sccService.importExcelWithData(file);
if (!errorMessages.isEmpty()) {
return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages);
Map<String, Object> resultMap = sccService.importExcelWithData(file);
Object flag = resultMap.get("flag");
if (flag == YesOrNoEnum.YES.getValue()) {
List<ProcessStandardComplianceCheckDetail> dataList = (List<ProcessStandardComplianceCheckDetail>) resultMap.get("dataList");
return Result.OK(dataList);
} else {
List<String> msg = (List<String>) resultMap.get("msg");
return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), msg);
}
return Result.OK();
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+1 -1
View File
@@ -474,7 +474,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
}
@Override
public List<String> importExcelWithData(MultipartFile file) {
public Map<String, Object> importExcelWithData(MultipartFile file) {
return null;
}