Browse Source

列表返回总结标志,详情返回总结内容

dev
yinzuomei 3 years ago
parent
commit
9323769aa6
  1. 11
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java
  2. 5
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java
  3. 1
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java
  4. 6
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java
  5. 3
      epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

11
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; package com.epmet.dto.result.work;
import com.epmet.dto.result.resi.ResiActSummaryResultDTO;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
@ -163,5 +164,15 @@ public class ActDetailResultDTO implements Serializable {
private Boolean isMyPublish; private Boolean isMyPublish;
private List<ActPreviewContentResultDTO> actContent; private List<ActPreviewContentResultDTO> actContent;
/**
* 1已经总结0未总结
*/
private Boolean summaryFlag;
/**
* 只有填写了总结的才有内容
*/
List<ResiActSummaryResultDTO> summaryContent;
} }

5
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 @JsonIgnore
private Integer signedUp; private Integer signedUp;
/**
* 1已经总结0未总结
*/
private Boolean summaryFlag;
} }

1
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java

@ -319,6 +319,7 @@ public class WorkActController {
/** /**
* 数字社区查看活动详情 * 数字社区查看活动详情
*
* @param tokenDto * @param tokenDto
* @param formDTO * @param formDTO
* @return * @return

6
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.SystemMsgFormDTO;
import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.dto.form.UserMessageFormDTO;
import com.epmet.dto.form.WxSubscribeMessageFormDTO; import com.epmet.dto.form.WxSubscribeMessageFormDTO;
import com.epmet.dto.form.resi.ResiActContentFormDTO;
import com.epmet.dto.form.work.*; import com.epmet.dto.form.work.*;
import com.epmet.dto.result.ActSponsorResultDTO; import com.epmet.dto.result.ActSponsorResultDTO;
import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.demand.OptionDTO;
@ -1708,6 +1709,11 @@ public class WorkActServiceImpl implements WorkActService {
}else{ }else{
resultDTO.setIsMyPublish(false); resultDTO.setIsMyPublish(false);
} }
if(resultDTO.getSummaryFlag()){
ResiActContentFormDTO resiActContentFormDTO=new ResiActContentFormDTO();
resiActContentFormDTO.setActId(actId);
resultDTO.setSummaryContent(actSummaryDao.selectListSummary(resiActContentFormDTO));
}
return resultDTO; return resultDTO;
} }
} }

3
epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@ -827,7 +827,8 @@
aur.ACT_ID = ai.ID aur.ACT_ID = ai.ID
AND aur.DEL_FLAG = '0' AND aur.DEL_FLAG = '0'
AND ( aur.`STATUS` = 'auditing' OR aur.`STATUS` = 'passed' ) AND ( aur.`STATUS` = 'auditing' OR aur.`STATUS` = 'passed' )
) AS signedUp ) AS signedUp,
ai.SUMMARY_FLAG as summaryFlag
FROM FROM
act_info ai act_info ai
WHERE WHERE

Loading…
Cancel
Save