Browse Source

isChanged修改

dev_shibei_match
zxc 4 years ago
parent
commit
1776b4d84b
  1. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java
  2. 8
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

2
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java

@ -85,7 +85,7 @@ public class GetPastTopicListV2ResultDTO implements Serializable {
/**
* 是否变更yesno
*/
private String isChange = "no";
private Boolean isChanged = false;
@JsonIgnore
private String userId;

8
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@ -770,7 +770,7 @@
<!-- 根据IDs查询 topic,act,notice信息 -->
<select id="getPastTopicListV2ByIds" resultType="com.epmet.resi.group.dto.topic.result.GetPastTopicListV2ResultDTO">
SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat,isChange FROM
SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat,isChanged FROM
((SELECT
t.ID,
t.CREATED_BY AS userId,
@ -780,7 +780,7 @@
IFNULL(t.ISSUE_ID,'') AS issueId,
'topic' AS contentType,
false AS isExpirat,
'no' AS isChange
false AS isChanged
FROM resi_topic t
WHERE t.DEL_FLAG = '0'
AND t.`STATUS` != 'hidden'
@ -800,7 +800,7 @@
'' AS issueId,
'act' AS contentType,
false AS isExpirat,
'no' AS isChange
false AS isChanged
FROM group_act_info ai
WHERE ai.DEL_FLAG = '0'
AND (
@ -819,7 +819,7 @@
'' AS issueId,
'notice' AS contentType,
(CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat,
n.IS_CHANGE
(case when n.is_change = 'yes' then true else false end) AS isChanged
FROM notice n
WHERE n.DEL_FLAG = '0'
AND (

Loading…
Cancel
Save