Merge remote-tracking branch 'origin/master'

xuhy

13 小时以前 26f6f43785afd992496d7fc79775124e557ff16d

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java

@@ -23,7 +23,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Month;
import java.util.List;

/**
@@ -158,8 +161,29 @@
    }


    public static void main(String[] args) {
        LocalDateTime now = LocalDateTime.now();
        LocalDateTime localDateTime = LocalDateTime.now().minusDays(5);

        long hours = Duration.between(localDateTime, now).toHours();
        System.out.println(hours);
    }

    /**
     * 接受任务
     */
    @ApiOperation(value = "获取任务列表--接受任务", response = MissionIdDto.class)
    @PostMapping(value = "/api/t-mission/acceptMission")
    public R<?> acceptMission(@RequestBody String param) {
        MissionIdDto dto = JSON.parseObject(param, MissionIdDto.class);
        TMission mission = missionService.getById(dto.getMissionId());
        mission.setReceiveTime(LocalDateTime.now());
        // 计算 mission中的assign_time 和现在时间 时间差 小时
        mission.setAssignTime(mission.getAssignTime().plusHours(mission.getAssignTime().getHour()));
        long hoursDiff = Duration.between(mission.getAssignTime(), mission.getReceiveTime()).toHours();
        mission.setResTime((double) hoursDiff);
        return R.ok();
    }

    /**
     * 完成任务