From ceb3be2106f1a5eab7066143e8e194cc603a798d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 14 四月 2025 15:16:25 +0800
Subject: [PATCH] 实验调度管理签字
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentDispatchController.java | 28 +++++++++++++++++++++++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java | 2 +-
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 4 +++-
ruoyi-system/src/main/java/com/ruoyi/system/dto/ExperimentDispatchSign.java | 19 +++++++++++++++++++
5 files changed, 51 insertions(+), 4 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..da2737e 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.ExperimentDispatchSign;
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) {
+ ExperimentDispatchSign experimentDispatchSign = JSON.parseObject(param, ExperimentDispatchSign.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();
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java
index aeaeb0e..0a528f1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectProposalController.java
@@ -123,7 +123,7 @@
@PreAuthorize("@ss.hasPermi('system:projectProposal:delete')")
@Log(title = "项目课题方案信息-删除项目课题方案", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除项目课题方案")
- @DeleteMapping(value = "/api/t-project-proposal/deleteByIds")
+ @DeleteMapping(value = "/open/t-project-proposal/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
return R.ok(projectProposalService.removeByIds(ids));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
index 794659b..a3011d5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
@@ -131,7 +131,7 @@
@PreAuthorize("@ss.hasPermi('system:projectTeam:delete')")
@Log(title = "项目组信息-删除项目组", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除项目组")
- @DeleteMapping(value = "/api/t-project-team/deleteByIds")
+ @DeleteMapping(value = "/open/t-project-team/deleteByIds")
public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
// 删除项目组成员
projectTeamStaffService.remove(Wrappers.lambdaQuery(TProjectTeamStaff.class).in(TProjectTeamStaff::getTeamId, ids));
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 246a26d..3e34779 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -122,7 +122,9 @@
*/
@ApiModelProperty(value = "区县id")
private Integer districtId;
-
+ /** 角色类型 1=超管 2=审批人 3=工艺工程师 4=化验师 5=实验员 */
+ @ApiModelProperty(value = "角色类型 1=超管 2=审批人 3=工艺工程师 4=化验师 5=实验员")
+ private Integer roleType;
@TableField(exist = false)
private String roleName;
@TableField(exist = false)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/ExperimentDispatchSign.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/ExperimentDispatchSign.java
new file mode 100644
index 0000000..d8adc27
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/ExperimentDispatchSign.java
@@ -0,0 +1,19 @@
+package com.ruoyi.system.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(value = "实验调度签字")
+public class ExperimentDispatchSign implements Serializable {
+
+ @ApiModelProperty(value = "调度id")
+ private String dispatchId;
+
+ @ApiModelProperty(value = "签字")
+ private String confirmSign;
+
+}
--
Gitblit v1.7.1