人员详情

liujie

4 天以前 3b7c832ffe25aed9cbdf0a40cbb332905b698351

人员详情

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java

@@ -13,9 +13,11 @@
import com.ruoyi.system.dto.UpAndDownDTO;
import com.ruoyi.system.dto.UserIdDto;
import com.ruoyi.system.model.TAppUser;
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.TMajorService;
import com.ruoyi.system.service.TUserMajorService;
import com.ruoyi.system.vo.TAppUserPageVo;
import io.swagger.annotations.Api;
@@ -26,6 +28,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -43,12 +46,14 @@
    private final TokenService tokenService;
    private final TAppUserService appUserService;
    private final TUserMajorService userMajorService;
    private final TMajorService majorService;

    @Autowired
    public TAppUserController(TokenService tokenService, TAppUserService appUserService, TUserMajorService userMajorService) {
    public TAppUserController(TokenService tokenService, TAppUserService appUserService, TUserMajorService userMajorService, TMajorService majorService) {
        this.tokenService = tokenService;
        this.appUserService = appUserService;
        this.userMajorService = userMajorService;
        this.majorService = majorService;
    }

    /**
@@ -214,11 +219,21 @@
     */
    //    @PreAuthorize("@ss.hasPermi('system:user:auditUser')")
    @ApiOperation(value = "人员详情", response = AuditUserDto.class)
    @GetMapping(value = "/api/t-app-user/detailUser")
    @PostMapping(value = "/api/t-app-user/detailUser")
    public R<TAppUser> detailUser(@RequestBody String param) {
        UserIdDto dto = JSON.parseObject(param, UserIdDto.class);
        TAppUser tAppUser = appUserService.getById(dto.getId());
        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());
                }
            }
        }
        tAppUser.setUserMajors(list);
        return R.ok(tAppUser);
    }

 ruoyi-system/src/main/java/com/ruoyi/system/model/TUserMajor.java

@@ -43,4 +43,9 @@
    private Integer userNumber;


    @ApiModelProperty(value = "专业名称")
    @TableField(exist = false)
    private String indicator;


}