From d0b61dbc31837d727223005fc5bd67eae472d79d Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Sat, 27 May 2023 19:28:31 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/environment/entity/DustNoiseData.java  | 14 +++++++-------
 .../service/impl/DustNoiseDataServiceImpl.java     |  9 ++++-----
 .../modules/worker/mapper/xml/WorkerInfoMapper.xml |  1 +
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/entity/DustNoiseData.java b/src/main/java/com/zhgd/xmgl/modules/environment/entity/DustNoiseData.java
index 598e2e7b8..a4dbaf165 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/entity/DustNoiseData.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/entity/DustNoiseData.java
@@ -56,43 +56,43 @@ public class DustNoiseData implements Serializable {
     /**
      * 扬尘
      */
-    @Excel(name = "扬尘", width = 15)
+    @Excel(name = "PM10(ug/m3)", width = 15)
     @ApiModelProperty(value = "扬尘")
     private java.lang.Float pm10;
     /**
      * pm25
      */
-    @Excel(name = "pm25", width = 15)
+    @Excel(name = "PM2.5(ug/m3)", width = 15)
     @ApiModelProperty(value = "pm25")
     private java.lang.Float pm25;
     /**
      * 噪音
      */
-    @Excel(name = "噪音", width = 15)
+    @Excel(name = "噪音(dB)", width = 15)
     @ApiModelProperty(value = "噪音")
     private java.lang.Float noise;
     /**
      * tsp测试值
      */
-    @Excel(name = "tsp测试值", width = 15)
+    @Excel(name = "TSP(ug/m3)", width = 15)
     @ApiModelProperty(value = "tsp测试值")
     private java.lang.Float tsp;
     /**
      * 温度
      */
-    @Excel(name = "温度", width = 15)
+    @Excel(name = "温度(℃)", width = 15)
     @ApiModelProperty(value = "温度")
     private java.lang.Float temperature;
     /**
      * 湿度
      */
-    @Excel(name = "湿度", width = 15)
+    @Excel(name = "湿度(%RH)", width = 15)
     @ApiModelProperty(value = "湿度")
     private java.lang.Float humidity;
     /**
      * 风速
      */
-    @Excel(name = "风速", width = 15)
+    @Excel(name = "风速(m/s)", width = 15)
     @ApiModelProperty(value = "风速")
     private java.lang.Float windspeed;
     /**
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
index c356cb381..c7ea98dc1 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
@@ -25,10 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description: 扬尘噪声实时数据
@@ -64,7 +61,9 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
         } else {
             map.put("searchType", 2);
         }
-        return dustNoiseDataMapper.selectDustNoiseData(map);
+        List<DustNoiseData> dustNoiseDataList = dustNoiseDataMapper.selectDustNoiseData(map);
+        Collections.reverse(dustNoiseDataList);
+        return dustNoiseDataList;
     }
 
     @Override
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
index d0e67d45d..033973eed 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoMapper.xml
@@ -524,6 +524,7 @@
         INNER JOIN company b ON cp.parent_id = b.company_id
         INNER JOIN enterprise_info p ON p.id = w1.enterprise_id
         Left JOIN company f ON b.parent_id = f.company_id
+        INNER JOIN project_enterprise pe ON pe.enterprise_id = p.id and a.project_sn=pe.project_sn
         WHERE w1.inService_type = 1
         <if test="projectName != null and projectName != ''">
             and a.project_name like CONCAT(CONCAT('%', #{projectName}), '%')