springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -911,4 +911,27 @@ String nowtime = getCurrentDate().format(format_y); return nowtime; } /** * 获取当前年第一天 * @return 当前年第一天时间 */ public static Date getFirstDayOfYear() { Calendar currCal=Calendar.getInstance(); int currentYear = currCal.get(Calendar.YEAR); return getYearFirst(currentYear); } /** * 获取某年第一天日期 * @param year 年份 * @return Date */ public static Date getYearFirst(int year){ Calendar calendar = Calendar.getInstance(); calendar.clear(); calendar.set(Calendar.YEAR, year); Date currYearFirst = calendar.getTime(); return currYearFirst; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -272,7 +272,8 @@ Integer getSpecialStatisticsByLabel(@Param("label") String label,@Param("communityId") Long communityId); @Select("<script> " + "SELECT " + " count( egd.id ) AS gridTotal, " + " ( SELECT count( user_id ) FROM sys_user WHERE community_id = egd.grid_community_id AND type = 6 ) AS gridMemberTotal, " + " ( select count(egmr.id) from event_grid_member_relation as egmr" + " left join event_grid_data as egd1 on egd1.id = egmr.grid_id where egd1.grid_community_id = egd.grid_community_id ) AS gridMemberTotal, " + " ( " + " SELECT " + " count( e.id ) " + " FROM " + " `event` AS e " + " LEFT JOIN event_grid_data AS egd1 ON e.grid_id = egd1.id " + " WHERE " + " egd1.grid_community_id = egd.grid_community_id " + " AND event_status = 2 " springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/EldersAuthServiceImpl.java
@@ -621,8 +621,7 @@ }); //查询高龄认证记录列表 List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(new QueryWrapper<ComElderAuthRecordsDO>().lambda() .ge(ComElderAuthRecordsDO::getCreateAt,DateUtils.getFirstDayOfMonth())); List<ComElderAuthRecordsDO> authRecordsList = comElderAuthRecordsDAO.selectList(null); //遍历高龄认证记录列表 authRecordsList.forEach(authRecords -> { if(authRecords.getApprovalStatus().equals(ComElderAuthRecordsDO.approvalStatus.tg)){ @@ -657,8 +656,7 @@ }); //查询养老认证记录列表 List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(new QueryWrapper<ComPensionAuthRecordDO>().lambda() .ge(ComPensionAuthRecordDO::getCreateAt,DateUtils.getFirstDayOfMonth())); List<ComPensionAuthRecordDO> pensionAuthList = comPensionAuthRecordDAO.selectList(null); //遍历养老认证记录列表 pensionAuthList.forEach(authRecords -> { ComPensionAuthHistoryRecordDO pensionAuthDO = comPensionAuthHistoryRecordMapper.selectOne(new QueryWrapper<ComPensionAuthHistoryRecordDO>().lambda()