fix:报告模板修改/需求关联任务导出

capability/src/main/java/com/sdm/capability/model/dto/ReportTemplateDto.java

@@ -16,6 +16,9 @@ public class ReportTemplateDto {
     @Schema(description = "报告模版唯一ID")
     private String uuid;
 
+    @Schema(description = "报告模版编码")
+    private String templateCode;
+
     @Schema(description = "报告模版名称")
     private String templateName;
 

capability/src/main/java/com/sdm/capability/model/entity/SimulationReportTemplate.java

@@ -28,6 +28,10 @@ public class SimulationReportTemplate implements Serializable {
     @TableField("uuid")
     private String uuid;
 
+    @ApiModelProperty(value = "报告模版编码")
+    @TableField("templateCode")
+    private String templateCode;
+
     @ApiModelProperty(value = "报告模版名称")
     @TableField("templateName")
     private String templateName;

capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java

@@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 
@@ -47,6 +48,7 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
         SimulationReportTemplate reportTemplate = new SimulationReportTemplate();
         BeanUtils.copyProperties(templateDto, reportTemplate);
         reportTemplate.setUuid(generateUuid("report_template_"));
+        reportTemplate.setTemplateCode(generateUuid("report_code_"));
         reportTemplate.setCreator(ThreadLocalContext.getUserId());
         reportTemplate.setTenantId(ThreadLocalContext.getTenantId());
         UploadFilesReq req  = new UploadFilesReq();
@@ -57,7 +59,7 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
         }
         reportTemplate.setFileId(response.getData());
         this.save(reportTemplate);
-        return SdmResponse.success(reportTemplate.getId());
+        return SdmResponse.success(reportTemplate.getUuid());
     }
 
     @Override
@@ -71,6 +73,7 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
 
         upgradeTemplate.setTemplateVersion(generateVersion(reportTemplate.getTemplateVersion(),templateDto.getVersionType()));
         upgradeTemplate.setUuid(generateUuid("report_template_"));
+        upgradeTemplate.setTemplateCode(generateUuid("report_code_"));
         upgradeTemplate.setCreator(creator);
         upgradeTemplate.setTenantId(tenantId);
 
@@ -107,18 +110,21 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl<SimulationR
     }
 
     @Override
-    public SdmResponse deleteReportTemplate(ReportTemplateDto reportTemplate) {
-        SimulationReportTemplate reportTemplateEntity = this.getById(reportTemplate.getId());
-        if (reportTemplateEntity == null) {
+    public SdmResponse deleteReportTemplate(ReportTemplateDto reportTemplateDto) {
+        List<SimulationReportTemplate> reportTemplateEntityList = this.lambdaQuery().eq(SimulationReportTemplate::getTemplateCode, reportTemplateDto.getTemplateCode()).list();
+        if (CollectionUtils.isEmpty(reportTemplateEntityList)) {
             return SdmResponse.failed("报告模板不存在");
         }
-        DelFileReq delFileReq = new DelFileReq();
-        delFileReq.setDelFileId(reportTemplateEntity.getFileId());
-        SdmResponse response = dataFeignClient.delFile(delFileReq);
-        if (!response.isSuccess()) {
-            return response;
+        for (SimulationReportTemplate reportTemplate : reportTemplateEntityList) {
+            DelFileReq delFileReq = new DelFileReq();
+            delFileReq.setDelFileId(reportTemplate.getFileId());
+            SdmResponse response = dataFeignClient.delFile(delFileReq);
+            if (!response.isSuccess()) {
+                return response;
+            }
+            this.removeById(reportTemplate.getId());
         }
-        return SdmResponse.success(this.removeById(reportTemplate.getId()));
+        return SdmResponse.success();
     }
 
     @Override