消防主题报告优化代码优化代码

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReportIndexResultServiceImpl.java

@@ -86,6 +86,8 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
     @Autowired
     private DemReportInfoService demReportInfoService;
 
+    private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
     @Override
     public void reportIndexResult(String companyId) {
         List<BaseCompany> baseCompanies = new ArrayList<>();
@@ -149,7 +151,7 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
                     document.addAuthor("mhzd");// 作者
                     DemReportDataVo demReportDataVo = new DemReportDataVo();
                     demReportDataVo.setCompanyName(baseCompanies.get(i).getCompanyName());
-                    demReportDataVo.setLastMonthEndTime(lastYearLastDateTime.toString());
+                    demReportDataVo.setLastMonthEndTime(lastYearLastDateTime.format(formatter));
                     ReportResult reportResult = new ReportResult();
                     reportResult.setObjectId(baseCompanies.get(i).getId());
                     reportResult.setReportObject(baseCompanies.get(i).getCompanyName());
@@ -326,7 +328,7 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
                     Calendar lastYearFirstDateCal3 = Calendar.getInstance();
                     lastYearFirstDateCal3.add(Calendar.YEAR, -1);
                     String lastYearFirstTime3 = format.format(lastYearFirstDateCal3.getTime());
-                    demReportDataVo.setLastMonthFirstTime(lastYearFirstDateTime.toString());
+                    demReportDataVo.setLastMonthFirstTime(lastYearFirstDateTime.format(formatter));
                     LambdaQueryWrapper<DemLawSituation> queryWrapper11 = Wrappers.lambdaQuery();
                     queryWrapper11.select(DemLawSituation::getId)
                             .like(DemLawSituation::getPunishedPerson, baseCompanies.get(i).getCompanyName())