From a1ba395da85bed4e5163837a9071eab00fc0b1d9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 三月 2026 18:14:20 +0800
Subject: [PATCH] 原始检验记录修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectApprovalReportController.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 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..cd6d460 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;
@@ -20,10 +19,7 @@
import com.ruoyi.system.model.TProjectTeam;
import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.TProjectApprovalReportQuery;
-import com.ruoyi.system.service.TFeasibilityReportFileService;
-import com.ruoyi.system.service.TProjectApprovalReportService;
-import com.ruoyi.system.service.TProjectTeamService;
-import com.ruoyi.system.service.TProjectTeamStaffService;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TProjectApprovalReportVO;
import io.jsonwebtoken.lang.Collections;
import io.swagger.annotations.Api;
@@ -56,14 +52,16 @@
private final TProjectTeamService projectTeamService;
private final TProjectTeamStaffService projectTeamStaffService;
private final SysUserMapper sysUserMapper;
+ private final TNoticeService noticeService;
@Autowired
- public TProjectApprovalReportController(TProjectApprovalReportService projectApprovalReportService, TFeasibilityReportFileService feasibilityReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, SysUserMapper sysUserMapper) {
+ public TProjectApprovalReportController(TProjectApprovalReportService projectApprovalReportService, TFeasibilityReportFileService feasibilityReportFileService, TokenService tokenService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, SysUserMapper sysUserMapper, TNoticeService noticeService) {
this.projectApprovalReportService = projectApprovalReportService;
this.feasibilityReportFileService = feasibilityReportFileService;
this.tokenService = tokenService;
this.projectTeamService = projectTeamService;
this.projectTeamStaffService = projectTeamStaffService;
this.sysUserMapper = sysUserMapper;
+ this.noticeService = noticeService;
}
/**
@@ -115,12 +113,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 +128,18 @@
feasibilityReportFile.setReportId(dto.getId());
feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
}
+ feasibilityReportFileService.saveBatch(feasibilityReportFiles);
}
- feasibilityReportFileService.saveBatch(feasibilityReportFiles);
+
+ // MESSAGE 添加消息
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
+ .eq(TProjectTeamStaff::getRoleType, 2)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(teamStaff)){
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【立项报告库】等待审核", tokenService.getLoginUser().getUser().getNickName(),4);
+ }
+
return R.ok();
}
@@ -154,8 +162,24 @@
feasibilityReportFile.setReportId(dto.getId());
feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
}
+ feasibilityReportFileService.saveBatch(feasibilityReportFiles);
}
- feasibilityReportFileService.saveBatch(feasibilityReportFiles);
+ if(dto.getStatus() != -1){
+ Long userId = tokenService.getLoginUser().getUserId();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ // MESSAGE 添加消息
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
+ .eq(TProjectTeamStaff::getRoleType, 2)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(teamStaff)){
+ noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【立项报告库】等待审核", tokenService.getLoginUser().getUser().getNickName(),4);
+ }
+ }
return R.ok();
}
@@ -241,6 +265,10 @@
projectApprovalReport.setAuditPersonId(userId);
projectApprovalReport.setAuditTime(LocalDateTime.now());
projectApprovalReportService.updateById(projectApprovalReport);
+
+ // MESSAGE 添加消息
+ noticeService.saveNotice(userId, "您有【1】条【立项报告库】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);
+
return R.ok();
}
--
Gitblit v1.7.1