运营月/季报问题处理

sonin
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
--- a/sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
查看文件 @ab98a7f
+++ b/sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
查看文件 @ab98a7f
@@ -207,8 +207,9 @@ public class OperationReportServiceImpl implements  IOperationReportService {
        QueryWrapper<?> queryWrapper2 = new QueryWrapper<>();
        queryWrapper2.eq("inspection_type", "1")
                .eq("status", "2")
-                .ge("end_date", startDate + BusinessConstant.startTimeSuffix)
+                .ge("report_date", startDate + BusinessConstant.startTimeSuffix)
-                .le("end_date", endDate + BusinessConstant.endTimeSuffix);
+                .le("report_date", endDate + BusinessConstant.endTimeSuffix)
+                .orderByDesc("report_date");
        List<Map<String, Object>> queryMapList2 = baseService.queryForList("select * from danger_inspection_record", queryWrapper2);
        Map<String, String> recordId2CountMap;
        if (!queryMapList2.isEmpty()) {