From 1a2e22a27627b40689257442cc5a46598c634f8e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 14:16:28 +0800
Subject: [PATCH] 测评接口完成，添加数据权限
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java
index abfce32..c506e97 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java
@@ -10,7 +10,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.FeasibilityReportFileEnum;
import com.ruoyi.common.enums.ProjectApprovalReportStatusEnum;
-import com.ruoyi.common.enums.StudyReportTypeEnum;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
import com.ruoyi.system.dto.TProjectApprovalReportDTO;
@@ -115,12 +114,12 @@
return R.fail("项目组已封存,无法创建项目课题方案");
}
// 生成可研、可行、工艺开发工具、验证发布报告编号
- String reportCode = projectTeam.getTeamName() + "-" + StudyReportTypeEnum.VERIFICATION_RELEASE.getCode();
- // 查询上个项目课题方案的序号
- long count = projectApprovalReportService.count(Wrappers.lambdaQuery(TProjectApprovalReport.class)
- .like(TProjectApprovalReport::getReportCode, reportCode));
- reportCode = reportCode + "-" + String.format("%03d", count+1);
- dto.setReportCode(reportCode);
+// String reportCode = projectTeam.getTeamName() + "-" + StudyReportTypeEnum.VERIFICATION_RELEASE.getCode();
+// // 查询上个项目课题方案的序号
+// long count = projectApprovalReportService.count(Wrappers.lambdaQuery(TProjectApprovalReport.class)
+// .like(TProjectApprovalReport::getReportCode, reportCode));
+// reportCode = reportCode + "-" + String.format("%03d", count+1);
+// dto.setReportCode(reportCode);
projectApprovalReportService.save(dto);
// 添加检测报告文件
@@ -130,8 +129,8 @@
feasibilityReportFile.setReportId(dto.getId());
feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
}
+ feasibilityReportFileService.saveBatch(feasibilityReportFiles);
}
- feasibilityReportFileService.saveBatch(feasibilityReportFiles);
return R.ok();
}
@@ -154,8 +153,8 @@
feasibilityReportFile.setReportId(dto.getId());
feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
}
+ feasibilityReportFileService.saveBatch(feasibilityReportFiles);
}
- feasibilityReportFileService.saveBatch(feasibilityReportFiles);
return R.ok();
}
--
Gitblit v1.7.1