Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master'

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java

@@ -37,5 +37,11 @@ public class CommunityLoginFormDTO extends PageFormDTO {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date endDate;
+
+    /**
+     * exclude_zero:不展示登录次数为0的社区
+     * all：全部展示
+     */
+    private String dataRange;
 }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java

@@ -194,11 +194,9 @@ public class StaffLoginLogController {
         PageData<AccountActivityInfo> res = staffLoginLogService.getAccountActivityInfo(formDTO);
         if (!CollectionUtils.isEmpty(res.getList())) {
             if("1".equals(formDTO.getIsActivity())){
-//                List<AccountActivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountActivityExcel.class);
-                ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountActivityExcel.class);
+                ExcelUtils.exportExcelToTarget(response, "社区活跃数据", res.getList(), AccountActivityExcel.class);
             }else {
-//                List<AccountInactivityExcel> accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountInactivityExcel.class);
-                ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountInactivityExcel.class);
+                ExcelUtils.exportExcelToTarget(response, "社区不活跃数据", res.getList(), AccountInactivityExcel.class);
             }
 
         }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java

@@ -27,11 +27,13 @@ public interface StaffLoginLogDao extends BaseDao<StaffLoginLogEntity> {
      * @param orgId
      * @param startDate
      * @param endDate
+     * @param  dataRange exclude_zero:不展示登录次数为0的社区  all：全部展示
      * @return
      */
     List<CommunityLoginResultDTO> pageCommunityCount(@Param("orgId") String orgId,
                                                      @Param("startDate") Date startDate,
-                                                     @Param("endDate") Date endDate);
+                                                     @Param("endDate") Date endDate,
+                                                     @Param("dataRange")String dataRange);
 
     List<CommunityLoginResultDTO> selectCommunityCount(@Param("orgId") String orgId,
                                                      @Param("startDate") Date startDate,

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -517,7 +517,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
 
         List<HouseCountPictureListResultDTO> list =baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd());
 
-        resultDTO.getList().forEach(
+        list.forEach(
                 result->{
                     type.put(result.getType(),result.getType());
                     resultDTO.setTotal(resultDTO.getTotal()+result.getCount());

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java

@@ -223,12 +223,12 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl<StaffLoginLogDao,
         }
         if (formDTO.getIsPage()) {
             PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-            List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
+            List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate(),formDTO.getDataRange());
             PageInfo<CommunityLoginResultDTO> pageInfo = new PageInfo<>(list);
             return new PageData<>(list, pageInfo.getTotal(), formDTO.getPageSize());
         }
         // 不分页
-        List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate());
+        List<CommunityLoginResultDTO> list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate(),formDTO.getDataRange());
         int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size();
         return new PageData<>(list, total, total);
     }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml

@@ -48,7 +48,14 @@
             <if test='null != endDate'>
                 and l.LOGIN_TIME &lt;= #{endDate}
             </if>
-        GROUP BY ca.id
+        <choose>
+            <when test="null !=dataRange and 'exclude_zero' == dataRange">
+                GROUP BY ca.id having count( l.id )>0
+            </when>
+            <otherwise>
+                GROUP BY ca.id
+            </otherwise>
+        </choose>
         order by count(l.id) desc,ca.CREATED_TIME desc
     </select>