java/laboratory.git

			@@ -11,8 +11,8 @@
			import com.ruoyi.common.core.domain.model.LoginUser;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.framework.web.service.TokenService;
			import com.ruoyi.system.dto.TQaTestItemDTO;
			import com.ruoyi.system.dto.TResultWorkEvaluateDTO;
			import com.ruoyi.system.mapper.SysUserMapper;
			import com.ruoyi.system.model.*;
			import com.ruoyi.system.query.ResultEvaluateChemistTesterQuery;
			import com.ruoyi.system.query.TProjectApprovalReportQuery;
			@@ -21,6 +21,7 @@
			import com.ruoyi.system.vo.*;
			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.StringUtils;
			import org.springframework.web.bind.annotation.*;
			@@ -28,6 +29,7 @@
			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.List;
			import java.util.Objects;
			import java.util.stream.Collectors;

			/**
			@@ -71,6 +73,8 @@
			private TProjectTeamStaffService projectTeamStaffService;
			@Autowired
			private ISysUserService sysUserService;
			@Autowired
			private SysUserMapper sysUserMapper;
			@Autowired
			private TExperimentDispatchParticipantsService experimentDispatchParticipantsService;

			@@ -125,13 +129,85 @@
			*/
			//@PreAuthorize("@ss.hasPermi('system:resultWorkEvaluate:add')")
			@Log(title = "实验结果工作评定管理-新增化验师、实验员工作评定", businessType = BusinessType.INSERT)
			@ApiOperation(value = "新增化验师、实验员工作评定", response = TQaTestItemDTO.class)
			@ApiOperation(value = "新增化验师、实验员工作评定", response = TResultWorkEvaluateDTO.class)
			@PostMapping(value = "/api/t-result-work-evaluate/add")
			public R<Boolean> add(@RequestBody String param) {
			TResultWorkEvaluateDTO dto = JSON.parseObject(param, TResultWorkEvaluateDTO.class);

			tResultWorkEvaluateService.save(dto);
			return R.ok();
			}

			/**
			* 编辑化验师、实验员工作评定
			*/
			//@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(@RequestParam String id) {
			tResultWorkEvaluateService.removeById(id);
			return R.ok();
			}

			/**
			* 查看实验结果工作评定管理详情
			*/
			//@PreAuthorize("@ss.hasPermi('system:testMethodConfirmSheet:detail')")
			@ApiOperation(value = "查看实验结果工作评定管理详情")
			@GetMapping(value = "/open/t-result-work-evaluate/getEvaluateDetailById")
			public R<TResultWorkEvaluateVO> getEvaluateDetailById(@RequestParam String id) {

			// 查询实验结果工作评定
			TResultWorkEvaluate resultWorkEvaluate = tResultWorkEvaluateService.getById(id);

			TResultWorkEvaluateVO tResultWorkEvaluateVO = new TResultWorkEvaluateVO();
			BeanUtils.copyProperties(resultWorkEvaluate, tResultWorkEvaluateVO);

			// 查询实验调度
			TExperimentDispatch experimentDispatch = experimentDispatchService.getById(resultWorkEvaluate.getDispatchId());

			// 查询实验调度信息
			if(Objects.nonNull(experimentDispatch)){
			// 查询课题方案名称
			TProjectProposal projectProposal = projectProposalService.getById(experimentDispatch.getProposalId());
			if(Objects.nonNull(projectProposal)){
			experimentDispatch.setProjectName(projectProposal.getProjectName());
			experimentDispatch.setProjectCode(projectProposal.getProjectCode());
			}
			// 查询参与人员
			List<TExperimentDispatchParticipants> tExperimentDispatchParticipants = experimentDispatchParticipantsService.list(Wrappers.lambdaQuery(TExperimentDispatchParticipants.class)
			.eq(TExperimentDispatchParticipants::getDispatchId, experimentDispatch.getId()));
			List<Long> userIds1 = tExperimentDispatchParticipants.stream().map(TExperimentDispatchParticipants::getUserId).distinct().collect(Collectors.toList());
			List<SysUser> sysUsers1 = sysUserMapper.selectUserByIds(userIds1);
			String participantsName = sysUsers1.stream().map(SysUser::getNickName).collect(Collectors.joining(";"));
			experimentDispatch.setParticipantsName(participantsName);
			}
			tResultWorkEvaluateVO.setExperimentDispatch(experimentDispatch);

			// 查询被评定人
			SysUser sysUser = sysUserService.selectUserById(tResultWorkEvaluateVO.getUserId());
			if(tResultWorkEvaluateVO.getEvaluateType() == 2){
			// 化验师
			tResultWorkEvaluateVO.setChemistName(sysUser.getNickName());
			}else {
			// 实验员
			tResultWorkEvaluateVO.setTesterName(sysUser.getNickName());
			}

			return R.ok(tResultWorkEvaluateVO);
			}

			/**
			@@ -150,7 +226,8 @@
			List<SysUser> sysUsers = sysUserService.selectListByNameAndUserIds(nickName,userIds);
			return R.ok(sysUsers);
			}
			return R.ok();
			List<SysUser> sysUsers = sysUserService.selectListByNameAndUserIds(null,userIds);
			return R.ok(sysUsers);
			}
			/**
			* 查询可评定的实验员
			@@ -168,7 +245,8 @@
			List<SysUser> sysUsers = sysUserService.selectListByNameAndUserIds(nickName,userIds);
			return R.ok(sysUsers);
			}
			return R.ok();
			List<SysUser> sysUsers = sysUserService.selectListByNameAndUserIds(null,userIds);
			return R.ok(sysUsers);
			}

			/**
			@@ -229,7 +307,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());