ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
@@ -78,6 +78,23 @@ Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); if (roleType != 1){ query.setUserId(userId); 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)); @@ -86,6 +103,7 @@ query.setDispatchIds(dispatchIds); } } } return R.ok(experimentDispatchService.pageList(query)); }
@@ -21,6 +21,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; @@ -80,13 +81,31 @@ 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(experimentDispatchParticipants.size() > 0){ 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)); @@ -124,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(); } @@ -227,6 +257,14 @@ 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); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
@@ -51,8 +51,9 @@ private final TExperimentDispatchService experimentDispatchService; private final TProjectProposalService projectProposalService; private final TExperimentDispatchGroupService experimentDispatchGroupService; private final TProjectTeamStaffService projectTeamStaffService; @Autowired public TExperimentSchemeController(TExperimentSchemeService experimentSchemeService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentSchemePersonService experimentSchemePersonService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchGroupService experimentDispatchGroupService) { public TExperimentSchemeController(TExperimentSchemeService experimentSchemeService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TExperimentSchemePersonService experimentSchemePersonService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchGroupService experimentDispatchGroupService, TProjectTeamStaffService projectTeamStaffService) { this.experimentSchemeService = experimentSchemeService; this.tokenService = tokenService; this.sysUserService = sysUserService; @@ -62,6 +63,7 @@ this.experimentDispatchService = experimentDispatchService; this.projectProposalService = projectProposalService; this.experimentDispatchGroupService = experimentDispatchGroupService; this.projectTeamStaffService = projectTeamStaffService; } /** @@ -77,6 +79,23 @@ Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); if (roleType != 1){ query.setUserId(userId); 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)); @@ -85,6 +104,7 @@ query.setDispatchIds(dispatchIds); } } } return R.ok(experimentSchemeService.pageList(query)); } /** ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
@@ -130,6 +130,7 @@ @PostMapping(value = "/api/t-result-work-evaluate/add") public R<Boolean> add(@RequestBody String param) { TResultWorkEvaluateDTO dto = JSON.parseObject(param, TResultWorkEvaluateDTO.class); tResultWorkEvaluateService.save(dto); return R.ok(); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
@@ -82,12 +82,30 @@ Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); if (roleType != 1){ query.setUserId(userId); 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)){ List<String> dispatchIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getDispatchId).distinct().collect(Collectors.toList()); query.setDispatchIds(dispatchIds); } } } return R.ok(samplingRecordService.pageList(query)); @@ -288,13 +306,17 @@ public R<Boolean> batchSendSamples(@RequestBody String param) { BatchSendSamplesDTO batchSendSamplesDTO = JSON.parseObject(param, BatchSendSamplesDTO.class); Long userId = tokenService.getLoginUser().getUserId(); List<String> ids = batchSendSamplesDTO.getRecordOperationId(); // 批量送样 samplingRecordOperationService.update(Wrappers.lambdaUpdate(TSamplingRecordOperation.class) .eq(TSamplingRecordOperation::getId, batchSendSamplesDTO.getRecordOperationId()) .set(TSamplingRecordOperation::getStatus, 2) .set(TSamplingRecordOperation::getSendSign, batchSendSamplesDTO.getSendSign()) .set(TSamplingRecordOperation::getSendTime, LocalDateTime.now()) .set(TSamplingRecordOperation::getSendPersonId, userId)); List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class) .in(TSamplingRecordOperation::getId, ids)); for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) { samplingRecordOperation.setStatus(2); samplingRecordOperation.setSendPersonId(userId); samplingRecordOperation.setSendSign(samplingRecordOperation.getSendSign()); samplingRecordOperation.setSendTime(LocalDateTime.now()); } samplingRecordOperationService.updateBatchById(samplingRecordOperations); return R.ok(); } @@ -308,13 +330,17 @@ public R<Boolean> batchCollectSamples(@RequestBody String param) { BatchCollectSamplesDTO batchCollectSamplesDTO = JSON.parseObject(param, BatchCollectSamplesDTO.class); Long userId = tokenService.getLoginUser().getUserId(); List<String> ids = batchCollectSamplesDTO.getRecordOperationId(); // 批量送样 samplingRecordOperationService.update(Wrappers.lambdaUpdate(TSamplingRecordOperation.class) .eq(TSamplingRecordOperation::getId, batchCollectSamplesDTO.getRecordOperationId()) .set(TSamplingRecordOperation::getStatus, 3) .set(TSamplingRecordOperation::getReceiptsSign, batchCollectSamplesDTO.getReceiptsSign()) .set(TSamplingRecordOperation::getReceiptsTime, LocalDateTime.now()) .set(TSamplingRecordOperation::getReceiptsPersonId, userId)); List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class) .in(TSamplingRecordOperation::getId, ids)); for (TSamplingRecordOperation samplingRecordOperation : samplingRecordOperations) { samplingRecordOperation.setStatus(3); samplingRecordOperation.setSendPersonId(userId); samplingRecordOperation.setSendSign(samplingRecordOperation.getReceiptsSign()); samplingRecordOperation.setSendTime(LocalDateTime.now()); } samplingRecordOperationService.updateBatchById(samplingRecordOperations); return R.ok(); }
@@ -82,6 +82,23 @@ Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); if (roleType != 1){ query.setUserId(userId); 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)); @@ -90,6 +107,7 @@ query.setDispatchIds(dispatchIds); } } } return R.ok(testMethodConfirmSheetService.pageList(query)); }
@@ -5,13 +5,14 @@ import lombok.Data; import java.io.Serializable; import java.util.List; @Data @ApiModel(value = "批量收样DTO") public class BatchCollectSamplesDTO implements Serializable { @ApiModelProperty(value = "取样操作记录id") private String recordOperationId; private List<String> recordOperationId; @ApiModelProperty(value = "收样签字") private String receiptsSign; ruoyi-system/src/main/java/com/ruoyi/system/dto/BatchSendSamplesDTO.java
@@ -1,20 +1,18 @@ package com.ruoyi.system.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; import java.util.List; @Data @ApiModel(value = "批量送样DTO") public class BatchSendSamplesDTO implements Serializable { @ApiModelProperty(value = "取样操作记录id") private String recordOperationId; private List<String> recordOperationId; @ApiModelProperty(value = "送样签字") private String sendSign;
