From 649a77a70100c63aefd8c73deff2d6b4d71af36f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 二月 2026 19:18:53 +0800
Subject: [PATCH] 检测项修改，检验方法确认单修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java | 6 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java | 116 +++++++++++++++++++---------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java | 37 ++++++---
ruoyi-system/src/main/resources/mapper/system/TProjectTeamMapper.xml | 6 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java | 26 ++++-
ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java | 5 +
7 files changed, 140 insertions(+), 58 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
index 43bd618..2e8e606 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java
@@ -134,13 +134,25 @@
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
if(roleType != 1){
- // 查询用户所参与的实验调度
- List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
- .eq(TExperimentDispatchParticipants::getUserId, userId));
- if(experimentDispatchParticipants.size() > 0){
- // 查询项目组id
- List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
- query.setDispatchIds(dispatchIds);
+ // 查询项目组
+ List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .eq(TProjectTeamStaff::getRoleType, 2));
+ if(!CollectionUtils.isEmpty(projectTeamStaffs)){
+ List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
+ // 查询分组
+ List<TProjectTeamStaff> tProjectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .in(TProjectTeamStaff::getTeamId, teamIds)
+ .eq(TProjectTeamStaff::getRoleType, 3));
+ List<Long> userIds = tProjectTeamStaffs.stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList());
+ // 查询用户所参与的实验调度
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .in(TExperimentDispatchParticipants::getUserId, userIds));
+ if(!experimentDispatchParticipants.isEmpty()){
+ // 查询项目组id
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
}
}
return R.ok(experimentResultReportService.evaluatePageList(query));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
index 0822c93..ff6e0ed 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
@@ -86,6 +86,19 @@
@PostMapping(value = "/api/t-project-team/pageList")
public R<PageInfo<TProjectTeamVO>> pageList(@RequestBody String param) {
TProjectTeamQuery query = JSON.parseObject(param, TProjectTeamQuery.class);
+ // 查询所在项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if(roleType != 1){
+ // 获取用户所在项目组
+ List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ if(CollectionUtils.isEmpty(projectTeamStaffs)){
+ return R.ok(new PageInfo<>());
+ }
+ List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
+ query.setTeamIds(teamIds);
+ }
PageInfo<TProjectTeamVO> tProjectTeamVOPageInfo = projectTeamService.pageList(query);
return R.ok(tProjectTeamVOPageInfo);
}
@@ -101,18 +114,18 @@
TProjectTeamDTO dto = JSON.parseObject(param,TProjectTeamDTO.class);
List<TProjectTeamStaff> staffs = dto.getStaffs();
// 判断工艺工程师是否存在其他项目组中
- staffs.stream().filter(staff -> staff.getRoleType() == 3).forEach(staff -> {
- long count = projectTeamStaffService.count(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getUserId, staff.getUserId()));
- if(count > 0){
- throw new ServiceException("该工艺工程师已存在项目组");
- }
- });
- staffs.stream().filter(staff -> staff.getRoleType() == 2).forEach(staff -> {
- long count = projectTeamStaffService.count(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getUserId, staff.getUserId()));
- if(count > 0){
- throw new ServiceException("该审批人已存在项目组");
- }
- });
+// staffs.stream().filter(staff -> staff.getRoleType() == 3).forEach(staff -> {
+// long count = projectTeamStaffService.count(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getUserId, staff.getUserId()));
+// if(count > 0){
+// throw new ServiceException("该工艺工程师已存在项目组");
+// }
+// });
+// staffs.stream().filter(staff -> staff.getRoleType() == 2).forEach(staff -> {
+// long count = projectTeamStaffService.count(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getUserId, staff.getUserId()));
+// if(count > 0){
+// throw new ServiceException("该审批人已存在项目组");
+// }
+// });
projectTeamService.save(dto);
// 保存项目组成员
for (TProjectTeamStaff staff : staffs) {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java
index ceed43d..c7728da 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemController.java
@@ -79,7 +79,7 @@
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getUserId, userId));
- if(projectTeamStaffs.size() > 0){
+ if(!projectTeamStaffs.isEmpty()){
// 查询项目组id
List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
query.setTeamIds(teamIds);
@@ -120,6 +120,10 @@
@PostMapping(value = "/api/t-qa-test-item/add")
public R<Boolean> add(@RequestBody String param) {
TQaTestItemDTO dto = JSON.parseObject(param,TQaTestItemDTO.class);
+
+ Long userId = tokenService.getLoginUser().getUserId();
+ dto.setCommitPersonId(userId);
+
qaTestItemService.save(dto);
// 查询项目组
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
index 6d6797e..e1da7e7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
@@ -77,7 +77,7 @@
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
.eq(TProjectTeamStaff::getUserId, userId));
- if(projectTeamStaffs.size() > 0){
+ if(!projectTeamStaffs.isEmpty()){
// 查询项目组id
List<String> teamIds = projectTeamStaffs.stream().map(TProjectTeamStaff::getTeamId).distinct().collect(Collectors.toList());
query.setTeamIds(teamIds);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java
index fe5fc3e..d949d54 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTestMethodConfirmSheetController.java
@@ -170,22 +170,22 @@
testMethodConfirmSheetTerm.setStatus(1);
});
testMethodConfirmSheetTermService.saveBatch(testMethodConfirmSheetTerms);
- // 生成原始记录编号
- String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
- String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
- for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
- // 添加原始记录
- TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
- testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
- // 查询上个项目课题方案的序号
- long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
- .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
- originalCode = originalCode + String.format("%02d", count+1);
- testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
- testMethodConfirmSheetOriginal.setStatus(1);
- testMethodConfirmSheetOriginal.setCommitUserId(userId);
- testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
- }
+// // 生成原始记录编号
+// String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
+// String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
+// for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
+// // 添加原始记录
+// TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
+// testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
+// // 查询上个项目课题方案的序号
+// long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
+// .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
+// originalCode = originalCode + String.format("%02d", count+1);
+// testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
+// testMethodConfirmSheetOriginal.setStatus(1);
+// testMethodConfirmSheetOriginal.setCommitUserId(userId);
+// testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
+// }
// MESSAGE 添加消息
TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
@@ -211,12 +211,12 @@
testMethodConfirmSheetService.updateById(dto);
List<TTestMethodConfirmSheetTerm> list = testMethodConfirmSheetTermService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class)
.eq(TTestMethodConfirmSheetTerm::getTestId, dto.getId()));
- if(!CollectionUtils.isEmpty(list)){
- List<String> termIds = list.stream().map(TTestMethodConfirmSheetTerm::getId).collect(Collectors.toList());
- // 删除原始检验记录
- testMethodConfirmSheetOriginalService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
- .in(TTestMethodConfirmSheetOriginal::getTermId, termIds));
- }
+// if(!CollectionUtils.isEmpty(list)){
+// List<String> termIds = list.stream().map(TTestMethodConfirmSheetTerm::getId).collect(Collectors.toList());
+// // 删除原始检验记录
+// testMethodConfirmSheetOriginalService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
+// .in(TTestMethodConfirmSheetOriginal::getTermId, termIds));
+// }
testMethodConfirmSheetTermService.remove(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class).eq(TTestMethodConfirmSheetTerm::getTestId,dto.getId()));
List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = dto.getTestMethodConfirmSheetTerms();
testMethodConfirmSheetTerms.forEach(testMethodConfirmSheetTerm -> {
@@ -240,20 +240,20 @@
// 查询项目组
TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
// 生成原始记录编号
- String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
- String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
- for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
- // 添加原始记录
- TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
- testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
- // 查询上个项目课题方案的序号
- long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
- .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
- originalCode = originalCode + String.format("%02d", count+1);
- testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
- testMethodConfirmSheetOriginal.setStatus(1);
- testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
- }
+// String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
+// String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
+// for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
+// // 添加原始记录
+// TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
+// testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
+// // 查询上个项目课题方案的序号
+// long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
+// .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
+// originalCode = originalCode + String.format("%02d", count+1);
+// testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
+// testMethodConfirmSheetOriginal.setStatus(1);
+// testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
+// }
if (dto.getAuditStatus() != -1){
// MESSAGE 添加消息
@@ -359,8 +359,50 @@
.set(TTestMethodConfirmSheet::getAuditPersonId, userId)
.set(TTestMethodConfirmSheet::getAuditSign, testMethodConfirmSheetSign.getConfirmSign()));
- // MESSAGE 添加消息
TTestMethodConfirmSheet testMethodConfirmSheet = testMethodConfirmSheetService.getById(testMethodConfirmSheetSign.getTestMethodConfirmSheetId());
+
+ List<TTestMethodConfirmSheetTerm> testMethodConfirmSheetTerms = testMethodConfirmSheetTermService.list(Wrappers.lambdaQuery(TTestMethodConfirmSheetTerm.class)
+ .eq(TTestMethodConfirmSheetTerm::getTestId, testMethodConfirmSheetSign.getTestMethodConfirmSheetId()));
+
+ if(!CollectionUtils.isEmpty(testMethodConfirmSheetTerms)){
+ // 查询调度的参与人员
+ TExperimentDispatchParticipants experimentDispatchParticipant = experimentDispatchParticipantsService.getOne(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, testMethodConfirmSheet.getDispatchId())
+ .eq(TExperimentDispatchParticipants::getRoleType,3)
+ .last("LIMIT 1"));
+ if(Objects.nonNull(experimentDispatchParticipant)){
+ // 查询工艺工程师所在的项目组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, experimentDispatchParticipant.getUserId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ // 通过当前用户查询项目组
+ if(Objects.nonNull(projectTeamStaff)){
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ // 生成原始记录编号
+ String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
+ String originalCode = projectTeam.getTeamName() + format.substring(2) + "-JL";
+ for (TTestMethodConfirmSheetTerm testMethodConfirmSheetTerm : testMethodConfirmSheetTerms) {
+ // 添加原始记录
+ TTestMethodConfirmSheetOriginal testMethodConfirmSheetOriginal = new TTestMethodConfirmSheetOriginal();
+ testMethodConfirmSheetOriginal.setTermId(testMethodConfirmSheetTerm.getId());
+ // 查询上个项目课题方案的序号
+ long count = testMethodConfirmSheetOriginalService.count(Wrappers.lambdaQuery(TTestMethodConfirmSheetOriginal.class)
+ .like(TTestMethodConfirmSheetOriginal::getOriginalCode, originalCode));
+ originalCode = originalCode + String.format("%02d", count+1);
+ testMethodConfirmSheetOriginal.setOriginalCode(originalCode);
+ testMethodConfirmSheetOriginal.setStatus(1);
+ testMethodConfirmSheetOriginal.setCommitUserId(userId);
+ testMethodConfirmSheetOriginalService.save(testMethodConfirmSheetOriginal);
+ }
+ }
+ }
+
+
+ }
+
+ // MESSAGE 添加消息
noticeService.saveNotice(testMethodConfirmSheet.getCommitUserId(), "您的【检验方案确认单】已被确认", tokenService.getLoginUser().getUser().getNickName(),12);
return R.ok();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java
index 73203ae..aa0ab27 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TProjectTeamQuery.java
@@ -5,6 +5,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
@Data
@ApiModel(value = "项目组分页query")
public class TProjectTeamQuery extends TimeRangeQueryBody {
@@ -15,4 +17,7 @@
@ApiModelProperty(value = "负责人")
private String personCharge;
+ @ApiModelProperty(value = "项目组id")
+ private List<String> teamIds;
+
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TProjectTeamMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TProjectTeamMapper.xml
index 1263d2c..1441a27 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TProjectTeamMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TProjectTeamMapper.xml
@@ -33,6 +33,12 @@
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND create_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
+ and id in
+ <foreach item="teamId" collection="query.teamIds" separator="," open="(" close=")" index="">
+ #{teamId}
+ </foreach>
+ </if>
AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY create_time DESC
--
Gitblit v1.7.1