diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java index 2da680e2..14dc22c4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/entity/SarLawsTopic.java @@ -84,7 +84,7 @@ public class SarLawsTopic implements Serializable { * 协议真实文件名 */ @TableField(exist = false) - private String agreementRealName; + private String agreementName; /** * 课题组会议列表 @@ -102,7 +102,7 @@ public class SarLawsTopic implements Serializable { * 课题组研究方案真实文件名 */ @TableField(exist = false) - private String researchPlanRealName; + private String researchPlanName; /** * 课题组研究成果 @@ -114,7 +114,7 @@ public class SarLawsTopic implements Serializable { * 课题组研究成果真实文件名 */ @TableField(exist = false) - private String researchFindingsRealName; + private String researchFindingsName; /** * 课题组其他 @@ -126,7 +126,7 @@ public class SarLawsTopic implements Serializable { * 课题组其他真实文件名 */ @TableField(exist = false) - private String researchGroupOtherRealName; + private String researchGroupOtherName; /** * 课题组会议资料 @@ -138,7 +138,7 @@ public class SarLawsTopic implements Serializable { * 课题组会议资料真实文件名 */ @TableField(exist = false) - private String conferenceMaterialsRealName; + private String conferenceMaterialsName; /** * 课题组联系方式 @@ -156,7 +156,7 @@ public class SarLawsTopic implements Serializable { * 内部资料立项报告真实文件名 */ @TableField(exist = false) - private String insideProjectProposalRepostRealName; + private String insideProjectProposalRepostName; /** * 内部资料研究方案 @@ -168,7 +168,7 @@ public class SarLawsTopic implements Serializable { * 内部资料研究方案真实文件名 */ @TableField(exist = false) - private String insideResearchPlanRealName; + private String insideResearchPlanName; /** * 内部资料会议资料 @@ -180,7 +180,7 @@ public class SarLawsTopic implements Serializable { * 内部资料会议资料真实文件名 */ @TableField(exist = false) - private String insideConferenceMaterialsRealName; + private String insideConferenceMaterialsName; /** * 内部会议研究成果 @@ -192,7 +192,7 @@ public class SarLawsTopic implements Serializable { * 内部会议研究成果真实文件名 */ @TableField(exist = false) - private String insideResearchFindingsRealName; + private String insideResearchFindingsName; /** * 内部会议其他 @@ -204,7 +204,7 @@ public class SarLawsTopic implements Serializable { * 内部会议其他真实文件名 */ @TableField(exist = false) - private String insideOtherRealName; + private String insideOtherName; /** * 内部联系方式 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java index 2066a49c..b83ad93f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java @@ -58,40 +58,29 @@ public class SarLawsTopicServiceImpl extends ServiceImpl tempList = new ArrayList<>(); - for (String attId : split) { - AttFileEO fileInfo = attFileEOService.getFileInfo(attId); - tempList.add(fileInfo.getOldFileName()); - } - sarLawsTopic.setAgreementRealName(StringUtils.join(tempList)); - } - if (sarLawsTopic != null) { - // 查询课题组会议 - LambdaQueryWrapper meetingWrapper = new LambdaQueryWrapper<>(); - meetingWrapper.eq(SarLawsTopicMeeting::getLawsTopicId, lawsTopicId); - List topicMeetingList = meetingService.list(meetingWrapper); - sarLawsTopic.setMeetingList(topicMeetingList); - // 查询课题组联系方式 - LambdaQueryWrapper topicGroupWrapper = new LambdaQueryWrapper<>(); - topicGroupWrapper.eq(SarLawsContactInformation::getLawsTopicId, lawsTopicId); - topicGroupWrapper.eq(SarLawsContactInformation::getGroupType,"lawsTopic"); - List lawsTopicContactInformation = contactInformationService.list(topicGroupWrapper); - sarLawsTopic.setTopicContactInformationList(lawsTopicContactInformation); - // 查询内部联系房方式 - LambdaQueryWrapper insideWrapper = new LambdaQueryWrapper<>(); - topicGroupWrapper.eq(SarLawsContactInformation::getLawsTopicId, lawsTopicId); - topicGroupWrapper.eq(SarLawsContactInformation::getGroupType,"lawsTopic"); - List insideContactInformation = contactInformationService.list(topicGroupWrapper); - sarLawsTopic.setInsideContactInformationList(insideContactInformation); - } + // 查询课题组会议 + LambdaQueryWrapper meetingWrapper = new LambdaQueryWrapper<>(); + meetingWrapper.eq(SarLawsTopicMeeting::getLawsTopicId, lawsTopicId); + List topicMeetingList = meetingService.list(meetingWrapper); + sarLawsTopic.setMeetingList(topicMeetingList); + // 查询课题组联系方式 + LambdaQueryWrapper topicGroupWrapper = new LambdaQueryWrapper<>(); + topicGroupWrapper.eq(SarLawsContactInformation::getLawsTopicId, lawsTopicId); + topicGroupWrapper.eq(SarLawsContactInformation::getGroupType,"lawsTopic"); + List lawsTopicContactInformation = contactInformationService.list(topicGroupWrapper); + sarLawsTopic.setTopicContactInformationList(lawsTopicContactInformation); + // 查询内部联系房方式 + LambdaQueryWrapper insideWrapper = new LambdaQueryWrapper<>(); + topicGroupWrapper.eq(SarLawsContactInformation::getLawsTopicId, lawsTopicId); + topicGroupWrapper.eq(SarLawsContactInformation::getGroupType,"lawsTopic"); + List insideContactInformation = contactInformationService.list(topicGroupWrapper); + sarLawsTopic.setInsideContactInformationList(insideContactInformation); return sarLawsTopic; }