java/laboratory.git

			@@ -76,14 +76,13 @@
			TProjectTeam projectTeam = projectTeamService.getById(resultWorkEvaluate.getTeamId());
			TProjectTeamStaff projectTeamStaff = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).eq(TProjectTeamStaff::getRoleType, 3).last("limit 1")
			.one();
			TProjectTeamStaff projectTeamStaff1 = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getTeamId, resultWorkEvaluate.getTeamId()).eq(TProjectTeamStaff::getRoleType, 2).last("limit 1")
			.one();
			tResultWorkEvaluateDetailVO.setStartTime(projectTeam.getCreateTime());
			Long userId = projectTeamStaff.getUserId();
			Long auditUserId = projectTeamStaff1.getUserId();
			List<TFeasibilityStudyReport> total = feasibilityStudyReportService.lambdaQuery()
			.eq(TFeasibilityStudyReport::getStatus, 3)
			.eq(TFeasibilityStudyReport::getEvaluatePersonId, auditUserId).list();
			.eq(TFeasibilityStudyReport::getTeamId, projectTeam.getId())
			.orderByAsc(TFeasibilityStudyReport::getEvaluateTime)
			.list();
			List<TResultWorkEvaluateDetailEngineerVO> tResultWorkEvaluateDetailEngineerVOS = new ArrayList<>();
			// 工艺可研
			TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO = new TResultWorkEvaluateDetailEngineerVO();
			@@ -184,13 +183,19 @@
			// 临床试验积分
			List<TClinicalTrialPoints> list6 = clinicalTrialPointsService.lambdaQuery()
			.eq(TClinicalTrialPoints::getProcessEngineerId, userId)
			.eq(TClinicalTrialPoints::getTeamId, projectTeam.getId()).list();
			.eq(TClinicalTrialPoints::getTeamId, projectTeam.getId())
			.orderByAsc(TClinicalTrialPoints::getCreateTime)
			.list();
			TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO8 = new TResultWorkEvaluateDetailEngineerVO();
			tResultWorkEvaluateDetailEngineerVO8.setCount(list6.size());
			if (!list6.isEmpty()) {
			tResultWorkEvaluateDetailEngineerVO8.setStartTime(list6.get(0).getCreateTime());
			tResultWorkEvaluateDetailEngineerVO8.setEndTime(list6.get(list6.size() - 1).getCreateTime());
			tResultWorkEvaluateDetailEngineerVO8.setIntegral(list6.get(0).getEvaluateScore());
			tResultWorkEvaluateDetailEngineerVO8.setIntegral(list6.stream()
			.map(TClinicalTrialPoints::getEvaluateScore)
			.filter(Objects::nonNull)
			.mapToInt(Integer::intValue)
			.sum());
			}
			tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO8);
			tResultWorkEvaluateDetailVO.setEngineerList(tResultWorkEvaluateDetailEngineerVOS);
			@@ -237,7 +242,7 @@
			List<TResultWorkEvaluate> tResultWorkEvaluateList = tResultWorkEvaluateService.lambdaQuery()
			.eq(TResultWorkEvaluate::getUserId, sysUser.getUserId())
			.eq(TResultWorkEvaluate::getTeamId, projectTeam.getId())
			.eq(TResultWorkEvaluate::getEvaluateType, 1)//工艺工程师
			.eq(TResultWorkEvaluate::getEvaluateType, 2)//化验师
			.eq(TResultWorkEvaluate::getDisabled, 0)//未删除
			.orderByAsc(TResultWorkEvaluate::getEvaluateTime)
			.list();
			@@ -247,7 +252,9 @@
			// 项目检测项评定
			TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO9 = new TResultWorkEvaluateDetailEngineerVO();
			List<TQaTestItem> list5 = qaTestItemService.lambdaQuery()
			.eq(TQaTestItem::getStatus,3).eq(TQaTestItem::getCommitPersonId, sysUser.getUserId()).list();
			.eq(TQaTestItem::getStatus,3)
			.eq(TQaTestItem::getTeamId, projectTeam.getId())
			.eq(TQaTestItem::getCommitPersonId, sysUser.getUserId()).list();
			if (!list5.isEmpty()){
			tResultWorkEvaluateDetailEngineerVO9.setStartTime(list5.get(0).getEvaluateTime());
			tResultWorkEvaluateDetailEngineerVO9.setEndTime(list5.get(list5.size() - 1).getCreateTime());
			@@ -265,7 +272,9 @@
			tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO9);
			// 中试、生产验证试验检验分析报告评定
			List<TQaProduceReport> list = qaProduceReportService.lambdaQuery()
			.eq(TQaProduceReport::getStatus,3).eq(TQaProduceReport::getCommitPersonId, sysUser.getUserId()).list();
			.eq(TQaProduceReport::getStatus,3)
			.eq(TQaProduceReport::getTeamId, projectTeam.getId())
			.eq(TQaProduceReport::getCommitPersonId, sysUser.getUserId()).list();
			TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO5 = new TResultWorkEvaluateDetailEngineerVO();
			List<TQaProduceReport> collect3 = list.stream().filter(e -> e.getReportType() == 1).collect(Collectors.toList());
			if (!collect3.isEmpty()) {
			@@ -364,7 +373,7 @@
			List<TResultWorkEvaluate> tResultWorkEvaluateList = tResultWorkEvaluateService.lambdaQuery()
			.eq(TResultWorkEvaluate::getUserId, sysUser.getUserId())
			.eq(TResultWorkEvaluate::getTeamId, projectTeam.getId())
			.eq(TResultWorkEvaluate::getEvaluateType, 1)//工艺工程师
			.eq(TResultWorkEvaluate::getEvaluateType, 3)//实验员
			.eq(TResultWorkEvaluate::getDisabled, 0)//未删除
			.orderByAsc(TResultWorkEvaluate::getEvaluateTime)
			.list();
			@@ -372,7 +381,11 @@
			getThreeScope(tResultWorkEvaluateList, tResultWorkEvaluateDetailEngineerVOS);

			// 其他任务
			List<TTesterOtherTask> list = tTesterOtherTaskService.lambdaQuery().eq(TTesterOtherTask::getTesterId, sysUser.getUserId()).list();
			List<TTesterOtherTask> list = tTesterOtherTaskService.lambdaQuery()
			.eq(TTesterOtherTask::getTesterId, sysUser.getUserId())
			.eq(TTesterOtherTask::getTeamId, projectTeam.getId())
			.orderByAsc(TTesterOtherTask::getCreateTime)
			.list();
			TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO5 = new TResultWorkEvaluateDetailEngineerVO();
			tResultWorkEvaluateDetailEngineerVO5.setCount(list.size());
			if (!list.isEmpty()) {
			@@ -382,8 +395,10 @@
			}
			int temp = 0;
			for (TTesterOtherTask tTesterOtherTask : list) {
			if (tTesterOtherTask.getEvaluateScore() != null) {
			temp += tTesterOtherTask.getEvaluateScore();
			}
			}
			tResultWorkEvaluateDetailEngineerVO5.setIntegral(temp);
			tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO5);
			tResultWorkEvaluateDetailUserVO.setList(tResultWorkEvaluateDetailEngineerVOS);