liujie
4 天以前 983101b33da69e1f2372b4fa0af34cacd9423b15
指派
2个文件已修改
1个文件已添加
79 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionReassignController.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/dto/MissionSetUserDto.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMissionReassignController.java
@@ -1,8 +1,26 @@
package com.ruoyi.web.controller.api;
import com.alibaba.fastjson.JSON;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.dto.MissionSetUserDto;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TMission;
import com.ruoyi.system.model.TMissionUser;
import com.ruoyi.system.query.TMissionQuery;
import com.ruoyi.system.service.TAppUserService;
import com.ruoyi.system.service.TMissionService;
import com.ruoyi.system.service.TMissionUserService;
import com.ruoyi.system.vo.TMissionReassignVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.time.LocalDateTime;
/**
 * <p>
@@ -13,8 +31,49 @@
 * @since 2025-09-29
 */
@RestController
@RequestMapping("/t-mission-reassign")
@RequestMapping("")
@Api(tags = "任务支援、改派 ")
public class TMissionReassignController {
    private final TMissionService missionService;
    private final TAppUserService appUserService;
    private final TMissionUserService missionUserService;
    public TMissionReassignController(TMissionService missionService, TAppUserService appUserService, TMissionUserService missionUserService) {
        this.missionService = missionService;
        this.appUserService = appUserService;
        this.missionUserService = missionUserService;
    }
    @ApiOperation(value = "任务指派", response = TMissionReassignVO.class)
    @PostMapping(value = "/api/t-mission-reassign/missionSetUser")
    public R<?> missionSetUser(@RequestBody String param) {
        MissionSetUserDto dto = JSON.parseObject(param, MissionSetUserDto.class);
        TMission tMission = missionService.getById(dto.getMissionId());
        if(tMission.getStatus()!=1){
            return R.fail("任务状态不是待指派");
        }
        TAppUser appUser = appUserService.getById(dto.getAppUserId());
        if(appUser.getMissionState()!=1){
            return R.fail("用户正在执行任务");
        }
        tMission.setStatus(2);
        tMission.setAssignTime(LocalDateTime.now());
        missionService.updateById(tMission);
        TMissionUser missionUser = new TMissionUser();
        missionUser.setAppUserId(dto.getAppUserId());
        missionUser.setMissionId(dto.getMissionId());
        missionUser.setUserType(1);
        missionUser.setStatus(0);
        missionUserService.save(missionUser);
        appUser.setMissionState(2);
        appUserService.updateById(appUser);
        return R.ok();
    }
}
ruoyi-system/src/main/java/com/ruoyi/system/dto/MissionSetUserDto.java
New file
@@ -0,0 +1,15 @@
package com.ruoyi.system.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("任务指派Dto")
public class MissionSetUserDto {
    @ApiModelProperty("任务id")
    private String missionId;
    @ApiModelProperty("用户id")
    private String appUserId;
}
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java
@@ -167,7 +167,8 @@
        String appUserId = user.getAppUserId();
        TAppUser tAppUser = appUserMapper.selectById(appUserId);
        tAppUser.setPracticalTrainCount(tAppUser.getPracticalTrainCount() + 1);
        tAppUser.setMissionState(1);
        appUserMapper.updateById(tAppUser);
        // 判断这个任务还有正在执行的不
        Long l = missionUserMapper.selectCount(new LambdaQueryWrapper<TMissionUser>().eq(TMissionUser::getMissionId, user.getMissionId()).eq(TMissionUser::getStatus, 0));