springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -614,11 +614,11 @@ List<EventVisitingTasksDO> saveList = new ArrayList<>(); //获取上月第一天时间 // Date lastMonthFirst = DateUtils.getLastMonthFirst(); Date lastMonthFirst = DateUtils.getYearMonthStart(2022,7); Date lastMonthFirst = DateUtils.getLastMonthFirst(); // Date lastMonthFirst = DateUtils.getYearMonthStart(2022,7); //获取上月最后一天时间/ // Date lastMonthEnd = DateUtils.getLastMonthEnd(); Date lastMonthEnd = DateUtils.getYearMonthStart(2022,8); Date lastMonthEnd = DateUtils.getLastMonthEnd(); // Date lastMonthEnd = DateUtils.getYearMonthStart(2022,8); log.error("第一天时间"+lastMonthFirst); log.error("第一天时间"+lastMonthEnd); springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventVisitingTasksMapper.xml
@@ -90,10 +90,10 @@ FROM event_visiting_tasks vt LEFT JOIN com_mng_population p ON p.id = vt.visiter_id LEFT JOIN sys_user u ON u.user_id = vt.create_by where 1=1 <if test = "query.gridId != null"> and vt.grid_id = #{query.gridId} </if> where <!-- <if test = "query.gridId != null">--> <!-- and vt.grid_id = #{query.gridId}--> <!-- </if>--> <if test = "query.status == 1"> and (vt.event_status = 1 or vt.event_status = 3) </if> @@ -103,7 +103,7 @@ <if test = "query.status == 0"> and (vt.event_status = 1 or vt.event_status = 3 or vt.event_status = 6 or vt.event_status = 6) </if> group by cardNoStr -- group by cardNoStr order by vt.id desc </select>