Browse Source

暂提

master
zxc 3 years ago
parent
commit
6467a26062
  1. 9
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
  2. 16
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

9
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@ -1982,6 +1982,15 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
result.setList(allIssueListResultDTOS); result.setList(allIssueListResultDTOS);
result.setTotal(allIssueListResultDTOS.size()); result.setTotal(allIssueListResultDTOS.size());
} }
if (CollectionUtils.isNotEmpty(result.getList())){
result.getList().forEach(l -> {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId());
if(null == gridInfo){
throw new EpmetException("查询网格信息失败:"+l.getGridId());
}
l.setGridName(gridInfo.getGridNamePath());
});
}
return result; return result;
} }
} }

16
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml

@ -892,27 +892,27 @@
vs.OPPOSITION_COUNT vs.OPPOSITION_COUNT
FROM issue i FROM issue i
LEFT JOIN issue_vote_statistical vs ON vs.ISSUE_ID = i.ID AND vs.DEL_FLAG = '0' LEFT JOIN issue_vote_statistical vs ON vs.ISSUE_ID = i.ID AND vs.DEL_FLAG = '0'
WHERE DEL_FLAG = '0' WHERE i.DEL_FLAG = '0'
<if test='null != startTime and startTime != "" '> <if test='null != startTime and startTime != "" '>
AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') >= #{startTime} AND DATE_FORMAT(i.CREATED_TIME,'%Y%m%d') >= #{startTime}
</if> </if>
<if test='null != endTime and endTime != "" '> <if test='null != endTime and endTime != "" '>
AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime} AND DATE_FORMAT(i.CREATED_TIME,'%Y%m%d') <![CDATA[ <= ]]> #{endTime}
</if> </if>
<if test='null != issueStatus and issueStatus != "" '> <if test='null != issueStatus and issueStatus != "" '>
AND ISSUE_STATUS = #{issueStatus} AND i.ISSUE_STATUS = #{issueStatus}
</if> </if>
<if test='null != issueTitle and issueTitle != "" '> <if test='null != issueTitle and issueTitle != "" '>
AND ISSUE_TITLE LIKE CONCAT('%',#{issueTitle},'%') AND i.ISSUE_TITLE LIKE CONCAT('%',#{issueTitle},'%')
</if> </if>
<choose> <choose>
<when test='orgType == "agency"'> <when test='orgType == "agency"'>
AND ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%') AND i.ORG_ID_PATH LIKE CONCAT('%',#{orgId},'%')
</when> </when>
<otherwise> <otherwise>
AND GRID_ID = #{orgId} AND i.GRID_ID = #{orgId}
</otherwise> </otherwise>
</choose> </choose>
ORDER BY CREATED_TIME DESC ORDER BY i.CREATED_TIME DESC
</select> </select>
</mapper> </mapper>
Loading…
Cancel
Save