From 39d734a2ee17e552407e33997d53ef9a89997873 Mon Sep 17 00:00:00 2001 From: lijiaqi Date: Fri, 19 Aug 2022 13:34:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E4=BC=9A=E8=AE=AE=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=8A=A8=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/rddb/wrapper/AppointWrapper.java | 43 ++++++++++- .../rddb/wrapper/ContactDbWrapper.java | 38 ++++++++++ .../rddb/wrapper/ReviewOfficerWrapper.java | 63 ++++++++++++++-- .../rddb/wrapper/ReviewSubjectWrapper.java | 64 +++++++++++++++-- .../rddb/wrapper/ReviewSuperviseWrapper.java | 71 +++++++++++++++++++ .../rddb/wrapper/ReviewWorkWrapper.java | 63 ++++++++++++++-- src/main/resources/application.properties | 2 +- 7 files changed, 329 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/ydool/boot/modules/rddb/wrapper/AppointWrapper.java b/src/main/java/com/ydool/boot/modules/rddb/wrapper/AppointWrapper.java index 61297ef..9f8c346 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/wrapper/AppointWrapper.java +++ b/src/main/java/com/ydool/boot/modules/rddb/wrapper/AppointWrapper.java @@ -10,9 +10,12 @@ import com.ydool.boot.core.wrapper.BaseWrapper; import com.ydool.boot.modules.rddb.entity.Appoint; import com.ydool.boot.modules.rddb.entity.AppointAttachment; import com.ydool.boot.modules.rddb.entity.AppointUser; +import com.ydool.boot.modules.rddb.entity.Conference; import com.ydool.boot.modules.rddb.entity.dto.AppointDto; +import com.ydool.boot.modules.rddb.mapper.ConferenceMapper; import com.ydool.boot.modules.rddb.service.AppointAttachmentService; import com.ydool.boot.modules.rddb.service.AppointUserService; +import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.List; @@ -28,6 +31,9 @@ public class AppointWrapper extends BaseWrapper { return new AppointWrapper(); } + @Autowired + private ConferenceMapper conferenceMapper; + @Override public AppointDto entityVO(Appoint appoint) { AppointDto appointDto = BeanUtil.copyProperties(appoint, AppointDto.class); @@ -39,14 +45,47 @@ public class AppointWrapper extends BaseWrapper { .eq(AppointAttachment::getAppointId, appoint.getId()) .eq(AppointAttachment::getType, Appoint.STATE_PROPOSE) .orderByDesc(AppointAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(proposeAttachmentList)) { + proposeAttachmentList.stream().forEach(i -> { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + }); + } List conferenceAttachmentList = appointAttachmentService.list(new LambdaQueryWrapper() .eq(AppointAttachment::getAppointId, appoint.getId()) .eq(AppointAttachment::getType, Appoint.STATE_CONFERENCE) .orderByDesc(AppointAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(conferenceAttachmentList)) { + conferenceAttachmentList.stream().forEach(i -> { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + }); + } List performAttachmentList = appointAttachmentService.list(new LambdaQueryWrapper() .eq(AppointAttachment::getAppointId, appoint.getId()) .eq(AppointAttachment::getType, Appoint.STATE_PERFORM) .orderByDesc(AppointAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(performAttachmentList)) { + performAttachmentList.stream().forEach(i -> { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + }); + } List conferenceUserList = appointUserService.list(new LambdaQueryWrapper() .eq(AppointUser::getAppointId, appoint.getId()) @@ -73,12 +112,12 @@ public class AppointWrapper extends BaseWrapper { if (Appoint.STATE_END == appoint.getState()) { //没打分的不算 List scoredAppointUserList = performUserList.stream().filter(item -> item.getScore() != null).collect(Collectors.toList()); - if(CollectionUtil.isNotEmpty(scoredAppointUserList)){ + if (CollectionUtil.isNotEmpty(scoredAppointUserList)) { BigDecimal averageScore = scoredAppointUserList.stream().map(item -> item.getScore()) .reduce(BigDecimal.ZERO, BigDecimal::add) .divide(new BigDecimal(scoredAppointUserList.size()), BigDecimal.ROUND_HALF_UP); appointDto.setAverageScore(averageScore); - }else{ + } else { appointDto.setAverageScore(new BigDecimal("0")); } diff --git a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ContactDbWrapper.java b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ContactDbWrapper.java index 8fe2044..1f132af 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ContactDbWrapper.java +++ b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ContactDbWrapper.java @@ -2,6 +2,7 @@ package com.ydool.boot.modules.rddb.wrapper; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ydool.boot.api.util.TokenUtil; import com.ydool.boot.api.util.UserInfo; @@ -9,8 +10,10 @@ import com.ydool.boot.common.utils.SpringUtils; import com.ydool.boot.core.wrapper.BaseWrapper; import com.ydool.boot.modules.rddb.entity.*; import com.ydool.boot.modules.rddb.entity.dto.ContactDbDto; +import com.ydool.boot.modules.rddb.mapper.ConferenceMapper; import com.ydool.boot.modules.rddb.service.ContactDbAttachmentService; import com.ydool.boot.modules.rddb.service.ContactDbUserService; +import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.List; @@ -26,6 +29,9 @@ public class ContactDbWrapper extends BaseWrapper { return new ContactDbWrapper(); } + @Autowired + private ConferenceMapper conferenceMapper; + @Override public ContactDbDto entityVO(ContactDb contactDb) { ContactDbDto dto = BeanUtil.copyProperties(contactDb, ContactDbDto.class); @@ -37,13 +43,45 @@ public class ContactDbWrapper extends BaseWrapper { .eq(ContactDbAttachment::getContactDbId, contactDb.getId()) .eq(ContactDbAttachment::getType, ContactDbAttachment.TYPE_CONFERENCE_RECORD) .orderByDesc(ContactDbAttachment::getCreatedAt)); + + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(recordAttachmentList)) { + recordAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } + List photoAttachmentList = contactDbAttachmentService.list(new LambdaQueryWrapper() .eq(ContactDbAttachment::getContactDbId, contactDb.getId()) .eq(ContactDbAttachment::getType, ContactDbAttachment.TYPE_CONFERENCE_PHOTO) .orderByDesc(ContactDbAttachment::getCreatedAt)); + + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(photoAttachmentList)) { + photoAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } + dto.setConferenceRecordAttachmentList(recordAttachmentList); dto.setConferencePhotoAttachmentList(photoAttachmentList); + + List subjectUserList = contactDbUserService.list(new LambdaQueryWrapper() .eq(ContactDbUser::getContactDbId, contactDb.getId()) .eq(ContactDbUser::getType, ContactDb.STATE_SUBJECT) diff --git a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewOfficerWrapper.java b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewOfficerWrapper.java index f1dfff5..e5dbef7 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewOfficerWrapper.java +++ b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewOfficerWrapper.java @@ -2,19 +2,19 @@ package com.ydool.boot.modules.rddb.wrapper; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ydool.boot.api.util.TokenUtil; import com.ydool.boot.api.util.UserInfo; import com.ydool.boot.common.utils.SpringUtils; import com.ydool.boot.core.wrapper.BaseWrapper; -import com.ydool.boot.modules.rddb.entity.ReviewOfficer; -import com.ydool.boot.modules.rddb.entity.ReviewOfficerAttachment; -import com.ydool.boot.modules.rddb.entity.ReviewOfficerAudit; -import com.ydool.boot.modules.rddb.entity.ReviewOfficerUser; +import com.ydool.boot.modules.rddb.entity.*; import com.ydool.boot.modules.rddb.entity.dto.ReviewOfficerDto; +import com.ydool.boot.modules.rddb.mapper.ConferenceMapper; import com.ydool.boot.modules.rddb.service.ReviewOfficerAttachmentService; import com.ydool.boot.modules.rddb.service.ReviewOfficerAuditService; import com.ydool.boot.modules.rddb.service.ReviewOfficerUserService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import java.math.BigDecimal; @@ -31,6 +31,9 @@ public class ReviewOfficerWrapper extends BaseWrapper { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List checkAttachmentList = reviewOfficerAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewOfficerAttachment::getReviewId, reviewOfficer.getId()) .eq(ReviewOfficerAttachment::getType, ReviewOfficer.STATE_CHECK) .orderByDesc(ReviewOfficerAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(checkAttachmentList)) { + checkAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List opinionAttachmentList = reviewOfficerAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewOfficerAttachment::getReviewId, reviewOfficer.getId()) .eq(ReviewOfficerAttachment::getType, ReviewOfficer.STATE_OPINION) .orderByDesc(ReviewOfficerAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(opinionAttachmentList)) { + opinionAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List resultAttachmentList = reviewOfficerAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewOfficerAttachment::getReviewId, reviewOfficer.getId()) .eq(ReviewOfficerAttachment::getType, ReviewOfficer.STATE_RESULT) .orderByDesc(ReviewOfficerAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(resultAttachmentList)) { + resultAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List inReportAudit1List = reviewOfficerAuditService.list(new LambdaQueryWrapper() .eq(ReviewOfficerAudit::getReviewId, reviewOfficer.getId()) diff --git a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSubjectWrapper.java b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSubjectWrapper.java index 7259b1d..105590b 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSubjectWrapper.java +++ b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSubjectWrapper.java @@ -2,19 +2,20 @@ package com.ydool.boot.modules.rddb.wrapper; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ydool.boot.api.util.TokenUtil; import com.ydool.boot.api.util.UserInfo; import com.ydool.boot.common.utils.SpringUtils; import com.ydool.boot.core.wrapper.BaseWrapper; -import com.ydool.boot.modules.rddb.entity.ReviewSubject; -import com.ydool.boot.modules.rddb.entity.ReviewSubjectAttachment; -import com.ydool.boot.modules.rddb.entity.ReviewSubjectAudit; -import com.ydool.boot.modules.rddb.entity.ReviewSubjectUser; +import com.ydool.boot.modules.rddb.entity.*; import com.ydool.boot.modules.rddb.entity.dto.ReviewSubjectDto; +import com.ydool.boot.modules.rddb.mapper.ConferenceMapper; import com.ydool.boot.modules.rddb.service.ReviewSubjectAttachmentService; import com.ydool.boot.modules.rddb.service.ReviewSubjectAuditService; import com.ydool.boot.modules.rddb.service.ReviewSubjectUserService; +import io.netty.util.internal.StringUtil; +import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.List; @@ -30,6 +31,9 @@ public class ReviewSubjectWrapper extends BaseWrapper { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List checkAttachmentList = reviewSubjectAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId()) .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_CHECK) .orderByDesc(ReviewSubjectAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(checkAttachmentList)) { + checkAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List opinionAttachmentList = reviewSubjectAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId()) .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_OPINION) .orderByDesc(ReviewSubjectAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(opinionAttachmentList)) { + opinionAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List resultAttachmentList = reviewSubjectAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewSubjectAttachment::getReviewId, reviewSubject.getId()) .eq(ReviewSubjectAttachment::getType, ReviewSubject.STATE_RESULT) .orderByDesc(ReviewSubjectAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(resultAttachmentList)) { + resultAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List inReportAudit1List = reviewSubjectAuditService.list(new LambdaQueryWrapper() .eq(ReviewSubjectAudit::getReviewId, reviewSubject.getId()) diff --git a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSuperviseWrapper.java b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSuperviseWrapper.java index 8050d45..7fadb22 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSuperviseWrapper.java +++ b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewSuperviseWrapper.java @@ -2,6 +2,7 @@ package com.ydool.boot.modules.rddb.wrapper; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ydool.boot.api.util.TokenUtil; import com.ydool.boot.api.util.UserInfo; @@ -9,8 +10,10 @@ import com.ydool.boot.common.utils.SpringUtils; import com.ydool.boot.core.wrapper.BaseWrapper; import com.ydool.boot.modules.rddb.entity.*; import com.ydool.boot.modules.rddb.entity.dto.ReviewSuperviseDto; +import com.ydool.boot.modules.rddb.mapper.ConferenceMapper; import com.ydool.boot.modules.rddb.service.ReviewSuperviseAttachmentService; import com.ydool.boot.modules.rddb.service.ReviewSuperviseUserService; +import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.List; @@ -26,6 +29,9 @@ public class ReviewSuperviseWrapper extends BaseWrapper { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List reviewAttachmentList = reviewSuperviseAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewSuperviseAttachment::getReviewSuperviseId, reviewSupervise.getId()) .eq(ReviewSuperviseAttachment::getType, ReviewSuperviseAttachment.TYPE_REVIEW) .orderByDesc(ReviewSuperviseAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(reviewAttachmentList)) { + reviewAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List tailAttachmentList = reviewSuperviseAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewSuperviseAttachment::getReviewSuperviseId, reviewSupervise.getId()) .eq(ReviewSuperviseAttachment::getType, ReviewSuperviseAttachment.TYPE_TAIL) .orderByDesc(ReviewSuperviseAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(tailAttachmentList)) { + tailAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List researchAttachmentList = reviewSuperviseAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewSuperviseAttachment::getReviewSuperviseId, reviewSupervise.getId()) .eq(ReviewSuperviseAttachment::getType, ReviewSuperviseAttachment.TYPE_RESEARCH) .orderByDesc(ReviewSuperviseAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(researchAttachmentList)) { + researchAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List evaluateAttachmentList = reviewSuperviseAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewSuperviseAttachment::getReviewSuperviseId, reviewSupervise.getId()) .eq(ReviewSuperviseAttachment::getType, ReviewSuperviseAttachment.TYPE_EVALUATE) .orderByDesc(ReviewSuperviseAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(evaluateAttachmentList)) { + evaluateAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } dto.setSurveyAttachmentList(surveyAttachmentList); dto.setReviewAttachmentList(reviewAttachmentList); dto.setTailAttachmentList(tailAttachmentList); diff --git a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewWorkWrapper.java b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewWorkWrapper.java index 2c5031e..e1ce1d3 100644 --- a/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewWorkWrapper.java +++ b/src/main/java/com/ydool/boot/modules/rddb/wrapper/ReviewWorkWrapper.java @@ -2,19 +2,19 @@ package com.ydool.boot.modules.rddb.wrapper; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ydool.boot.api.util.TokenUtil; import com.ydool.boot.api.util.UserInfo; import com.ydool.boot.common.utils.SpringUtils; import com.ydool.boot.core.wrapper.BaseWrapper; -import com.ydool.boot.modules.rddb.entity.ReviewWork; -import com.ydool.boot.modules.rddb.entity.ReviewWorkAttachment; -import com.ydool.boot.modules.rddb.entity.ReviewWorkAudit; -import com.ydool.boot.modules.rddb.entity.ReviewWorkUser; +import com.ydool.boot.modules.rddb.entity.*; import com.ydool.boot.modules.rddb.entity.dto.ReviewWorkDto; +import com.ydool.boot.modules.rddb.mapper.ConferenceMapper; import com.ydool.boot.modules.rddb.service.ReviewWorkAttachmentService; import com.ydool.boot.modules.rddb.service.ReviewWorkAuditService; import com.ydool.boot.modules.rddb.service.ReviewWorkUserService; +import org.springframework.beans.factory.annotation.Autowired; import java.math.BigDecimal; import java.util.List; @@ -30,6 +30,9 @@ public class ReviewWorkWrapper extends BaseWrapper { return new ReviewWorkWrapper(); } + @Autowired + private ConferenceMapper conferenceMapper; + @Override public ReviewWorkDto entityVO(ReviewWork reviewWork) { ReviewWorkDto ReviewWorkDto = BeanUtil.copyProperties(reviewWork, ReviewWorkDto.class); @@ -42,18 +45,70 @@ public class ReviewWorkWrapper extends BaseWrapper { .eq(ReviewWorkAttachment::getReviewId, reviewWork.getId()) .eq(ReviewWorkAttachment::getType, ReviewWork.STATE_IN_REPORT) .orderByDesc(ReviewWorkAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(inReportAttachmentList)) { + inReportAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List checkAttachmentList = reviewWorkAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewWorkAttachment::getReviewId, reviewWork.getId()) .eq(ReviewWorkAttachment::getType, ReviewWork.STATE_CHECK) .orderByDesc(ReviewWorkAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(checkAttachmentList)) { + checkAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List opinionAttachmentList = reviewWorkAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewWorkAttachment::getReviewId, reviewWork.getId()) .eq(ReviewWorkAttachment::getType, ReviewWork.STATE_OPINION) .orderByDesc(ReviewWorkAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(opinionAttachmentList)) { + opinionAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List resultAttachmentList = reviewWorkAttachmentService.list(new LambdaQueryWrapper() .eq(ReviewWorkAttachment::getReviewId, reviewWork.getId()) .eq(ReviewWorkAttachment::getType, ReviewWork.STATE_RESULT) .orderByDesc(ReviewWorkAttachment::getCreatedAt)); + //获取关联会议名称 + if (CollectionUtil.isNotEmpty(resultAttachmentList)) { + resultAttachmentList.stream().forEach(i -> { + if (StrUtil.isNotBlank(i.getConferenceId())) { + Conference conference = conferenceMapper.selectById(i.getConferenceId()); + String conferenceName = ""; + if (conference != null) { + conferenceName = conference.getTitle(); + } + i.setConferenceName(conferenceName); + } + }); + } List inReportAudit1List = reviewWorkAuditService.list(new LambdaQueryWrapper() .eq(ReviewWorkAudit::getReviewId, reviewWork.getId()) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 25b1a58..37f81b1 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -6,7 +6,7 @@ #local db.user = root -db.pass = 123456 +db.pass = Wang09211108 db.url = jdbc:mysql://127.0.0.1:3306/ydool_rd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8 db.driver = com.mysql.cj.jdbc.Driver