Quellcode durchsuchen

待办任务,队列数

shiyue vor 2 Wochen
Ursprung
Commit
4e6bc1afc7

+ 5 - 5
energy-manage-service/src/main/java/com/energy/manage/service/domain/vo/excel/WindEngineGroupExcelVo.java

@@ -48,25 +48,25 @@ public class WindEngineGroupExcelVo {
     @ExcelProperty(value = "经度", index = 5)
     private String longitude;
     /**
-     * 
+     * 
      */
-    @ExcelProperty(value = "度", index = 6)
+    @ExcelProperty(value = "度", index = 6)
     private String latitude;
 
     /**
      * 额定风速 (m/s)
      */
-    @ExcelProperty(value = "维度", index = 7)
+    @ExcelProperty(value = "额定风速", index = 7)
     private Double rated_wind_speed;
     /**
      * 切入风速 (m/s)
      */
-    @ExcelProperty(value = "维度", index = 8)
+    @ExcelProperty(value = "切入风速", index = 8)
     private Double ratedCutInWindspeed;
     /**
      * 切出风速 (m/s)
      */
-    @ExcelProperty(value = "维度", index = 9)
+    @ExcelProperty(value = "切出风速", index = 9)
     private Double ratedCutOutWindspeed;
     /**
      * 是否标杆风机

+ 2 - 2
energy-manage-service/src/main/resources/mybatis/system/OrganizationAuthMapper.xml

@@ -131,13 +131,13 @@
             wfba.analysis_state as analysisState
             from
             sys_organization_auth soa
-            inner join
+            left join
             (select
             field_code,
             count(1) as groupCount
             from
             wind_engine_group where del_state = 0 group by field_code) weg on soa.code_number = weg.field_code
-            inner join
+            left join
             (select
                 id,
                 batch_code,