rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

content 活动和通知修改成 title

dev
zxc 5 years ago
parent
ccee1a6ac9
commit
91ca0045fc
1 changed files with 6 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

15
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
View File

@ -575,14 +575,13 @@
ai.ID, ai.ID,
ai.CREATED_BY AS userId, ai.CREATED_BY AS userId,
DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
IFNULL(ac.CONTENT,'') AS content, IFNULL(ai.TITLE,'') AS content,
ai.`STATUS` AS status, ai.`STATUS` AS status,
'' AS issueId, '' AS issueId,
'act' AS contentType, 'act' AS contentType,
IFNULL(ac2.CONTENT,'') AS firstPhoto, IFNULL(ac2.CONTENT,'') AS firstPhoto,
false AS isExpirat false AS isExpirat
FROM group_act_info ai FROM group_act_info ai
LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text' AND ac.DEL_FLAG = 0 AND ac.sort = 1
LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1 LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1
WHERE ai.DEL_FLAG = '0' WHERE ai.DEL_FLAG = '0'
AND ai.GROUP_ID = #{groupId} AND ai.GROUP_ID = #{groupId}
@ -593,7 +592,7 @@
n.ID, n.ID,
n.CREATED_BY AS userId, n.CREATED_BY AS userId,
DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
n.CONTENT AS content, n.TITLE AS content,
'' AS status, '' AS status,
'' AS issueId, '' AS issueId,
'notice' AS contentType, 'notice' AS contentType,
@ -737,12 +736,11 @@
ai.ID, ai.ID,
ai.CREATED_BY AS userId, ai.CREATED_BY AS userId,
DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
IFNULL(ac.CONTENT,'') AS content, IFNULL(ai.TITLE,'') AS content,
'act' AS contentType, 'act' AS contentType,
IFNULL(ac2.CONTENT,'') AS firstPhoto, IFNULL(ac2.CONTENT,'') AS firstPhoto,
false AS isExpirat false AS isExpirat
FROM group_act_info ai FROM group_act_info ai
LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text'
LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.SORT = 1 LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.SORT = 1
WHERE ai.DEL_FLAG = '0' WHERE ai.DEL_FLAG = '0'
AND ( AND (
@ -756,7 +754,7 @@
n.ID, n.ID,
n.CREATED_BY AS userId, n.CREATED_BY AS userId,
DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
n.CONTENT AS content, n.TITLE AS content,
'notice' AS contentType, 'notice' AS contentType,
IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto, IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto,
(CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat
@ -798,13 +796,12 @@
ai.ID, ai.ID,
ai.CREATED_BY AS userId, ai.CREATED_BY AS userId,
DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, DATE_FORMAT(ai.CHANGED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
IFNULL(ac.CONTENT,'') AS content, IFNULL(ai.TITLE,'') AS content,
ai.`STATUS` AS status, ai.`STATUS` AS status,
'' AS issueId, '' AS issueId,
'act' AS contentType, 'act' AS contentType,
false AS isExpirat false AS isExpirat
FROM group_act_info ai FROM group_act_info ai
LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text'
WHERE ai.DEL_FLAG = '0' WHERE ai.DEL_FLAG = '0'
AND ( AND (
<foreach collection="ids" item="id" separator=" OR "> <foreach collection="ids" item="id" separator=" OR ">
@ -817,7 +814,7 @@
n.ID, n.ID,
n.CREATED_BY AS userId, n.CREATED_BY AS userId,
DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime,
n.CONTENT AS content, n.TITLE AS content,
'' AS status, '' AS status,
'' AS issueId, '' AS issueId,
'notice' AS contentType, 'notice' AS contentType,

Write Preview
Loading…
Cancel
Save