报表

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -91,7 +91,8 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
 
     @Override
     public List<MonitoringAccessVO> selectAll(MonitoringAccessDTO monitoringAccessDTO) {
-
+        monitoringAccessDTO.setStartDate(monitoringAccessDTO.getStartDate()+" 00:00:00");
+        monitoringAccessDTO.setEndDate(monitoringAccessDTO.getEndDate()+" 23:59:59");
         if (null == monitoringAccessDTO.getOrgId()) {
             monitoringAccessDTO.setOrgId(SecurityUtils.getLoginUser().getOrgId());
         }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/retrieval/service/impl/CoreMonitoringRetrievalTaskServiceImpl.java

@@ -65,6 +65,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.time.*;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -95,6 +97,10 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
 
     @Override
     public TableDataInfo selectPage(RetrievalTaskPageDto request) {
+        CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO=new CoreMonitoringTaskRegistrationDTO();
+        coreMonitoringTaskRegistrationDTO.setMoth("2023-11");
+        coreMonitoringTaskRegistrationDTO.setOrgId(1703700546288824647L);
+        selectListApp(coreMonitoringTaskRegistrationDTO);
         Page<CoreMonitoringRetrievalTaskVo> page;
         //分页
         if (request.getPageNum() != null && request.getPageSize() != null) {
@@ -145,7 +151,21 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         EasyExcel.write(response.getOutputStream(), CoreMonitoringRetrievalTaskExcelVo.class).sheet("Sheet1").doWrite(list);
 
     }
+    public static String getLastDay(int year,int month,String format) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.YEAR, year);
+        calendar.set(Calendar.MONTH, month);
 
+        calendar.set(Calendar.DAY_OF_MONTH, 1);
+
+        calendar.add(Calendar.DAY_OF_MONTH, -1);
+        Date endDate = calendar.getTime();
+
+        SimpleDateFormat sdf = new SimpleDateFormat(format);
+        String formattedEndDate = sdf.format(endDate);
+
+        return formattedEndDate;
+    }
     @Override
     public TableDataInfo selectListApp(CoreMonitoringTaskRegistrationDTO coreMonitoringTaskRegistrationDTO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -153,6 +173,10 @@ public class CoreMonitoringRetrievalTaskServiceImpl extends ServiceImpl<CoreMoni
         if (null == coreMonitoringTaskRegistrationDTO.getOrgId()) {
             coreMonitoringTaskRegistrationDTO.setOrgId(loginUser.getOrgId());
         }
+        coreMonitoringTaskRegistrationDTO.setPlanStartTime( DateUtils.parseDate(coreMonitoringTaskRegistrationDTO.getMoth()+"-01"));
+        String[] split = coreMonitoringTaskRegistrationDTO.getMoth().split("-");
+        String lastDay = getLastDay(Integer.parseInt(split[0]), Integer.parseInt(split[1]), "yyyy-MM-dd");
+        coreMonitoringTaskRegistrationDTO.setPlanEndTime(DateUtils.parseDate(lastDay));
         Page<AppCoreMonitoringRetrievalTaskVO> coreMonitoringRetrievalTaskPage = baseMapper.selectListApp(coreMonitoringTaskRegistrationDTO.getPageRequest(), coreMonitoringTaskRegistrationDTO);
         return TableDataInfo.build(coreMonitoringRetrievalTaskPage);
     }

soc-modules/soc-modules-core/src/main/resources/mapper/retrieval/CoreMonitoringRetrievalTaskMapper.xml

@@ -156,7 +156,10 @@
             and a.status =#{request.status}
         </if>
         <if test="request.moth !=null">
-            and a.ymd_date like concat('%', #{request.moth}, '%')
+
+            AND #{request.planStartTime} BETWEEN a.plan_start_time
+            AND a.plan_end_time
+            OR #{request.planEndTime} BETWEEN a.plan_start_time 	AND a.plan_end_time
         </if>
         AND a.role_id IN (SELECT role_id FROM sys_user_role WHERE user_id=#{request.retrievalUser})
         GROUP BY