Browse Source

网格员项目统计排序

master
zhaoqifeng 3 years ago
parent
commit
8171753a5c
  1. 3
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
  2. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
  3. 2
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml

3
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@ -1165,6 +1165,9 @@ public class GovOrgServiceImpl implements GovOrgService {
formDTO.setEndDate(dateId); formDTO.setEndDate(dateId);
} }
CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId());
if (null == agencyEntity) {
return null;
}
PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
long total = 0; long total = 0;
if (OrgConstant.COMMUNITY.equals(agencyEntity.getLevel()) && NumConstant.ONE_STR.equals(formDTO.getType())) { if (OrgConstant.COMMUNITY.equals(agencyEntity.getLevel()) && NumConstant.ONE_STR.equals(formDTO.getType())) {

2
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@ -1253,6 +1253,8 @@
DEL_FLAG = '0' DEL_FLAG = '0'
AND GRID_ID = #{gridId} AND GRID_ID = #{gridId}
AND DATE_ID = #{dateId} AND DATE_ID = #{dateId}
ORDER BY
CONVERT ( STAFF_NAME USING gbk )
</select> </select>
</mapper> </mapper>

2
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml

@ -132,5 +132,7 @@
<foreach collection="orgIds" item="id" open="AND a.ORG_ID IN (" separator="," close=")"> <foreach collection="orgIds" item="id" open="AND a.ORG_ID IN (" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
ORDER BY
CONVERT ( c.REAL_NAME USING gbk )
</select> </select>
</mapper> </mapper>
Loading…
Cancel
Save