From a0118d1bae2ccef78cc463b74055940f5b156642 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 20 Oct 2023 17:47:24 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E6=94=BF=E7=AD=96=E8=AF=BE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarLawsTopicController.java | 6 +- .../sarLawsTopic/entity/SarLawsTopic.java | 60 +++++++++++++++++++ .../service/SarLawsTopicService.java | 2 +- .../service/impl/SarLawsTopicServiceImpl.java | 37 +++++++++++- 4 files changed, 100 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java index 8e69b57a..c09cfdc4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java @@ -31,11 +31,11 @@ public class SarLawsTopicController extends BaseController { @ApiOperation(value = "根据政策课题ID查询会议信息") @GetMapping("/getLawsTopicInfo") - public ResponseMessage getLawsTopicInfo(String lawsTopicId){ - if (StringUtils.isBlank(lawsTopicId)) { + public ResponseMessage getLawsTopicInfo(String id) throws Exception{ + if (StringUtils.isBlank(id)) { return Result.error("会议ID为空！"); } - SarLawsTopic sarLawsTopic = lawsTopicService.getLawsTopicInfo(lawsTopicId); + SarLawsTopic sarLawsTopic = lawsTopicService.getLawsTopicInfo(id); return Result.success(sarLawsTopic); } 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 9423112d..2da680e2 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 @@ -80,6 +80,12 @@ public class SarLawsTopic implements Serializable { @TableField(value = "AGREEMENT") private String agreement; + /** + * 协议真实文件名 + */ + @TableField(exist = false) + private String agreementRealName; + /** * 课题组会议列表 */ @@ -92,24 +98,48 @@ public class SarLawsTopic implements Serializable { @TableField(value = "RESEARCH_PLAN") private String researchPlan; + /** + * 课题组研究方案真实文件名 + */ + @TableField(exist = false) + private String researchPlanRealName; + /** * 课题组研究成果 */ @TableField(value = "RESEARCH_FINDINGS") private String researchFindings; + /** + * 课题组研究成果真实文件名 + */ + @TableField(exist = false) + private String researchFindingsRealName; + /** * 课题组其他 */ @TableField(value = "RESEARCH_GROUP_OTHER") private String researchGroupOther; + /** + * 课题组其他真实文件名 + */ + @TableField(exist = false) + private String researchGroupOtherRealName; + /** * 课题组会议资料 */ @TableField(value = "CONFERENCE_MATERIALS") private String conferenceMaterials; + /** + * 课题组会议资料真实文件名 + */ + @TableField(exist = false) + private String conferenceMaterialsRealName; + /** * 课题组联系方式 */ @@ -122,30 +152,60 @@ public class SarLawsTopic implements Serializable { @TableField(value = "INSIDE_PROJECT_PROPOSAL_REPORT") private String insideProjectProposalRepost; + /** + * 内部资料立项报告真实文件名 + */ + @TableField(exist = false) + private String insideProjectProposalRepostRealName; + /** * 内部资料研究方案 */ @TableField(value = "INSIDE_RESEARCH_PLAN") private String insideResearchPlan; + /** + * 内部资料研究方案真实文件名 + */ + @TableField(exist = false) + private String insideResearchPlanRealName; + /** * 内部资料会议资料 */ @TableField(value = "INSIDE_CONFERENCE_MATERIALS") private String insideConferenceMaterials; + /** + * 内部资料会议资料真实文件名 + */ + @TableField(exist = false) + private String insideConferenceMaterialsRealName; + /** * 内部会议研究成果 */ @TableField(value = "INSIDE_RESEARCH_FINDINGS") private String insideResearchFindings; + /** + * 内部会议研究成果真实文件名 + */ + @TableField(exist = false) + private String insideResearchFindingsRealName; + /** * 内部会议其他 */ @TableField(value = "INSIDE_OTHER") private String insideOther; + /** + * 内部会议其他真实文件名 + */ + @TableField(exist = false) + private String insideOtherRealName; + /** * 内部联系方式 */ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/SarLawsTopicService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/SarLawsTopicService.java index 2d59726e..812a94e4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/SarLawsTopicService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/SarLawsTopicService.java @@ -13,7 +13,7 @@ import java.util.List; */ public interface SarLawsTopicService extends IService { - SarLawsTopic getLawsTopicInfo(String lawsTopicId); + SarLawsTopic getLawsTopicInfo(String lawsTopicId) throws Exception; Integer addLawsTopicInfo(SarLawsTopic lawsTopic); 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 f989c69a..2066a49c 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 @@ -1,5 +1,7 @@ package com.adc.da.slrs.sarLawsTopic.service.impl; +import com.adc.da.att.entity.AttFileEO; +import com.adc.da.att.service.impl.AttFileEOServiceImpl; import com.adc.da.slrs.sarLawsTopic.entity.SarLawsContactInformation; import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopicMeeting; import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopicVO; @@ -16,6 +18,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -31,13 +35,44 @@ public class SarLawsTopicServiceImpl extends ServiceImpl aClass = sarLawsTopic.getClass(); + for (String fileField : fileFieldArray) { + fileField = fileField.substring(0,1).toUpperCase() + fileField.substring(1); + Method getMethod = aClass.getMethod("get" + fileField); + String attIds = (String) getMethod.invoke(sarLawsTopic, null); + if (StringUtils.isNotBlank(attIds)) { + String[] split = attIds.split(","); + List tempList = new ArrayList<>(); + for (String attId : split) { + AttFileEO fileInfo = attFileEOService.getFileInfo(attId); + tempList.add(fileInfo.getOldFileName()); + } + Method setMethod = aClass.getMethod("set" + fileField + "RealName", String.class); + String join = String.join(",", tempList); + System.out.println(fileField+"："+join); + setMethod.invoke(sarLawsTopic,join); + } + } + if (StringUtils.isNotBlank(sarLawsTopic.getAgreement())) { + String[] split = sarLawsTopic.getAgreement().split(","); + List 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<>();