y01000846/spdm-backend-yangyang
1
0
Fork 0
forked from toolchaintechnologycenter/spdm-backend
Code Pull Requests Activity

fix:报告模板/工作负载/需求下任务查询

Browse Source
This commit is contained in:
zhuxinru
2026-01-07 13:37:49 +08:00
parent 26a5eb5c05
commit 27acd90780
5 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
capability/src/main/java/com/sdm/capability/model/entity/SimulationReportTemplate.java
View File

@@ -1,12 +1,10 @@
package com.sdm.capability.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -75,6 +73,10 @@ public class SimulationReportTemplate implements Serializable {
@TableField("creator")
private Long creator;
@Schema(description= "创建者名称,列表展示使用")
@TableField(value = "creatorName", insertStrategy = FieldStrategy.NEVER,select = false,updateStrategy = FieldStrategy.NEVER)
private String creatorName;
@ApiModelProperty(value = "模版创建时间")
@TableField("createTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -87,15 +87,17 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
@Override
public SdmResponse updateReportTemplate(ReportTemplateDto templateDto) {
UpdateScriptAndReportReq req = new UpdateScriptAndReportReq();
req.setUpdateFile(templateDto.getFile());
req.setUpdateFileId(templateDto.getFileId());
req.setFileName(templateDto.getFile().getOriginalFilename());
SdmResponse<Long> response = dataFeignClient.updateReportTemplateFile(req);
if (!response.isSuccess()) {
return response;
if (templateDto.getFile() != null) {
UpdateScriptAndReportReq req = new UpdateScriptAndReportReq();
req.setUpdateFile(templateDto.getFile());
req.setUpdateFileId(templateDto.getFileId());
req.setFileName(templateDto.getFile().getOriginalFilename());
SdmResponse<Long> response = dataFeignClient.updateReportTemplateFile(req);
if (!response.isSuccess()) {
return response;
}
templateDto.setFileId(response.getData());
}
templateDto.setFileId(response.getData());
SimulationReportTemplate reportTemplate = new SimulationReportTemplate();
BeanUtils.copyProperties(templateDto, reportTemplate);
this.updateById(reportTemplate);