From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java | 292 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 289 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
index 9818bd8..26e8cca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSamplingRecordController.java
@@ -1,9 +1,35 @@
package com.ruoyi.web.controller.api;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+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.common.utils.StringUtils;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.dto.BatchCollectSamplesDTO;
+import com.ruoyi.system.dto.BatchSendSamplesDTO;
+import com.ruoyi.system.dto.TSamplingRecordDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.TSamplingRecordQuery;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.TSamplingRecordVO;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
@@ -15,8 +41,268 @@
*/
@Api(tags = "取样记录管理")
@RestController
-@RequestMapping("/t-sampling-record")
+@RequestMapping("")
public class TSamplingRecordController {
+ private final TSamplingRecordService samplingRecordService;
+ private final TokenService tokenService;
+ private final ISysUserService sysUserService;
+ private final SysUserMapper sysUserMapper;
+ private final TSamplingRecordOperationService samplingRecordOperationService;
+ private final TExperimentDispatchService experimentDispatchService;
+ private final TProjectProposalService projectProposalService;
+ private final TProjectTeamService projectTeamService;
+ private final TProjectTeamStaffService projectTeamStaffService;
+ private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;
+ @Autowired
+ public TSamplingRecordController(TSamplingRecordService samplingRecordService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper, TSamplingRecordOperationService samplingRecordOperationService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService) {
+ this.samplingRecordService = samplingRecordService;
+ this.tokenService = tokenService;
+ this.sysUserService = sysUserService;
+ this.sysUserMapper = sysUserMapper;
+ this.samplingRecordOperationService = samplingRecordOperationService;
+ this.experimentDispatchService = experimentDispatchService;
+ this.projectProposalService = projectProposalService;
+ this.projectTeamService = projectTeamService;
+ this.projectTeamStaffService = projectTeamStaffService;
+ this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;
+ }
+
+ /**
+ * 获取取样记录管理列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:list')")
+ @ApiOperation(value = "获取取样记录分页列表", response = TSamplingRecordQuery.class)
+ @PostMapping(value = "/api/t-sampling-record/pageList")
+ public R<PageInfo<TSamplingRecordVO>> pageList(@RequestBody String param) {
+ TSamplingRecordQuery query = JSON.parseObject(param, TSamplingRecordQuery.class);
+ return R.ok(samplingRecordService.pageList(query));
+ }
+
+ /**
+ * 添加取样记录管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:add')")
+ @Log(title = "取样记录信息-新增取样记录", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加取样记录",response = TSamplingRecordDTO.class)
+ @PostMapping(value = "/api/t-sampling-record/add")
+ public R<Boolean> add(@RequestBody String param) {
+ TSamplingRecordDTO dto = JSON.parseObject(param,TSamplingRecordDTO.class);
+
+ // 通过当前用户查询项目组
+ Long userId = tokenService.getLoginUser().getUserId();
+ TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
+ .eq(TProjectTeamStaff::getUserId, userId)
+ .last("LIMIT 1"));
+ if(Objects.isNull(projectTeamStaff)){
+ return R.fail("当前用户未分配项目组,无法创建项目课题方案");
+ }
+ // 查询项目组
+ TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
+ if(Objects.isNull(projectTeam)){
+ return R.fail("项目组不存在");
+ }
+ if(projectTeam.getStatus() == 2){
+ return R.fail("项目组已封存,无法创建项目课题方案");
+ }
+ // 生成取样单编号
+ String format = new SimpleDateFormat("yyyyMMdd").format(new Date());
+ String samplingCode = projectTeam.getTeamName() + "-" + format.substring(2) + "S";
+
+ // 查询上个项目课题方案的序号
+ long count = samplingRecordService.count(Wrappers.lambdaQuery(TSamplingRecord.class)
+ .like(TSamplingRecord::getSamplingCode, samplingCode));
+ samplingCode = samplingCode + String.format("%02d", count+1);
+ dto.setSamplingCode(samplingCode);
+
+ samplingRecordService.save(dto);
+ List<TSamplingRecordOperation> samplingRecordOperations = dto.getSamplingRecordOperations();
+ samplingRecordOperations.forEach(samplingRecordOperation -> {
+ samplingRecordOperation.setSamplingId(dto.getId());
+ });
+ samplingRecordOperationService.saveBatch(samplingRecordOperations);
+ return R.ok();
+ }
+
+ /**
+ * 修改取样记录
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:edit')")
+ @Log(title = "取样记录信息-修改取样记录", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改取样记录")
+ @PostMapping(value = "/api/t-sampling-record/update")
+ public R<Boolean> update(@RequestBody String param) {
+ TSamplingRecordDTO dto = JSON.parseObject(param,TSamplingRecordDTO.class);
+ samplingRecordService.updateById(dto);
+// samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId,dto.getId()));
+ List<TSamplingRecordOperation> samplingRecordOperations = dto.getSamplingRecordOperations();
+ samplingRecordOperations.forEach(samplingRecordOperation -> {
+ samplingRecordOperation.setSamplingId(dto.getId());
+ });
+ samplingRecordOperationService.saveOrUpdateBatch(samplingRecordOperations);
+ return R.ok();
+ }
+
+ /**
+ * 修改取样操作记录
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecordOperation:edit')")
+ @Log(title = "取样记录信息-修改取样操作记录", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改取样操作记录")
+ @PostMapping(value = "/api/t-sampling-record/updateRecordOperation")
+ public R<Boolean> updateRecordOperation(@RequestBody String param) {
+ TSamplingRecordOperation operation = JSON.parseObject(param,TSamplingRecordOperation.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ operation.setHandlePersonId(userId);
+ samplingRecordOperationService.updateById(operation);
+ return R.ok();
+ }
+
+ /**
+ * 修改取样操作记录
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecordOperation:edit')")
+ @Log(title = "取样记录信息-实验员提交取样记录", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "实验员提交取样记录")
+ @PostMapping(value = "/api/t-sampling-record/commitRecord")
+ public R<Boolean> commitRecord(@RequestBody String param) {
+ TSamplingRecord samplingRecord = JSON.parseObject(param,TSamplingRecord.class);
+ if(StringUtils.isBlank(samplingRecord.getCommitSign())){
+ return R.fail("请提交实验员签字");
+ }
+ Long userId = tokenService.getLoginUser().getUserId();
+ samplingRecord.setCommitPersonId(userId);
+ samplingRecord.setStatus(2);
+ samplingRecord.setCommitSign(samplingRecord.getCommitSign());
+ samplingRecord.setRemark(samplingRecord.getRemark());
+ samplingRecord.setCommitTime(LocalDateTime.now());
+ samplingRecordService.updateById(samplingRecord);
+ return R.ok();
+ }
+
+ /**
+ * 查看取样记录详情
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:detail')")
+ @ApiOperation(value = "查看取样记录详情")
+ @GetMapping(value = "/open/t-sampling-record/getDetailById")
+ public R<TSamplingRecordVO> getDetailById(@RequestParam String id) {
+ TSamplingRecord samplingRecord = samplingRecordService.getById(id);
+ TSamplingRecordVO samplingRecordVO = new TSamplingRecordVO();
+ BeanUtils.copyProperties(samplingRecord, samplingRecordVO);
+
+ // 查询取样操作记录
+ List<TSamplingRecordOperation> samplingRecordOperations = samplingRecordOperationService.list(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId, id));
+
+ List<Long> userIds = samplingRecordOperations.stream().map(TSamplingRecordOperation::getHandlePersonId).collect(Collectors.toList());
+ List<Long> sendUserIds = samplingRecordOperations.stream().map(TSamplingRecordOperation::getSendPersonId).collect(Collectors.toList());
+ List<Long> receiptsUserIds = samplingRecordOperations.stream().map(TSamplingRecordOperation::getReceiptsPersonId).collect(Collectors.toList());
+ userIds.addAll(sendUserIds);
+ userIds.addAll(receiptsUserIds);
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ samplingRecordOperations.forEach(samplingRecordOperation -> {
+ if(Objects.nonNull(samplingRecordOperation.getHandlePersonId())){
+ samplingRecordOperation.setHandlePersonName(Objects.requireNonNull(sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getHandlePersonId())).findFirst().orElse(null)).getNickName());
+ }
+ if(Objects.nonNull(samplingRecordOperation.getSendPersonId())){
+ samplingRecordOperation.setSendPersonName(Objects.requireNonNull(sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getSendPersonId())).findFirst().orElse(null)).getNickName());
+ }
+ if(Objects.nonNull(samplingRecordOperation.getReceiptsPersonId())){
+ samplingRecordOperation.setReceiptsPersonName(Objects.requireNonNull(sysUsers.stream().filter(user -> user.getUserId().equals(samplingRecordOperation.getReceiptsPersonId())).findFirst().orElse(null)).getNickName());
+ }
+ });
+
+ samplingRecordVO.setSamplingRecordOperations(samplingRecordOperations);
+ // 查询实验调度信息
+ TExperimentDispatch experimentDispatch = experimentDispatchService.getById(samplingRecordVO.getDispatchId());
+ if(Objects.nonNull(experimentDispatch)){
+ List<TExperimentDispatchParticipants> tExperimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatch.getId()));
+ List<Long> userIdList = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).collect(Collectors.toList());
+ List<SysUser> sysUserList = sysUserMapper.selectUserByIds(userIdList);
+ tExperimentDispatchParticipants.forEach(tExperimentDispatchParticipant -> {
+ SysUser sysUser = sysUserList.stream().filter(user -> user.getUserId().equals(tExperimentDispatchParticipant.getUserId())).findFirst().orElse(null);
+ if(sysUser != null){
+ tExperimentDispatchParticipant.setNickName(sysUser.getNickName());
+ }
+ });
+ String participantsName = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getNickName).collect(Collectors.joining(";"));
+ experimentDispatch.setParticipantsName(participantsName);
+ // 查询课题方案名称
+ TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
+ if(Objects.nonNull(projectProposal)){
+ experimentDispatch.setProjectName(projectProposal.getProjectName());
+ }
+ }
+ samplingRecordVO.setExperimentDispatch(experimentDispatch);
+ return R.ok(samplingRecordVO);
+ }
+
+ /**
+ * 删除取样记录
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:delete')")
+ @Log(title = "取样记录信息-删除取样记录", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除取样记录")
+ @DeleteMapping(value = "/open/t-sampling-record/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ // 删除取样操作记录
+ samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class).eq(TSamplingRecordOperation::getSamplingId, id));
+ return R.ok(samplingRecordService.removeById(id));
+ }
+
+ /**
+ * 批量删除取样记录
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:delete')")
+ @Log(title = "取样记录信息-删除取样记录", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除取样记录")
+ @DeleteMapping(value = "/open/t-sampling-record/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ // 删除取样操作记录
+ samplingRecordOperationService.remove(Wrappers.lambdaQuery(TSamplingRecordOperation.class).in(TSamplingRecordOperation::getSamplingId, ids));
+ return R.ok(samplingRecordService.removeByIds(ids));
+ }
+
+ /**
+ * 批量送样
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:sendSamples')")
+ @Log(title = "取样记录信息-批量送样", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "批量送样",response = BatchSendSamplesDTO.class)
+ @PostMapping(value = "/open/t-sampling-record/batchSendSamples")
+ public R<Boolean> batchSendSamples(@RequestBody String param) {
+ BatchSendSamplesDTO batchSendSamplesDTO = JSON.parseObject(param, BatchSendSamplesDTO.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ // 批量送样
+ 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));
+ return R.ok();
+ }
+
+ /**
+ * 批量删除取样记录
+ */
+ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:collectSamples')")
+ @Log(title = "取样记录信息-批量收样", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "批量收样",response = BatchCollectSamplesDTO.class)
+ @PostMapping(value = "/open/t-sampling-record/batchCollectSamples")
+ public R<Boolean> batchCollectSamples(@RequestBody String param) {
+ BatchCollectSamplesDTO batchCollectSamplesDTO = JSON.parseObject(param, BatchCollectSamplesDTO.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ // 批量送样
+ 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));
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1