From 3e5134249dc75acdabfc467d8c03f321992cdf07 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 十月 2025 18:11:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java
index 5accc32..a981fbf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMissionServiceImpl.java
@@ -12,14 +12,8 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.system.dto.EquipmentDto;
import com.ruoyi.system.dto.TMissionUserDto;
-import com.ruoyi.system.mapper.TAppUserEquipmentMapper;
-import com.ruoyi.system.mapper.TMissionAssignRuleMapper;
-import com.ruoyi.system.mapper.TMissionMapper;
-import com.ruoyi.system.mapper.TMissionUserMapper;
-import com.ruoyi.system.model.TAppUserEquipment;
-import com.ruoyi.system.model.TMission;
-import com.ruoyi.system.model.TMissionAssignRule;
-import com.ruoyi.system.model.TMissionUser;
+import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TMissionQuery;
import com.ruoyi.system.service.TMissionService;
import com.ruoyi.system.vo.MissionTotalVo;
@@ -28,6 +22,7 @@
import com.ruoyi.system.vo.TotalHistoryVo;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.text.SimpleDateFormat;
@@ -64,6 +59,11 @@
@Resource
private TMissionAssignRuleMapper missionAssignRuleMapper;
+
+
+ @Resource
+ private TAppUserMapper appUserMapper;
+
@Override
public PageInfo<TMissionVO> pageListAssigned(TMissionQuery query) {
@@ -159,10 +159,16 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void successMission(TMissionUserDto dto, String userId) {
TMissionUser user = missionUserMapper.selectById(dto.getId());
user.setSuccessTime(new Date());
BeanUtils.copyProperties(dto, user);
+ String appUserId = user.getAppUserId();
+
+ TAppUser tAppUser = appUserMapper.selectById(appUserId);
+ tAppUser.setMissionState(1);
+ appUserMapper.updateById(tAppUser);
// 判断这个任务还有正在执行的不
Long l = missionUserMapper.selectCount(new LambdaQueryWrapper<TMissionUser>().eq(TMissionUser::getMissionId, user.getMissionId()).eq(TMissionUser::getStatus, 0));
--
Gitblit v1.7.1