java/laboratory.git

			@@ -74,6 +74,7 @@
			TProjectApprovalReportQuery query = JSON.parseObject(param, TProjectApprovalReportQuery.class);
			Long userId = tokenService.getLoginUser().getUserId();
			Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
			query.setRoleType(roleType);
			if(roleType != 1){
			// 查询用户所在项目组
			List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
			@@ -137,7 +138,7 @@
			.eq(TProjectTeamStaff::getRoleType, 2)
			.last("LIMIT 1"));
			if(Objects.nonNull(teamStaff)){
			noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【可研报告】/【可行报告】/【工艺开发工具】/【验证与发布】/【立项报告库】等待审核", tokenService.getLoginUser().getUser().getNickName(),4);
			noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【立项报告库】等待审核", tokenService.getLoginUser().getUser().getNickName(),4);
			}

			return R.ok();
			@@ -163,6 +164,22 @@
			feasibilityReportFile.setReportType(FeasibilityReportFileEnum.PROJECT_PROPOSAL.getCode());
			}
			feasibilityReportFileService.saveBatch(feasibilityReportFiles);
			}
			if(dto.getStatus() != -1){
			Long userId = tokenService.getLoginUser().getUserId();
			TProjectTeamStaff projectTeamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
			.eq(TProjectTeamStaff::getUserId, userId)
			.last("LIMIT 1"));
			// 查询项目组
			TProjectTeam projectTeam = projectTeamService.getById(projectTeamStaff.getTeamId());
			// MESSAGE 添加消息
			TProjectTeamStaff teamStaff = projectTeamStaffService.getOne(Wrappers.lambdaQuery(TProjectTeamStaff.class)
			.eq(TProjectTeamStaff::getTeamId, projectTeam.getId())
			.eq(TProjectTeamStaff::getRoleType, 2)
			.last("LIMIT 1"));
			if(Objects.nonNull(teamStaff)){
			noticeService.saveNotice(teamStaff.getUserId(), "您有【1】条【立项报告库】等待审核", tokenService.getLoginUser().getUser().getNickName(),4);
			}
			}
			return R.ok();
			}
			@@ -249,6 +266,10 @@
			projectApprovalReport.setAuditPersonId(userId);
			projectApprovalReport.setAuditTime(LocalDateTime.now());
			projectApprovalReportService.updateById(projectApprovalReport);

			// MESSAGE 添加消息
			noticeService.saveNotice(userId, "您有【1】条【立项报告库】等待评定", tokenService.getLoginUser().getUser().getNickName(),5);

			return R.ok();
			}