diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java index 99d00721fd..e977a2ec35 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result.work; +import com.epmet.dto.result.resi.ResiActSummaryResultDTO; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; @@ -163,5 +164,15 @@ public class ActDetailResultDTO implements Serializable { private Boolean isMyPublish; private List actContent; + + /** + * 1已经总结0未总结 + */ + private Boolean summaryFlag; + + /** + * 只有填写了总结的才有内容 + */ + List summaryContent; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java index 0f388d686e..dff386732b 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java @@ -84,5 +84,10 @@ public class ActPageResDTO implements Serializable { */ @JsonIgnore private Integer signedUp; + + /** + * 1已经总结0未总结 + */ + private Boolean summaryFlag; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java index fd014695a2..abc846eb86 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java @@ -319,12 +319,13 @@ public class WorkActController { /** * 数字社区,查看活动详情 + * * @param tokenDto * @param formDTO * @return */ @PostMapping("detail") - public Result queryActDetail(@LoginUser TokenDto tokenDto,@RequestBody ActIdFormDTO formDTO){ - return new Result() .ok(workActService.queryActDetail(formDTO.getActId(),tokenDto.getUserId())); + public Result queryActDetail(@LoginUser TokenDto tokenDto, @RequestBody ActIdFormDTO formDTO) { + return new Result().ok(workActService.queryActDetail(formDTO.getActId(), tokenDto.getUserId())); } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 42128bb066..57ae820fbc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.dto.*; import com.epmet.dto.form.SystemMsgFormDTO; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.WxSubscribeMessageFormDTO; +import com.epmet.dto.form.resi.ResiActContentFormDTO; import com.epmet.dto.form.work.*; import com.epmet.dto.result.ActSponsorResultDTO; import com.epmet.dto.result.demand.OptionDTO; @@ -1708,6 +1709,11 @@ public class WorkActServiceImpl implements WorkActService { }else{ resultDTO.setIsMyPublish(false); } + if(resultDTO.getSummaryFlag()){ + ResiActContentFormDTO resiActContentFormDTO=new ResiActContentFormDTO(); + resiActContentFormDTO.setActId(actId); + resultDTO.setSummaryContent(actSummaryDao.selectListSummary(resiActContentFormDTO)); + } return resultDTO; } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 4aca026874..c0bdf44c43 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -827,7 +827,8 @@ aur.ACT_ID = ai.ID AND aur.DEL_FLAG = '0' AND ( aur.`STATUS` = 'auditing' OR aur.`STATUS` = 'passed' ) - ) AS signedUp + ) AS signedUp, + ai.SUMMARY_FLAG as summaryFlag FROM act_info ai WHERE