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/TInspectionReportController.java | 150 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 147 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectionReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectionReportController.java
index abcb6f3..eaecd3c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectionReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInspectionReportController.java
@@ -1,9 +1,32 @@
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.framework.web.service.TokenService;
+import com.ruoyi.system.dto.TInspectionReportDTO;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.model.TExperimentDispatch;
+import com.ruoyi.system.model.TExperimentDispatchParticipants;
+import com.ruoyi.system.model.TInspectionReport;
+import com.ruoyi.system.model.TProjectProposal;
+import com.ruoyi.system.query.TInspectionReportQuery;
+import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.TInspectionReportVO;
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.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -15,8 +38,129 @@
*/
@Api(tags = "检验报告管理")
@RestController
-@RequestMapping("/t-inspection-report")
+@RequestMapping("")
public class TInspectionReportController {
+ private final TInspectionReportService inspectionReportService;
+ private final TExperimentDispatchService experimentDispatchService;
+ private final TProjectProposalService projectProposalService;
+ private final TExperimentDispatchParticipantsService experimentDispatchParticipantsService;
+ private final TokenService tokenService;
+ private final ISysUserService sysUserService;
+ private final SysUserMapper sysUserMapper;
+ @Autowired
+ public TInspectionReportController(TInspectionReportService inspectionReportService, TExperimentDispatchService experimentDispatchService, TProjectProposalService projectProposalService, TExperimentDispatchParticipantsService experimentDispatchParticipantsService, TokenService tokenService, ISysUserService sysUserService, SysUserMapper sysUserMapper) {
+ this.inspectionReportService = inspectionReportService;
+ this.experimentDispatchService = experimentDispatchService;
+ this.projectProposalService = projectProposalService;
+ this.experimentDispatchParticipantsService = experimentDispatchParticipantsService;
+ this.tokenService = tokenService;
+ this.sysUserService = sysUserService;
+ this.sysUserMapper = sysUserMapper;
+ }
+
+ /**
+ * 获取检验报告管理列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:inspectionReport:list')")
+ @ApiOperation(value = "获取检验报告分页列表", response = TInspectionReportQuery.class)
+ @PostMapping(value = "/api/t-inspection-report/pageList")
+ public R<PageInfo<TInspectionReportVO>> pageList(@RequestBody String param) {
+ TInspectionReportQuery query = JSON.parseObject(param, TInspectionReportQuery.class);
+ return R.ok(inspectionReportService.pageList(query));
+ }
+
+ /**
+ * 添加检验报告管理
+ */
+ //@PreAuthorize("@ss.hasPermi('system:inspectionReport:add')")
+ @Log(title = "检验报告信息-新增检验报告", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加检验报告",response = TInspectionReportDTO.class)
+ @PostMapping(value = "/api/t-inspection-report/add")
+ public R<Boolean> add(@RequestBody String param) {
+ TInspectionReportDTO dto = JSON.parseObject(param,TInspectionReportDTO.class);
+ inspectionReportService.save(dto);
+ return R.ok();
+ }
+
+ /**
+ * 修改检验报告
+ */
+ //@PreAuthorize("@ss.hasPermi('system:inspectionReport:edit')")
+ @Log(title = "检验报告信息-修改检验报告", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改检验报告")
+ @PostMapping(value = "/api/t-inspection-report/update")
+ public R<Boolean> update(@RequestBody String param) {
+ TInspectionReportDTO dto = JSON.parseObject(param,TInspectionReportDTO.class);
+ inspectionReportService.updateById(dto);
+ return R.ok();
+ }
+
+ /**
+ * 查看检验报告详情
+ */
+ //@PreAuthorize("@ss.hasPermi('system:inspectionReport:detail')")
+ @ApiOperation(value = "查看检验报告详情")
+ @GetMapping(value = "/open/t-inspection-report/getDetailById")
+ public R<TInspectionReportVO> getDetailById(@RequestParam String id) {
+ TInspectionReport inspectionReport = inspectionReportService.getById(id);
+ TInspectionReportVO inspectionReportVO = new TInspectionReportVO();
+ BeanUtils.copyProperties(inspectionReport, inspectionReportVO);
+ // 查询实验调度
+ TExperimentDispatch experimentDispatch = experimentDispatchService.getById(inspectionReportVO.getDispatchId());
+ // 查询项目课题
+ TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
+ experimentDispatch.setProjectName(projectProposal.getProjectName());
+ // 查询实验调度人员
+ List<TExperimentDispatchParticipants> experimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, inspectionReportVO.getDispatchId()));
+ // 将参与人员名字拼接
+ List<Long> userIds = experimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).distinct().collect(Collectors.toList());
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ if(!CollectionUtils.isEmpty(sysUsers)){
+ String nickNames = sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(","));
+ experimentDispatch.setParticipantsName(nickNames);
+ }
+ inspectionReportVO.setExperimentDispatch(experimentDispatch);
+ return R.ok(inspectionReportVO);
+ }
+
+ /**
+ * 删除检验报告
+ */
+ //@PreAuthorize("@ss.hasPermi('system:inspectionReport:delete')")
+ @Log(title = "检验报告信息-删除检验报告", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除检验报告")
+ @DeleteMapping(value = "/open/t-inspection-report/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ return R.ok(inspectionReportService.removeById(id));
+ }
+
+ /**
+ * 批量删除检验报告
+ */
+ //@PreAuthorize("@ss.hasPermi('system:inspectionReport:delete')")
+ @Log(title = "检验报告信息-删除检验报告", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除检验报告")
+ @DeleteMapping(value = "/open/t-inspection-report/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ return R.ok(inspectionReportService.removeByIds(ids));
+ }
+
+ /**
+ * 提交检验报告
+ */
+ //@PreAuthorize("@ss.hasPermi('system:inspectionReport:commit')")
+ @Log(title = "检验报告信息-提交检验报告", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "提交检验报告")
+ @PutMapping(value = "/open/t-inspection-report/commit")
+ public R<Boolean> commit(@RequestParam(value = "id") String id) {
+ // 修改状态为已提交
+ TInspectionReport inspectionReport = inspectionReportService.getById(id);
+ inspectionReport.setStatus(2);
+ inspectionReportService.updateById(inspectionReport);
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1