|
|
|
@ -55,7 +55,7 @@ |
|
|
|
epdc_item item |
|
|
|
LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID |
|
|
|
AND eve.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID |
|
|
|
LEFT JOIN epdc_category cate ON item.FIRST_CATEGORY_CODE = cate.category_code |
|
|
|
AND cate.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID |
|
|
|
AND img.DEL_FLAG = '0' |
|
|
|
@ -89,7 +89,7 @@ |
|
|
|
AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%') |
|
|
|
</if> |
|
|
|
<if test='formDto.categoryId != null and formDto.categoryId != ""'> |
|
|
|
AND t1.ISSUE_CATEGORY_ID = #{formDto.categoryId} |
|
|
|
AND t1.CATEGORY_CODE = #{formDto.categoryId} |
|
|
|
</if> |
|
|
|
<if test='formDto.userId != null and formDto.userId != ""'> |
|
|
|
AND t1.USER_ID = #{formDto.userId} |
|
|
|
@ -125,7 +125,7 @@ |
|
|
|
eve.OPPOSE_NUM, |
|
|
|
eve.COMMENT_NUM, |
|
|
|
( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum, |
|
|
|
cate.CATEGORY_NAME, |
|
|
|
item.CATEGORY_FULL_NAME as CATEGORY_NAME, |
|
|
|
img.IMG_URL, |
|
|
|
hp.CREATED_TIME AS handleTime, |
|
|
|
hp.OUT_HANDLE_ADVICE, |
|
|
|
@ -142,8 +142,6 @@ |
|
|
|
epdc_item item |
|
|
|
LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID |
|
|
|
AND eve.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID |
|
|
|
AND cate.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID |
|
|
|
AND img.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_item_handle_process hp ON item.ID = hp.ITEM_ID |
|
|
|
@ -201,7 +199,7 @@ |
|
|
|
epdc_item item |
|
|
|
LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID |
|
|
|
AND eve.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID |
|
|
|
LEFT JOIN epdc_category cate ON item.FIRST_CATEGORY_CODE = cate.category_code |
|
|
|
AND cate.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID |
|
|
|
AND img.DEL_FLAG = '0' |
|
|
|
@ -234,7 +232,7 @@ |
|
|
|
AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%') |
|
|
|
</if> |
|
|
|
<if test='formDto.categoryId != null and formDto.categoryId != ""'> |
|
|
|
AND t1.ISSUE_CATEGORY_ID = #{formDto.categoryId} |
|
|
|
AND t1.CATEGORY_CODE = #{formDto.categoryId} |
|
|
|
</if> |
|
|
|
<if test='formDto.userId != null and formDto.userId != ""'> |
|
|
|
AND t1.USER_ID = #{formDto.userId} |
|
|
|
@ -275,7 +273,7 @@ |
|
|
|
<result property="opposeNum" column="OPPOSE_NUM"/> |
|
|
|
<result property="commentNum" column="COMMENT_NUM"/> |
|
|
|
<result property="statementNum" column="statementNum"/> |
|
|
|
<result property="categoryId" column="ISSUE_CATEGORY_ID"/> |
|
|
|
<result property="categoryId" column="CATEGORY_CODE"/> |
|
|
|
<result property="isOperational" column="isOperational"/> |
|
|
|
<result property="isSatisfactionEvaluation" column="isSatisfactionEvaluation"/> |
|
|
|
<result property="isShowSatisfactionEvaluation" column="isShowSatisfactionEvaluation"/> |
|
|
|
@ -298,7 +296,7 @@ |
|
|
|
item.NICK_NAME, |
|
|
|
item.USER_FACE, |
|
|
|
item.ISSUE_ADDRESS, |
|
|
|
item.ISSUE_CATEGORY_ID, |
|
|
|
item.CATEGORY_CODE, |
|
|
|
eve.APPROVE_NUM, |
|
|
|
eve.OPPOSE_NUM, |
|
|
|
eve.BROWSE_NUM, |
|
|
|
@ -349,18 +347,18 @@ |
|
|
|
COUNT( item.ID ) AS itemNum, |
|
|
|
SUM( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.BROWSE_NUM + eve.COMMENT_NUM ) AS attitudeNum, |
|
|
|
cate.CATEGORY_NAME, |
|
|
|
cate.ID AS categoryId |
|
|
|
cate.CATEGORY_CODE AS categoryId |
|
|
|
FROM |
|
|
|
epdc_item item |
|
|
|
LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID |
|
|
|
AND eve.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID |
|
|
|
LEFT JOIN epdc_category cate ON item.CATEGORY_CODE = cate.category_code |
|
|
|
AND cate.DEL_FLAG = '0' |
|
|
|
WHERE |
|
|
|
item.DEL_FLAG = '0' |
|
|
|
AND item.ITEM_STATE IN (0, 10) |
|
|
|
AND item.GRID_ID = #{gridId} |
|
|
|
AND item.ISSUE_CATEGORY_ID = #{categoryId} |
|
|
|
AND item.CATEGORY_CODE = #{categoryId} |
|
|
|
</select> |
|
|
|
|
|
|
|
<select id="selectListOfPendingHandleItems" resultType="com.elink.esua.epdc.dto.item.ItemPendingHandleDTO"> |
|
|
|
@ -407,10 +405,12 @@ |
|
|
|
AND item.GRID_ID = #{gridId} |
|
|
|
</if> |
|
|
|
<if test="streetId != null and streetId != ''"> |
|
|
|
AND find_in_set(#{streetId},item.PARENT_DEPT_IDS) |
|
|
|
AND (find_in_set(#{streetId},item.PARENT_DEPT_IDS) |
|
|
|
OR find_in_set(#{streetId},item.ALL_DEPT_IDS)) |
|
|
|
</if> |
|
|
|
<if test="communityId != null and communityId != ''"> |
|
|
|
AND find_in_set(#{communityId},item.PARENT_DEPT_IDS) |
|
|
|
AND (find_in_set(#{communityId},item.PARENT_DEPT_IDS) |
|
|
|
OR find_in_set(#{communityId},item.ALL_DEPT_IDS)) |
|
|
|
</if> |
|
|
|
ORDER BY |
|
|
|
item.CREATED_TIME DESC |
|
|
|
@ -447,15 +447,13 @@ |
|
|
|
eve.APPROVE_NUM, |
|
|
|
eve.OPPOSE_NUM, |
|
|
|
eve.COMMENT_NUM, |
|
|
|
cate.CATEGORY_NAME, |
|
|
|
item.CATEGORY_FULL_NAME as CATEGORY_NAME, |
|
|
|
img.IMG_URL, |
|
|
|
item.GROUP_NAME |
|
|
|
FROM |
|
|
|
epdc_item item |
|
|
|
LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID |
|
|
|
AND img.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID |
|
|
|
AND cate.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID |
|
|
|
AND eve.DEL_FLAG = '0' |
|
|
|
WHERE |
|
|
|
@ -470,7 +468,7 @@ |
|
|
|
item.MOBILE, |
|
|
|
item.USER_FACE, |
|
|
|
item.ITEM_CONTENT, |
|
|
|
cate.CATEGORY_NAME, |
|
|
|
item.CATEGORY_FULL_NAME as CATEGORY_NAME, |
|
|
|
item.IS_PARTY_MEMBER, |
|
|
|
item.ISSUE_ADDRESS, |
|
|
|
eve.APPROVE_NUM, |
|
|
|
@ -480,12 +478,11 @@ |
|
|
|
( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS statementNum, |
|
|
|
item.EVENT_ID, |
|
|
|
img.IMG_URL |
|
|
|
|
|
|
|
FROM |
|
|
|
epdc_item item |
|
|
|
LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID |
|
|
|
AND img.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID |
|
|
|
AND cate.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID |
|
|
|
AND eve.DEL_FLAG = '0' |
|
|
|
WHERE |
|
|
|
@ -620,7 +617,7 @@ |
|
|
|
item.ISSUE_LATITUDE, |
|
|
|
item.ISSUE_LONGITUDE, |
|
|
|
item.GROUP_NAME, |
|
|
|
cate.CATEGORY_NAME, |
|
|
|
item.CATEGORY_FULL_NAME as CATEGORY_NAME, |
|
|
|
eve.APPROVE_NUM, |
|
|
|
eve.OPPOSE_NUM, |
|
|
|
eve.COMMENT_NUM, |
|
|
|
@ -638,8 +635,6 @@ |
|
|
|
AND eve.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID |
|
|
|
AND img.DEL_FLAG = '0' |
|
|
|
LEFT JOIN epdc_event_category cate ON item.ISSUE_CATEGORY_ID = cate.ID |
|
|
|
AND cate.DEL_FLAG = '0' |
|
|
|
WHERE |
|
|
|
item.DEL_FLAG = '0' |
|
|
|
AND item.ID = #{itemId} |
|
|
|
@ -708,6 +703,7 @@ |
|
|
|
pendingTable.pendingHandleNum, |
|
|
|
closingTable.closingCaseNum, |
|
|
|
closedTable.closedNum, |
|
|
|
noticeTable.noticeNum |
|
|
|
FROM |
|
|
|
( |
|
|
|
SELECT |
|
|
|
|
王金鹏
6 years ago