'优化基础信息管理-举报信息管理和基础信息管理-消防车辆管理2个导出接口'

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

@@ -207,7 +207,12 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
                 demEnforceReportComplaintVO.setFactFind(factFindName);
                 for(int j=0;j<list2.size();j++){
                     if(list1.get(i).getReportId().equals(list2.get(j).getReportId())){
-                        demEnforceReportComplaintVO.setCompleteTime((list2.get(i).getCompleteTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        if((list2.get(i).getCompleteTime()) != null){
+                            demEnforceReportComplaintVO.setCompleteTime((list2.get(i).getCompleteTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        }else{
+                            demEnforceReportComplaintVO.setCompleteTime(null);
+                        }
+
                         String followUpStatusName = null;
                         if (list2.get(i).getFollowUpStatus() == 0) {
                             followUpStatusName = "未回访";

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

@@ -92,7 +92,7 @@ public class DemVehicleServiceImpl extends AbstractCrudService<DemVehicleMapper,
         List<DemVehicle> list1= this.list(queryWrapper);
         for (int i = 0; i < list1.size(); i++) {
             DemVehicleExportVO demVehicleExportVO = new DemVehicleExportVO();
-            demVehicleExportVO.setVehicleAbbreviat(list1.get(i).getVehicleAbbreviat());
+            demVehicleExportVO.setVehicleAbbreviat((list1.get(i).getVehicleAbbreviat()).trim());
             demVehicleExportVO.setRadioChannel(list1.get(i).getRadioChannel());
             demVehicleExportVO.setRadioCallSign(list1.get(i).getRadioCallSign());
             demVehicleExportVO.setFireOrga(list1.get(i).getFireOrga());