toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:报告模板评审预览增加fileId

Browse Source
This commit is contained in:
zhuxinru
2026-01-15 10:48:33 +08:00
parent 665745bae4
commit c3941e00e6
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java
View File

@@ -164,6 +164,7 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
return SdmResponse.failed("报告模版草稿不存在");
} else {
// 发起评审
templateDto.setFileId(reportTemplate.getFileId());
SdmResponse approveRespond = launchApprove(templateDto);
if (!approveRespond.isSuccess()) {
return SdmResponse.failed("发起评审失败");

11
system/src/main/java/com/sdm/system/service/impl/SimulationSystemConfigServiceImpl.java
View File

@@ -309,13 +309,14 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
public SdmResponse addSystemFormConfigure(FormConfigure configure) {
SdmResponse response = SdmResponse.success();
Long tenantId = ThreadLocalContext.getTenantId();
Long userId = ThreadLocalContext.getUserId();
if (CollectionUtils.isNotEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName).eq(SysFormConfigure::getTenantId, tenantId).list())) {
response = SdmResponse.failed("该表单配置已存在");
} else {
SysFormConfigure sysFormConfigure = new SysFormConfigure();
BeanUtils.copyProperties(configure, sysFormConfigure);
sysFormConfigure.setTenantId(tenantId);
sysFormConfigure.setCreator(ThreadLocalContext.getUserId());
sysFormConfigure.setCreator(userId);
if (!formConfigureService.save(sysFormConfigure)) {
response = SdmResponse.failed("添加表单配置失败");
}
@@ -329,9 +330,11 @@ public class SimulationSystemConfigServiceImpl extends BaseService implements IS
tenantIdList.forEach(i -> {
if (CollectionUtils.isEmpty(formConfigureService.lambdaQuery().eq(SysFormConfigure::getFormName, configure.formName)
.eq(SysFormConfigure::getTenantId, i).list())) {
sysFormConfigure.setId(null);
sysFormConfigure.setTenantId(tenantId);
formConfigureService.save(sysFormConfigure);
SysFormConfigure formConfigure = new SysFormConfigure();
BeanUtils.copyProperties(configure, formConfigure);
formConfigure.setTenantId(i);
formConfigure.setCreator(userId);
formConfigureService.save(formConfigure);
}
});
}