From d04da57af4e704b4b32947b7fe72bb78fd6df344 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 26 四月 2025 17:42:30 +0800
Subject: [PATCH] 化验师检测项
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
index ca78f58..391e965 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.AuditStatusDTO;
+import com.ruoyi.system.dto.ExperimentDispatchSignDTO;
import com.ruoyi.system.dto.TExperimentDispatchDTO;
import com.ruoyi.system.dto.UpAndDownDTO;
import com.ruoyi.system.mapper.SysUserMapper;
@@ -197,7 +198,7 @@
@PreAuthorize("@ss.hasPermi('system:experimentDispatch:delete')")
@Log(title = "实验调度信息-删除实验调度", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除实验调度")
- @DeleteMapping(value = "/api/t-experiment-dispatch/deleteByIds")
+ @DeleteMapping(value = "/open/t-experiment-dispatch/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
// 删除组别
experimentDispatchGroupService.remove(Wrappers.lambdaQuery(TExperimentDispatchGroup.class).in(TExperimentDispatchGroup::getDispatchId, ids));
@@ -208,5 +209,30 @@
return R.ok(experimentDispatchService.removeByIds(ids));
}
+ /**
+ * 批量删除实验调度
+ */
+ @PreAuthorize("@ss.hasPermi('system:experimentDispatch:sign')")
+ @Log(title = "实验调度信息-实验调度签字", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "实验调度签字")
+ @PostMapping(value = "/api/t-experiment-dispatch/sign")
+ public R<Boolean> sign(@RequestBody String param) {
+ ExperimentDispatchSignDTO experimentDispatchSign = JSON.parseObject(param, ExperimentDispatchSignDTO.class);
+ Long userId = tokenService.getLoginUser().getUserId();
+ Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ TExperimentDispatchParticipants experimentDispatchParticipants = experimentDispatchParticipantsService.getOne(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
+ .eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatchSign.getDispatchId())
+ .eq(TExperimentDispatchParticipants::getRoleType, roleType)
+ .eq(TExperimentDispatchParticipants::getUserId, userId)
+ .last("LIMIT 1"));
+ if(experimentDispatchParticipants != null){
+ experimentDispatchParticipants.setStatus(2);
+ experimentDispatchParticipants.setSignTime(LocalDateTime.now());
+ experimentDispatchParticipants.setConfirmSign(experimentDispatchSign.getConfirmSign());
+ experimentDispatchParticipantsService.updateById(experimentDispatchParticipants);
+ }
+ return R.ok();
+ }
+
}
--
Gitblit v1.7.1