实验调度管理签字

xuhy

2025-04-14 ceb3be2106f1a5eab7066143e8e194cc603a798d

实验调度管理签字

 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();
    }

}


 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));
    }

 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));

 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)

 ruoyi-system/src/main/java/com/ruoyi/system/dto/ExperimentDispatchSign.java

New file
@@ -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;

}