From c2d49ede268b5ab8df639e494caae02cde8b2599 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 24 十月 2025 10:25:57 +0800
Subject: [PATCH] 计费规则指标完成，人员管理职业技能处理
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index 03c2fc9..0357e58 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
@@ -12,19 +13,26 @@
import com.ruoyi.system.dto.UpAndDownDTO;
import com.ruoyi.system.dto.UserIdDto;
import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.model.TAppUserSkill;
+import com.ruoyi.system.model.TMajor;
import com.ruoyi.system.model.TUserMajor;
import com.ruoyi.system.query.TAppUserQuery;
import com.ruoyi.system.service.TAppUserService;
+import com.ruoyi.system.service.TAppUserSkillService;
+import com.ruoyi.system.service.TMajorService;
import com.ruoyi.system.service.TUserMajorService;
+import com.ruoyi.system.vo.TAppUserDetailVO;
import com.ruoyi.system.vo.TAppUserPageVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -42,12 +50,16 @@
private final TokenService tokenService;
private final TAppUserService appUserService;
private final TUserMajorService userMajorService;
+ private final TMajorService majorService;
+ private final TAppUserSkillService appUserSkillService;
@Autowired
- public TAppUserController(TokenService tokenService, TAppUserService appUserService, TUserMajorService userMajorService) {
+ public TAppUserController(TokenService tokenService, TAppUserService appUserService, TUserMajorService userMajorService, TMajorService majorService, TAppUserSkillService appUserSkillService) {
this.tokenService = tokenService;
this.appUserService = appUserService;
this.userMajorService = userMajorService;
+ this.majorService = majorService;
+ this.appUserSkillService = appUserSkillService;
}
/**
@@ -80,6 +92,10 @@
if(CollectionUtils.isEmpty(userMajors)){
return R.fail("请选择专业");
}
+ TAppUserSkill appUserSkill = dto.getAppUserSkill();
+ if(appUserSkill==null){
+ return R.fail("请输入职业技能");
+ }
String pwd = SecurityUtils.encryptPassword(dto.getPassword());
dto.setPassword(pwd);
dto.setState(1);
@@ -89,6 +105,9 @@
userMajor.setAppUserId(dto.getId());
}
userMajorService.saveBatch(userMajors);
+ // 职业技能
+ appUserSkill.setAppUserId(dto.getId());
+ appUserSkillService.save(appUserSkill);
return R.ok();
}
@@ -116,6 +135,9 @@
userMajor.setAppUserId(dto.getId());
}
userMajorService.saveBatch(userMajors);
+ // 职业技能
+ TAppUserSkill appUserSkill = dto.getAppUserSkill();
+ appUserSkillService.updateById(appUserSkill);
return R.ok();
}
@@ -127,9 +149,13 @@
@PostMapping(value = "/api/t-app-user/delUser")
public R<?> delUser(@RequestBody String param) {
UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
- TAppUser appUser = appUserService.getById(dto.getId());
- appUser.setDisabled(true);
- appUserService.updateById(appUser);
+// TAppUser appUser = appUserService.getById(dto.getId());
+// appUser.setDisabled(true);
+ // 删除人员专业
+ userMajorService.remove(Wrappers.lambdaQuery(TUserMajor.class).eq(TUserMajor::getAppUserId,dto.getId()));
+ // 删除人员职业技能
+ appUserSkillService.remove(Wrappers.lambdaQuery(TAppUserSkill.class).eq(TAppUserSkill::getAppUserId,dto.getId()));
+ appUserService.removeById(dto.getId());
return R.ok();
}
@@ -139,7 +165,7 @@
* 禁用/启用
*/
// @PreAuthorize("@ss.hasPermi('system:user:updateStatus')")
- @ApiOperation(value = "禁用/启用")
+ @ApiOperation(value = "禁用/启用", response = UpAndDownDTO.class)
@PostMapping(value = "/api/t-app-user/updateStatus")
public R<?> updateStatus(@RequestBody String param) {
UpAndDownDTO dto = JSON.parseObject(param, UpAndDownDTO.class);
@@ -213,11 +239,30 @@
*/
// @PreAuthorize("@ss.hasPermi('system:user:auditUser')")
@ApiOperation(value = "人员详情", response = AuditUserDto.class)
- @GetMapping(value = "/api/t-app-user/detailUser")
- public R<TAppUser> detailUser(@RequestBody String param) {
+ @PostMapping(value = "/api/t-app-user/detailUser")
+ public R<TAppUserDetailVO> detailUser(@RequestBody String param) {
UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
TAppUser tAppUser = appUserService.getById(dto.getId());
- return R.ok(tAppUser);
+ TAppUserDetailVO appUserDetailVO = new TAppUserDetailVO();
+ BeanUtils.copyProperties(tAppUser,appUserDetailVO);
+ List<TUserMajor> list = userMajorService.list(new LambdaQueryWrapper<TUserMajor>().eq(TUserMajor::getAppUserId, dto.getId()));
+ if(!list.isEmpty()){
+ List<String> mjIds = list.stream().map(TUserMajor::getMajorId).collect(Collectors.toList());
+ List<TMajor> mjList = majorService.list(new LambdaQueryWrapper<TMajor>().in(TMajor::getId, mjIds));
+ for (TUserMajor tUserMajor : list) {
+ TMajor tMajor = mjList.stream().filter(mj -> mj.getId().equals(tUserMajor.getMajorId())).findFirst().orElse(null);
+ if(tMajor!=null){
+ tUserMajor.setIndicator(tMajor.getMajorName());
+ }
+ }
+ }
+ appUserDetailVO.setUserMajors(list);
+ // 查询职业技能
+ TAppUserSkill appUserSkill = appUserSkillService.getOne(new LambdaQueryWrapper<TAppUserSkill>()
+ .eq(TAppUserSkill::getAppUserId, dto.getId())
+ .last("LIMIT 1"));
+ appUserDetailVO.setAppUserSkill(appUserSkill);
+ return R.ok(appUserDetailVO);
}
--
Gitblit v1.7.1