年月fix

songhuangfeng123

2022-08-08 bb8b200d53171dcc0727c845c435f655b3d2f55a

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillExecuteServiceImpl.java

@@ -249,17 +249,18 @@
        EmergencyDrillExecuteRPCDBQuery dbQuery = new EmergencyDrillExecuteRPCDBQuery();
        dbQuery.setLevel(query.getLevel());
        // 根据时间、级别获取统计
        Calendar calendar = Calendar.getInstance();
        int year = calendar.get(Calendar.YEAR);

        if (query.getType()==1){
            // 月
            int month = calendar.get(Calendar.MONTH);
            int year = query.getYear();
            int month = query.getMonth();
            dbQuery.setStartTime(TimeUtils.getMonthFirst(year,month));
            dbQuery.setEndTime(TimeUtils.getMonthLast(year,month));
            list = emergencyDrillExecuteInfoService.selectByMouthTimeAndType(dbQuery);
        }
        if (query.getType()==2){
            // 年
            int year = query.getYear();
            dbQuery.setStartTime(TimeUtils.getYearFirst(year));
            dbQuery.setEndTime(TimeUtils.getYearLast(year));
            list = emergencyDrillExecuteInfoService.selectByYearTimeAndType(dbQuery);