ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaProduceReportController.java
@@ -161,7 +161,7 @@ return R.fail("当前用户未分配项目组,无法创建项目课题方案"); } // 查询项目组 TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId()); TProjectTeam projectTeam = projectTeamService.getById(dto.getTeamId()); if(Objects.isNull(projectTeam)){ return R.fail("项目组不存在"); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQaTestItemReportController.java
@@ -114,7 +114,7 @@ public R<Boolean> add(@RequestBody String param) { TQaTestItemReportDTO dto = JSON.parseObject(param,TQaTestItemReportDTO.class); // 查询项目组 TProjectTeam projectTeam = projectTeamService.getById(dto.getItemId()); TProjectTeam projectTeam = projectTeamService.getById(dto.getTeamId()); if(Objects.isNull(projectTeam)){ return R.fail("项目组不存在"); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java
@@ -133,6 +133,32 @@ } /** * 编辑化验师、实验员工作评定 */ //@PreAuthorize("@ss.hasPermi('system:resultWorkEvaluate:edit')") @Log(title = "实验结果工作评定管理-编辑化验师、实验员工作评定", businessType = BusinessType.UPDATE) @ApiOperation(value = "编辑化验师、实验员工作评定", response = TResultWorkEvaluateDTO.class) @PostMapping(value = "/api/t-result-work-evaluate/edit") public R<Boolean> edit(@RequestBody String param) { TResultWorkEvaluateDTO dto = JSON.parseObject(param, TResultWorkEvaluateDTO.class); tResultWorkEvaluateService.updateById(dto); return R.ok(); } /** * 删除化验师、实验员工作评定 */ //@PreAuthorize("@ss.hasPermi('system:resultWorkEvaluate:delete')") @Log(title = "实验结果工作评定管理-删除化验师、实验员工作评定", businessType = BusinessType.DELETE) @ApiOperation(value = "删除化验师、实验员工作评定") @DeleteMapping(value = "/open/t-result-work-evaluate/deleteById") public R<Boolean> deleteById(@RequestBody String id) { tResultWorkEvaluateService.removeById(id); return R.ok(); } /** * 查询可评定的化验师 */ @ApiOperation(value = "查询可评定的化验师") @@ -228,7 +254,6 @@ TResultWorkEvaluate resultWorkEvaluate = tResultWorkEvaluateService.getById(id); TProjectTeam projectTeam = projectTeamService.getById(resultWorkEvaluate.getTeamId()); tResultWorkEvaluateDetailVO.setStartTime(projectTeam.getCreateTime()); TProjectTeamStaff one = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).eq(TProjectTeamStaff::getRoleType, 3).last("limit 1").one(); List<Long> role4 = projectTeamStaffService.lambdaQuery() .eq(TProjectTeamStaff::getRoleType, 4).eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).list() .stream().map(TProjectTeamStaff::getUserId).collect(Collectors.toList()); ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
@@ -144,6 +144,13 @@ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds); // 拼接项目组成员名称 projectTeamVO.setStaffName(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(","))); projectTeamStaffs.stream().forEach(projectTeamStaff -> { SysUser user = sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(projectTeamStaff.getUserId())).findFirst().orElse(null); if(Objects.nonNull(user)){ projectTeamStaff.setNickName(user.getNickName()); } }); projectTeamVO.setStaffs(projectTeamStaffs); testerOtherTaskVO.setProjectTeam(projectTeamVO); // 查询是演员信息 SysUser sysUser = sysUserMapper.selectUserById(testerOtherTaskVO.getTesterId()); ruoyi-system/src/main/java/com/ruoyi/system/dto/TQaTestItemReportDTO.java
@@ -15,4 +15,7 @@ @ApiModelProperty(value = "检测报告文件") private List<TQaReportFile> qaReportFiles; @ApiModelProperty(value = "项目组id") private String teamId; } ruoyi-system/src/main/java/com/ruoyi/system/query/TExperimentDispatchQuery.java
@@ -17,6 +17,9 @@ @ApiModelProperty(value = "实验编号") private String experimentCode; @ApiModelProperty(value = "实验名称") private String experimentName; @ApiModelProperty(value = "状态 -1=草稿箱 1=待确认 2=已确认 3=已封存") private Integer status;
@@ -1,17 +1,24 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.SysUserMapper; import com.ruoyi.system.mapper.TFeasibilityStudyReportMapper; import com.ruoyi.system.model.TFeasibilityStudyReport; import com.ruoyi.system.query.TFeasibilityStudyReportQuery; import com.ruoyi.system.service.TFeasibilityStudyReportService; import com.ruoyi.system.vo.TFeasibilityStudyReportVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** * <p> @@ -24,10 +31,53 @@ @Service public class TFeasibilityStudyReportServiceImpl extends ServiceImpl<TFeasibilityStudyReportMapper, TFeasibilityStudyReport> implements TFeasibilityStudyReportService { @Autowired private SysUserMapper sysUserMapper; @Override public PageInfo<TFeasibilityStudyReportVO> pageList(TFeasibilityStudyReportQuery query) { PageInfo<TFeasibilityStudyReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TFeasibilityStudyReportVO> list = this.baseMapper.pageList(query,pageInfo); if(CollectionUtils.isEmpty(list)){ return pageInfo; } List<Long> userIds = list.stream().map(TFeasibilityStudyReportVO::getEvaluatePersonId).collect(Collectors.toList()); List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds); // 查询项目组 List<String> teamIds = list.stream().map(TFeasibilityStudyReportVO::getTeamId).collect(Collectors.toList()); List<TFeasibilityStudyReport> feasibilityStudyReports = this.list(Wrappers.lambdaQuery(TFeasibilityStudyReport.class) .in(TFeasibilityStudyReport::getTeamId, teamIds)); for (TFeasibilityStudyReportVO tFeasibilityStudyReportVO : list) { List<TFeasibilityStudyReport> feasibilityStudyReportList = feasibilityStudyReports.stream() .filter(feasibilityStudyReport -> feasibilityStudyReport.getTeamId().equals(tFeasibilityStudyReportVO.getTeamId())).collect(Collectors.toList()); if (CollectionUtils.isEmpty(feasibilityStudyReportList)) { tFeasibilityStudyReportVO.setTotalScore(0); continue; } // 将feasibilityStudyReportList列表中所有的分数进行累加 List<String> scoreList = feasibilityStudyReportList.stream().filter(e -> StringUtils.isNotBlank(e.getEvaluateScore())) .map(TFeasibilityStudyReport::getEvaluateScore).collect(Collectors.toList()); // 使用 Stream 累加分数 int totalSum = 0; for (String scoreStr : scoreList) { int sum = Arrays.stream(scoreStr.split(",")) .mapToInt(Integer::parseInt).sum(); totalSum+=sum; } tFeasibilityStudyReportVO.setTotalScore(totalSum); sysUsers.stream() .filter(sysUser -> sysUser.getUserId().equals(tFeasibilityStudyReportVO.getEvaluatePersonId())) .findFirst() .ifPresent(sysUser -> tFeasibilityStudyReportVO.setEvaluatePersonName(sysUser.getNickName())); } pageInfo.setRecords(list); return pageInfo; } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterOtherTaskServiceImpl.java
@@ -6,11 +6,12 @@ import com.ruoyi.system.model.TTesterOtherTask; import com.ruoyi.system.query.TTesterOtherTaskQuery; import com.ruoyi.system.service.TTesterOtherTaskService; import com.ruoyi.system.vo.TQaProduceReportVO; import com.ruoyi.system.vo.TTesterOtherTaskVO; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.List; import java.util.stream.Collectors; /** * <p> @@ -27,6 +28,18 @@ public PageInfo<TTesterOtherTaskVO> pageList(TTesterOtherTaskQuery query) { PageInfo<TTesterOtherTaskVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TTesterOtherTaskVO> list = this.baseMapper.pageList(query,pageInfo); if(CollectionUtils.isEmpty(list)){ return pageInfo; } // 统计总分数 List<TTesterOtherTask> teamList = this.list(); for (TTesterOtherTaskVO tTesterOtherTaskVO : list) { List<TTesterOtherTask> taskList = teamList.stream().filter(item -> item.getTeamId().equals(tTesterOtherTaskVO.getTeamId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(taskList)){ tTesterOtherTaskVO.setTotalScore(0); } tTesterOtherTaskVO.setTotalScore(taskList.stream().mapToInt(TTesterOtherTask::getEvaluateScore).sum()); } pageInfo.setRecords(list); return pageInfo; } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
@@ -229,6 +229,20 @@ public PageInfo<TResultWorkEvaluateVO> chemistEvaluateList(TResultWorkEvaluateQuery query) { PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TResultWorkEvaluateVO> list = this.baseMapper.chemistEvaluateList(query,pageInfo); if(CollectionUtils.isEmpty(list)){ return pageInfo; } List<Long> userIds = list.stream().map(TResultWorkEvaluateVO::getUserId).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(userIds)){ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds); list.forEach(tResultWorkEvaluateVO -> { SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tResultWorkEvaluateVO.getUserId())).findFirst().orElse(null); if(sysUser != null){ tResultWorkEvaluateVO.setChemistName(sysUser.getNickName()); } }); } pageInfo.setRecords(list); return pageInfo; } @@ -236,6 +250,21 @@ public PageInfo<TResultWorkEvaluateVO> testerEvaluateList(TResultWorkEvaluateQuery query) { PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TResultWorkEvaluateVO> list = this.baseMapper.testerEvaluateList(query,pageInfo); if(CollectionUtils.isEmpty(list)){ return pageInfo; } List<Long> userIds = list.stream().map(TResultWorkEvaluateVO::getUserId).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(userIds)){ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds); list.forEach(tResultWorkEvaluateVO -> { SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tResultWorkEvaluateVO.getUserId())).findFirst().orElse(null); if(sysUser != null){ tResultWorkEvaluateVO.setTesterName(sysUser.getNickName()); } }); } pageInfo.setRecords(list); return pageInfo; } ruoyi-system/src/main/java/com/ruoyi/system/vo/TTesterOtherTaskVO.java
@@ -18,4 +18,7 @@ @ApiModelProperty(value = "项目组名称") private String teamName; @ApiModelProperty(value = "总积分") private Integer totalScore; } ruoyi-system/src/main/resources/mapper/system/TExperimentDispatchMapper.xml
@@ -74,6 +74,9 @@ <if test="query.experimentCode != null and query.experimentCode != ''"> and ted.experiment_code like concat('%',#{query.experimentCode},'%') </if> <if test="query.experimentName != null and query.experimentName != ''"> and ted.experiment_name like concat('%',#{query.experimentName},'%') </if> <if test="query.status !=null"> and ted.status = #{query.status} </if>
