zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并 master 分支, 修改导入流程bug

pull/2/head
jason 2022-02-18 12:03:45 +08:00
parent 1f08a2725e
commit d8d81e835f
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmModelController.java
View File

@ -61,6 +61,7 @@ public class BpmModelController {
@PostMapping("/import") @PostMapping("/import")
@ApiOperation(value = "导入模型") @ApiOperation(value = "导入模型")
@PreAuthorize("@ss.hasPermission('bpm:model:import')")
public CommonResult<String> importModel(@Valid BpmModeImportReqVO importReqVO) throws IOException { public CommonResult<String> importModel(@Valid BpmModeImportReqVO importReqVO) throws IOException {
BpmModelCreateReqVO createReqVO = BpmModelConvert.INSTANCE.convert(importReqVO); BpmModelCreateReqVO createReqVO = BpmModelConvert.INSTANCE.convert(importReqVO);
// 读取文件 // 读取文件

1
yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
View File

@ -108,6 +108,7 @@ public interface BpmTaskConvert {
BpmTaskRespVO.User convert3(AdminUserRespDTO bean); BpmTaskRespVO.User convert3(AdminUserRespDTO bean);
@Mapping(target = "id", ignore = true)
void copyTo(BpmTaskExtDO from, @MappingTarget BpmTaskDonePageItemRespVO to); void copyTo(BpmTaskExtDO from, @MappingTarget BpmTaskDonePageItemRespVO to);
@Mappings({ @Mappings({

2
yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
View File

@ -132,6 +132,7 @@ public class BpmModelServiceImpl implements BpmModelService {
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) // 因为进行多个操作，所以开启事务
public void updateModel(@Valid BpmModelUpdateReqVO updateReqVO) { public void updateModel(@Valid BpmModelUpdateReqVO updateReqVO) {
// 校验流程模型存在 // 校验流程模型存在
Model model = repositoryService.getModel(updateReqVO.getId()); Model model = repositoryService.getModel(updateReqVO.getId());
@ -148,6 +149,7 @@ public class BpmModelServiceImpl implements BpmModelService {
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) // 因为进行多个操作，所以开启事务
public void deployModel(String id) { public void deployModel(String id) {
// 校验流程模型存在 // 校验流程模型存在
Model model = repositoryService.getModel(id); Model model = repositoryService.getModel(id);

2
yudao-ui-admin/src/views/bpm/model/index.vue
View File

@ -291,7 +291,7 @@ export default {
// 设置上传的请求头部 // 设置上传的请求头部
headers: getBaseHeader(), headers: getBaseHeader(),
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + '/admin-api/' + "/bpm/model/import", url: process.env.VUE_APP_BASE_API + '/admin-api' + "/bpm/model/import",
// 表单 // 表单
form: {}, form: {},
// 校验规则 // 校验规则