From a8f678206bc9032bad6920510094df817fcb6186 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 17:45:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentResultReportController.java | 204 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 192 insertions(+), 12 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 d3e94b4..275df4d 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
@@ -6,24 +6,28 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TExperimentResultReportDTO;
-import com.ruoyi.system.model.TExperimentResultReport;
-import com.ruoyi.system.model.TExperimentScheme;
-import com.ruoyi.system.model.TInspectionReport;
-import com.ruoyi.system.model.TResultWorkEvaluate;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TExperimentResultReportQuery;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.TExperimentDispatchVO;
import com.ruoyi.system.vo.TExperimentResultReportVO;
+import com.ruoyi.system.vo.TExperimentSchemeVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDateTime;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -41,17 +45,29 @@
private final TExperimentResultReportService experimentResultReportService;
private final TokenService tokenService;
private final ISysUserService sysUserService;
+ private final SysUserMapper sysUserMapper;
private final TResultWorkEvaluateService resultWorkEvaluateService;
private final TExperimentSchemeService experimentSchemeService;
private final TInspectionReportService inspectionReportService;
+ private final TProjectTeamStaffService projectTeamStaffService;
+ private final TProjectTeamService projectTeamService;
+ private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;
+ private final TExperimentDispatchService experimentDispatchService;
+ private final TProjectProposalService projectProposalService;
@Autowired
- public TExperimentResultReportController(TExperimentResultReportService experimentResultReportService, TokenService tokenService, ISysUserService sysUserService, TResultWorkEvaluateService resultWorkEvaluateService, TExperimentSchemeService experimentSchemeService, TInspectionReportService inspectionReportService) {
+ public TExperimentResultReportController(TExperimentResultReportService experimentResultReportService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TResultWorkEvaluateService resultWorkEvaluateService, TExperimentSchemeService experimentSchemeService, TInspectionReportService inspectionReportService, TProjectTeamStaffService projectTeamStaffService, TProjectTeamService projectTeamService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService) {
this.experimentResultReportService = experimentResultReportService;
this.tokenService = tokenService;
this.sysUserService = sysUserService;
+ this.sysUserMapper = sysUserMapper;
this.resultWorkEvaluateService = resultWorkEvaluateService;
this.experimentSchemeService = experimentSchemeService;
this.inspectionReportService = inspectionReportService;
+ this.projectTeamStaffService = projectTeamStaffService;
+ this.projectTeamService = projectTeamService;
+ this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;
+ this.experimentDispatchService = experimentDispatchService;
+ this.projectProposalService = projectProposalService;
}
/**
@@ -62,7 +78,60 @@
@PostMapping(value = "/api/t-experiment-result-report/pageList")
public R<PageInfo<TExperimentResultReportVO>> pageList(@RequestBody String param) {
TExperimentResultReportQuery query = JSON.parseObject(param, TExperimentResultReportQuery.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ if(roleType != 1){
+ if(roleType ==2){
+ // 查询项目组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
+ // 查询项目的工艺工程师id
+ TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ // 查询实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, teamStaff.getUserId()));
+ if(!CollectionUtils.isEmpty(experimentDispatchParticipants)){
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
+ }else {
+ // 查询用户所参与的实验调度
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getUserId, userId));
+ if (!CollectionUtils.isEmpty(experimentDispatchParticipants)) {
+ // 查询项目组id
+ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList());
+ query.setDispatchIds(dispatchIds);
+ }
+ }
+ }
return R.ok(experimentResultReportService.pageList(query));
+ }
+
+ /**
+ * 获取实验结果汇报评定列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentResultReport:list')")
+ @ApiOperation(value = "获取实验结果汇报评定列表-审批人使用",response = TExperimentResultReportQuery.class)
+ @PostMapping(value = "/api/t-experiment-result-report/evaluatePageList")
+ public R<PageInfo<TExperimentResultReportVO>> evaluatePageList(@RequestBody String param) {
+ TExperimentResultReportQuery query = JSON.parseObject(param, TExperimentResultReportQuery.class);
+ 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);
+ }
+ }
+ return R.ok(experimentResultReportService.evaluatePageList(query));
}
/**
@@ -74,13 +143,24 @@
@PostMapping(value = "/api/t-experiment-result-report/add")
public R<Boolean> add(@RequestBody String param) {
TExperimentResultReportDTO dto = JSON.parseObject(param,TExperimentResultReportDTO.class);
+ // 判断是否已存在实验结果
+ Long count = experimentResultReportService.count(Wrappers.lambdaQuery(TExperimentResultReport.class)
+ .eq(TExperimentResultReport::getDispatchId, dto.getDispatchId()));
+ if(count > 0){
+ return R.fail("已存在实验结果汇报");
+ }
experimentResultReportService.save(dto);
+ // 获取当前用户的项目组id
+ Long userId = tokenService.getLoginUser().getUserId();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId));
// 添加实验结果工作评价
List<TResultWorkEvaluate> resultWorkEvaluates = dto.getResultWorkEvaluates();
for (TResultWorkEvaluate resultWorkEvaluate : resultWorkEvaluates) {
resultWorkEvaluate.setResultReportId(dto.getId());
+ resultWorkEvaluate.setTeamId(projectTeamStaff.getTeamId());
}
- resultWorkEvaluateService.saveBatch(resultWorkEvaluates);
+ resultWorkEvaluateService.saveOrUpdateBatch(resultWorkEvaluates);
return R.ok();
}
@@ -96,7 +176,7 @@
experimentResultReportService.updateById(dto);
// 修改实验结果工作评价
List<TResultWorkEvaluate> resultWorkEvaluates = dto.getResultWorkEvaluates();
- resultWorkEvaluateService.updateBatchById(resultWorkEvaluates);
+ resultWorkEvaluateService.saveOrUpdateBatch(resultWorkEvaluates);
return R.ok();
}
@@ -105,11 +185,36 @@
*/
//@PreAuthorize("@ss.hasPermi('system:experimentResultReport:edit')")
@Log(title = "实验结果汇报信息-评定工艺工程师实验", businessType = BusinessType.UPDATE)
- @ApiOperation(value = "评定工艺工程师实验")
+ @ApiOperation(value = "评定工艺工程师实验",response = TResultWorkEvaluate.class)
@PostMapping(value = "/api/t-experiment-result-report/evaluateProcess")
public R<Boolean> evaluateProcess(@RequestBody String param) {
TResultWorkEvaluate resultWorkEvaluate = JSON.parseObject(param,TResultWorkEvaluate.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ resultWorkEvaluate.setEvaluatePersonId(userId);
+ resultWorkEvaluate.setEvaluateTime(LocalDateTime.now());
+ resultWorkEvaluate.setStatus(1);
+ resultWorkEvaluate.setEvaluateType(1);
+ // 查询当前用户组
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未分配项目组,无法进行评定");
+ }
+ TProjectTeamStaff projectTeamStaff1 = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())
+ .eq(TProjectTeamStaff::getRoleType, 3)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff1)){
+ return R.fail("当前项目组未分配工艺工程师,无法进行评定");
+ }
+ resultWorkEvaluate.setUserId(projectTeamStaff1.getUserId());
+ resultWorkEvaluate.setTeamId(projectTeamStaff.getTeamId());
resultWorkEvaluateService.save(resultWorkEvaluate);
+ // 查询实验结果汇报
+ TExperimentResultReport experimentResultReport = experimentResultReportService.getById(resultWorkEvaluate.getResultReportId());
+ experimentResultReport.setStatus(3);
+ experimentResultReportService.updateById(experimentResultReport);
return R.ok();
}
@@ -128,13 +233,39 @@
.eq(TResultWorkEvaluate::getResultReportId, id));
experimentResultReportVO.setResultWorkEvaluates(resultWorkEvaluates);
// 查询实验结果列表
- List<TExperimentScheme> experimentSchemes = experimentSchemeService.list(Wrappers.lambdaQuery(TExperimentScheme.class)
- .eq(TExperimentScheme::getDispatchId, experimentResultReport.getDispatchId()));
- experimentResultReportVO.setExperimentSchemes(experimentSchemes);
+ List<TExperimentSchemeVO> experimentSchemes = experimentSchemeService.getList(experimentResultReport.getDispatchId());
+ experimentResultReportVO.setExperimentSchemeVOS(experimentSchemes);
// 查询检验报告列表
List<TInspectionReport> inspectionReports = inspectionReportService.list(Wrappers.lambdaQuery(TInspectionReport.class)
.eq(TInspectionReport::getDispatchId, experimentResultReport.getDispatchId()));
experimentResultReportVO.setInspectionReports(inspectionReports);
+ // 获取实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentResultReport.getDispatchId()));
+ experimentResultReportVO.setExperimentDispatchParticipants(experimentDispatchParticipants);
+ // 查询实验调度
+ TExperimentDispatch experimentDispatch = experimentDispatchService.getById(experimentResultReport.getDispatchId());
+ TExperimentDispatchVO experimentDispatchVO = new TExperimentDispatchVO();
+ BeanUtils.copyProperties(experimentDispatch, experimentDispatchVO);
+ // 查询项目课题
+ TProjectProposal proposal = projectProposalService.getById(experimentDispatch.getProposalId());
+ experimentDispatchVO.setProjectName(proposal.getProjectName());
+ // 查询参与人员
+ List<TExperimentDispatchParticipants> tExperimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentResultReport.getDispatchId()));
+ List<Long> userIds = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).distinct().collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ String participantsName = sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(";"));
+ experimentDispatchVO.setParticipantsName(participantsName);
+ // 设置nickName
+ experimentDispatchParticipants.forEach(tExperimentDispatchParticipant -> {
+ SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tExperimentDispatchParticipant.getUserId())).findFirst().orElse(null);
+ if(sysUser != null){
+ tExperimentDispatchParticipant.setNickName(sysUser.getNickName());
+ tExperimentDispatchParticipant.setAvatar(sysUser.getAvatar());
+ }
+ });
+ experimentResultReportVO.setExperimentDispatchVO(experimentDispatchVO);
return R.ok(experimentResultReportVO);
}
@@ -160,5 +291,54 @@
return R.ok(experimentResultReportService.removeByIds(ids));
}
+ /**
+ * 通过实验调度id获取实验结果、检验结果、评价信息、参与人员信息
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentResultReport:detail')")
+ @ApiOperation(value = "通过实验调度id获取实验结果、检验结果、评价信息、参与人员信息")
+ @GetMapping(value = "/open/t-experiment-result-report/getOtherInfoByDispatchId")
+ public R<TExperimentResultReportVO> getOtherInfoByDispatchId(@RequestParam String dispatchId) {
+ TExperimentResultReportVO experimentResultReportVO = new TExperimentResultReportVO();
+ // 获取评分列表
+ List<TResultWorkEvaluate> resultWorkEvaluates = resultWorkEvaluateService.list(Wrappers.lambdaQuery(TResultWorkEvaluate.class)
+ .eq(TResultWorkEvaluate::getDispatchId, dispatchId));
+ experimentResultReportVO.setResultWorkEvaluates(resultWorkEvaluates);
+ // 查询实验结果列表
+ List<TExperimentSchemeVO> experimentSchemeVOS = experimentSchemeService.getList(dispatchId);
+ experimentResultReportVO.setExperimentSchemeVOS(experimentSchemeVOS);
+ // 查询检验报告列表
+ List<TInspectionReport> inspectionReports = inspectionReportService.list(Wrappers.lambdaQuery(TInspectionReport.class)
+ .eq(TInspectionReport::getDispatchId, dispatchId));
+ experimentResultReportVO.setInspectionReports(inspectionReports);
+ // 获取实验参与人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, dispatchId));
+ // 设置nickName
+ List<Long> userIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ experimentDispatchParticipants.forEach(tExperimentDispatchParticipant -> {
+ SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tExperimentDispatchParticipant.getUserId())).findFirst().orElse(null);
+ if(sysUser != null){
+ tExperimentDispatchParticipant.setNickName(sysUser.getNickName());
+ tExperimentDispatchParticipant.setAvatar(sysUser.getAvatar());
+ }
+ });
+ experimentResultReportVO.setExperimentDispatchParticipants(experimentDispatchParticipants);
+ return R.ok(experimentResultReportVO);
+ }
+
+ /**
+ * 提交接口
+ */
+ //@PreAuthorize("@ss.hasPermi('system:experimentResultReport:detail')")
+ @ApiOperation(value = "提交接口")
+ @GetMapping(value = "/open/t-experiment-result-report/commit")
+ public R<TExperimentResultReportVO> commit(@RequestParam String id) {
+ TExperimentResultReport experimentResultReport = experimentResultReportService.getById(id);
+ experimentResultReport.setStatus(2);
+ experimentResultReportService.updateById(experimentResultReport);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1