ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TProjectTeamController.java
@@ -9,6 +9,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.TProjectTeamDTO; import com.ruoyi.system.dto.UpAndDownDTO; import com.ruoyi.system.model.TProjectTeam; @@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; /** * <p> @@ -42,11 +45,13 @@ private final TProjectTeamService projectTeamService; private final TProjectTeamStaffService projectTeamStaffService; private final ISysUserService sysUserService; private final TokenService tokenService; @Autowired public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService) { public TProjectTeamController(TProjectTeamService projectTeamService, TProjectTeamStaffService projectTeamStaffService, ISysUserService sysUserService, TokenService tokenService) { this.projectTeamService = projectTeamService; this.projectTeamStaffService = projectTeamStaffService; this.sysUserService = sysUserService; this.tokenService = tokenService; } /** @@ -196,5 +201,38 @@ return R.ok(); } /** * 查看项目组详情 */ @ApiOperation(value = "查询当前用户项目组信息") @GetMapping(value = "/open/t-project-team/getDetailByUserId") public R<TProjectTeamVO> getDetailByUserId() { Long userId = tokenService.getLoginUser().getUserId(); Integer roleType = tokenService.getLoginUser().getUser().getRoleType(); TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class) .eq(TProjectTeamStaff::getUserId, userId) .eq(TProjectTeamStaff::getRoleType, roleType) .last("LIMIT 1")); if(Objects.isNull(projectTeamStaff)){ return R.fail("当前用户未分配项目组,无法查看项目组信息"); } TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId()); TProjectTeamVO projectTeamVO = new TProjectTeamVO(); BeanUtils.copyProperties(projectTeam, projectTeamVO); // 查询项目组人员 List<TProjectTeamStaff> list = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class).eq(TProjectTeamStaff::getTeamId, projectTeamStaff.getTeamId())); // 查询所有人员 List<SysUser> sysUsers = sysUserService.selectList(); for (TProjectTeamStaff tProjectTeamStaff : list) { sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(tProjectTeamStaff.getUserId())).forEach(sysUser -> { tProjectTeamStaff.setNickName(sysUser.getNickName()); tProjectTeamStaff.setAvatar(sysUser.getAvatar()); }); } projectTeamVO.setStaffs(list); projectTeamVO.setStaffName(list.stream().map(TProjectTeamStaff::getNickName).collect(Collectors.joining(","))); return R.ok(projectTeamVO); } }
@@ -16,7 +16,6 @@ import com.ruoyi.system.model.*; import com.ruoyi.system.query.ResultEvaluateChemistTesterQuery; import com.ruoyi.system.query.TProjectApprovalReportQuery; import com.ruoyi.system.query.TQaTestItemReportQuery; import com.ruoyi.system.query.TResultWorkEvaluateQuery; import com.ruoyi.system.service.*; import com.ruoyi.system.vo.*; @@ -200,7 +199,7 @@ } @ApiOperation(value = "项目组总积分分页列表", tags = "项目组总积分", response = TQaTestItemReportQuery.class) @ApiOperation(value = "项目组总积分分页列表", tags = "项目组总积分", response = TResultWorkEvaluateQuery.class) @PostMapping(value = "/api/t-result-work-evaluate/pageList") public R<PageInfo<TResultWorkEvaluateVO>> pageList(@RequestBody String param) { LoginUser loginUser = tokenService.getLoginUser(); @@ -221,7 +220,7 @@ * 查看取样记录详情 */ //@PreAuthorize("@ss.hasPermi('system:samplingRecord:detail')") @ApiOperation(value = "查看详情-顶部数据") @ApiOperation(value = "查看详情-顶部数据",response = TResultWorkEvaluateVO.class) @GetMapping(value = "/open/t-result-work-evaluate/getDetailById") public R<TResultWorkEvaluateDetailVO> getDetailById(@RequestParam String id) { TResultWorkEvaluateDetailVO tResultWorkEvaluateDetailVO = new TResultWorkEvaluateDetailVO(); ruoyi-admin/src/main/java/com/ruoyi/web/core/config/DataUpdateHandlerConfig.java
@@ -29,7 +29,7 @@ @Override public void insertFill(MetaObject metaObject) { // 获取登录信息 String userName = SecurityUtils.getUsername(); String userName = SecurityUtils.getLoginUser().getUser().getNickName(); if (StringUtils.isNotBlank(userName)) { this.setFieldValByName("createBy", userName, metaObject); this.setFieldValByName("updateBy", userName, metaObject); @@ -48,7 +48,7 @@ @Override public void updateFill(MetaObject metaObject) { // 获取登录信息 String userName = SecurityUtils.getUsername(); String userName = SecurityUtils.getLoginUser().getUser().getNickName(); if (StringUtils.isNotBlank(userName)){ this.setFieldValByName("createBy", userName, metaObject); this.setFieldValByName("updateBy", userName, metaObject); ruoyi-system/src/main/java/com/ruoyi/system/mapper/TTesterOtherTaskMapper.java
@@ -5,7 +5,7 @@ import com.ruoyi.system.model.TTesterOtherTask; import com.ruoyi.system.query.TTesterOtherTaskQuery; import com.ruoyi.system.vo.TTesterOtherTaskVO; import io.lettuce.core.dynamic.annotation.Param; import org.apache.ibatis.annotations.Param; import java.util.List;
@@ -29,6 +29,9 @@ public PageInfo<TClinicalTrialPointsVO> pageList(TClinicalTrialPointsQuery query) { PageInfo<TClinicalTrialPointsVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TClinicalTrialPointsVO> list = this.baseMapper.pageList(query,pageInfo); if(CollectionUtils.isEmpty(list)){ return pageInfo; } // 统计当前项目组累计分数 List<String> teamIds = list.stream().map(TClinicalTrialPointsVO::getTeamId).distinct().collect(Collectors.toList()); List<TClinicalTrialPoints> teamList = this.list(Wrappers.lambdaQuery(TClinicalTrialPoints.class) ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
@@ -42,7 +42,8 @@ PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TResultWorkEvaluateVO> list = this.baseMapper.pageList(query,pageInfo); List<TResultWorkEvaluate> tResultWorkEvaluates = this.baseMapper.selectList(new LambdaQueryWrapper<TResultWorkEvaluate>() .orderByDesc(TResultWorkEvaluate::getEvaluateTime)); .orderByDesc(TResultWorkEvaluate::getEvaluateTime) .isNotNull(TResultWorkEvaluate::getTeamId)); for (TResultWorkEvaluateVO tResultWorkEvaluateVO : list) { List<TResultWorkEvaluate> collect = tResultWorkEvaluates.stream().filter(e -> // e.getEvaluateOne()!=null&& ruoyi-system/src/main/java/com/ruoyi/system/vo/TTesterOtherTaskVO.java
@@ -15,4 +15,7 @@ @ApiModelProperty(value = "实验员姓名") private String testerName; @ApiModelProperty(value = "项目组名称") private String teamName; } ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -136,6 +136,7 @@ u.phonenumber AS phonenumber, u.sex AS sex, u.status AS status, u.del_flag AS delFlag, u.login_ip AS loginIp, u.login_date AS loginDate, u.create_by AS createBy, u.create_time AS createTime, u.remark AS remark,u.ifBlack AS ifBlack, u.districtId AS districtId,u.sign_picture AS signPicture, u.role_type AS roleType, ur.role_id AS roleId,sr.role_name AS roleName,u.deptName as deptName from sys_user u left join sys_user_role ur on u.user_id = ur.user_id ruoyi-system/src/main/resources/mapper/system/TFeasibilityStudyReportMapper.xml
@@ -112,7 +112,7 @@ select COUNT(tfsr.id) as totalCount, SUM(CASE WHEN tfsr.status = 2 THEN 1 ELSE 0 END) AS toEvaluatedCount, SUM(CASE WHEN tfsr.status = 3 THEN 1 ELSE 0 END) AS evaluatedCount, SUM(CASE WHEN tfsr.status = 3 THEN 1 ELSE 0 END) AS evaluatedCount from t_feasibility_study_report tfsr left join t_project_team tpt on tpt.id = tfsr.team_id <where>
