From 761bea9251b3ed5c44d021ed8359a0d3ee49ec62 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 17 十月 2025 10:57:04 +0800
Subject: [PATCH] app任务
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
index 57d4ed2..ce0690d 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TMissionController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
@@ -9,14 +10,9 @@
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.MissionIdDto;
import com.ruoyi.system.dto.TMissionUserDto;
-import com.ruoyi.system.model.TAppUser;
-import com.ruoyi.system.model.TMission;
-import com.ruoyi.system.model.TMissionAssignRule;
-import com.ruoyi.system.model.TMissionReassign;
-import com.ruoyi.system.service.TAppUserService;
-import com.ruoyi.system.service.TMissionAssignRuleService;
-import com.ruoyi.system.service.TMissionReassignService;
-import com.ruoyi.system.service.TMissionService;
+import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.TEquipmentQuery;
+import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.MissionTotalVo;
import com.ruoyi.system.vo.TotalHistoryVo;
import io.swagger.annotations.Api;
@@ -27,7 +23,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.Month;
import java.util.List;
/**
@@ -47,15 +45,20 @@
private final TMissionService missionService;
private final TMissionReassignService missionReassignService;
private final TMissionAssignRuleService missionAssignRuleService;
+ private final TEquipmentService equipmentService;
+ private final TMissionUserService missionUserService;
@Autowired
- public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService, RedisCache redisCache, TMissionReassignService missionReassignService, TMissionAssignRuleService missionAssignRuleService) {
+ public TMissionController(TokenService tokenService, TAppUserService appUserService, TMissionService missionService, RedisCache redisCache, TMissionReassignService missionReassignService, TMissionAssignRuleService missionAssignRuleService, TEquipmentService equipmentService, TMissionUserService missionUserService) {
this.tokenService = tokenService;
this.appUserService = appUserService;
this.missionService = missionService;
this.missionReassignService = missionReassignService;
this.missionAssignRuleService = missionAssignRuleService;
+
+ this.equipmentService = equipmentService;
+ this.missionUserService = missionUserService;
}
@@ -143,7 +146,7 @@
/**
* 申请支援
*/
- @ApiOperation(value = "获取任务列表--申请支援/改派", response = TMission.class)
+ @ApiOperation(value = "获取任务列表--申请支援/改派", response = TMissionReassign.class)
@PostMapping(value = "/api/t-mission/requestSupport")
public R<?> requestSupport(@RequestBody String param) {
TMissionReassign tMissionReassign = JSON.parseObject(param, TMissionReassign.class);
@@ -157,13 +160,16 @@
}
-
+ public static void main(String[] args) {
+ LocalDate now = LocalDate.now();
+ System.out.println(LocalDate.now().minusMonths(5) + " 00:00:00");
+ }
/**
* 完成任务
*/
- @ApiOperation(value = "获取任务列表--完成任务汇报", response = TMission.class)
+ @ApiOperation(value = "获取任务列表--完成任务汇报", response = TMissionUserDto.class)
@PostMapping(value = "/api/t-mission/successMission")
public R<?> successMission(@RequestBody String param) {
TMissionUserDto dto = JSON.parseObject(param, TMissionUserDto.class);
@@ -191,11 +197,29 @@
@PostMapping(value = "/api/t-mission/detailMission")
public R<TMission> detailMission(@RequestBody String param) {
MissionIdDto missionId = JSON.parseObject(param, MissionIdDto.class);
+ String userId = tokenService.getLoginUserApplet().getUserId();
TMission tMission = missionService.getById(missionId.getMissionId());
TMissionAssignRule byId = missionAssignRuleService.getById(tMission.getMissionTypeId());
tMission.setMissionType(byId.getTypeName());
+ // 判断我结果这个任务没有
+ TMissionUser one = missionUserService.getOne(new QueryWrapper<TMissionUser>().eq("mission_id", missionId.getMissionId()).eq("app_user_id", userId).orderByDesc("create_time"));
+ if(one!=null){
+ tMission.setUserMissionId(one.getId());
+ }
+ tMission.setMissionUser( one);
+
return R.ok(tMission);
}
+
+ /**
+ * 装备库管理列表
+ */
+ //@PreAuthorize("@ss.hasPermi('system:equipment:list')")
+ @ApiOperation(value = "装备库管理列表", response = TEquipment.class)
+ @PostMapping(value = "/api/t-mission/equipmentList")
+ public R<List<TEquipment>> equipmentList() {
+ return R.ok(equipmentService.list());
+ }
}
--
Gitblit v1.7.1