diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4f2564c..b15381c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -15,6 +15,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
 
 @Slf4j
 @RestController
@@ -91,4 +94,14 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime);
     }
+
+    /**
+     * 上传数据总记录数
+     */
+    @RequestMapping("/dataStatics/upLoadCountToday")
+    public Object countThirdPartyDataToday() {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return thirdPartyService.countThirdPartyDataToday(dataScope);
+    }
+
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4f2564c..b15381c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -15,6 +15,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
 
 @Slf4j
 @RestController
@@ -91,4 +94,14 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime);
     }
+
+    /**
+     * 上传数据总记录数
+     */
+    @RequestMapping("/dataStatics/upLoadCountToday")
+    public Object countThirdPartyDataToday() {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return thirdPartyService.countThirdPartyDataToday(dataScope);
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index fdf18bc..8362835 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -195,7 +195,7 @@
 
 
     <select id="selectLiquidDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataLiquid">
-        SELECT DEVCODE,
+        SELECT data_liquid.DEVCODE,
         <include refid="date_toChar">
             <property name="paramTime" value="data_liquid.LOGTIME"/>
         </include>
@@ -208,7 +208,7 @@
         CELL,
         data_liquid.WELL_CODE as "wellCode"
         FROM data_liquid
-        INNER JOIN bus_well_info on data_liquid.WELL_CODE = bus_well_info.WELL_CODE
+        INNER JOIN bus_well_info bwi on data_liquid.WELL_CODE = bwi.WELL_CODE
         INNER JOIN bus_device bd ON data_liquid.DEVCODE = bd.DEVCODE
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4f2564c..b15381c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -15,6 +15,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
 
 @Slf4j
 @RestController
@@ -91,4 +94,14 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime);
     }
+
+    /**
+     * 上传数据总记录数
+     */
+    @RequestMapping("/dataStatics/upLoadCountToday")
+    public Object countThirdPartyDataToday() {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return thirdPartyService.countThirdPartyDataToday(dataScope);
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index fdf18bc..8362835 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -195,7 +195,7 @@
 
 
     <select id="selectLiquidDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataLiquid">
-        SELECT DEVCODE,
+        SELECT data_liquid.DEVCODE,
         <include refid="date_toChar">
             <property name="paramTime" value="data_liquid.LOGTIME"/>
         </include>
@@ -208,7 +208,7 @@
         CELL,
         data_liquid.WELL_CODE as "wellCode"
         FROM data_liquid
-        INNER JOIN bus_well_info on data_liquid.WELL_CODE = bus_well_info.WELL_CODE
+        INNER JOIN bus_well_info bwi on data_liquid.WELL_CODE = bwi.WELL_CODE
         INNER JOIN bus_device bd ON data_liquid.DEVCODE = bd.DEVCODE
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index f551340..b30c136 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -135,13 +135,13 @@
         JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
-            and LOGTIME <![CDATA[ >= ]]>
+            and tn.LOGTIME <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and LOGTIME <![CDATA[ <= ]]>
+            and tn.LOGTIME <![CDATA[ <= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{endTime}"/>
             </include>

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4f2564c..b15381c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -15,6 +15,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
 
 @Slf4j
 @RestController
@@ -91,4 +94,14 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime);
     }
+
+    /**
+     * 上传数据总记录数
+     */
+    @RequestMapping("/dataStatics/upLoadCountToday")
+    public Object countThirdPartyDataToday() {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return thirdPartyService.countThirdPartyDataToday(dataScope);
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index fdf18bc..8362835 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -195,7 +195,7 @@
 
 
     <select id="selectLiquidDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataLiquid">
-        SELECT DEVCODE,
+        SELECT data_liquid.DEVCODE,
         <include refid="date_toChar">
             <property name="paramTime" value="data_liquid.LOGTIME"/>
         </include>
@@ -208,7 +208,7 @@
         CELL,
         data_liquid.WELL_CODE as "wellCode"
         FROM data_liquid
-        INNER JOIN bus_well_info on data_liquid.WELL_CODE = bus_well_info.WELL_CODE
+        INNER JOIN bus_well_info bwi on data_liquid.WELL_CODE = bwi.WELL_CODE
         INNER JOIN bus_device bd ON data_liquid.DEVCODE = bd.DEVCODE
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index f551340..b30c136 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -135,13 +135,13 @@
         JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
-            and LOGTIME <![CDATA[ >= ]]>
+            and tn.LOGTIME <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and LOGTIME <![CDATA[ <= ]]>
+            and tn.LOGTIME <![CDATA[ <= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{endTime}"/>
             </include>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java
index 74edbb4..c3e2327 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java
@@ -16,4 +16,7 @@
                                         String deptid, String endTime, String beginTime, String keyWords);
 
     ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime);
+
+    //与countThirdPartyData相同，时间默认为今天，返回查询到数据条数
+    ResponseData countThirdPartyDataToday(DataScope dataScope);
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 4f2564c..b15381c 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -15,6 +15,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Date;
 
 @Slf4j
 @RestController
@@ -91,4 +94,14 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         return thirdPartyService.countThirdPartyData(dataScope, endTime, beginTime);
     }
+
+    /**
+     * 上传数据总记录数
+     */
+    @RequestMapping("/dataStatics/upLoadCountToday")
+    public Object countThirdPartyDataToday() {
+        DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
+        return thirdPartyService.countThirdPartyDataToday(dataScope);
+    }
+
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index fdf18bc..8362835 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -195,7 +195,7 @@
 
 
     <select id="selectLiquidDataScope" resultType="com.casic.missiles.modular.system.dto.statistic.DataLiquid">
-        SELECT DEVCODE,
+        SELECT data_liquid.DEVCODE,
         <include refid="date_toChar">
             <property name="paramTime" value="data_liquid.LOGTIME"/>
         </include>
@@ -208,7 +208,7 @@
         CELL,
         data_liquid.WELL_CODE as "wellCode"
         FROM data_liquid
-        INNER JOIN bus_well_info on data_liquid.WELL_CODE = bus_well_info.WELL_CODE
+        INNER JOIN bus_well_info bwi on data_liquid.WELL_CODE = bwi.WELL_CODE
         INNER JOIN bus_device bd ON data_liquid.DEVCODE = bd.DEVCODE
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index f551340..b30c136 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -135,13 +135,13 @@
         JOIN  bus_well_info   bwi ON    bwi.WELL_CODE=tn.WELL_CODE
         WHERE 1=1
         <if test="beginTime != null and beginTime != '' ">
-            and LOGTIME <![CDATA[ >= ]]>
+            and tn.LOGTIME <![CDATA[ >= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{beginTime}"/>
             </include>
         </if>
         <if test="endTime != null and endTime != ''">
-            and LOGTIME <![CDATA[ <= ]]>
+            and tn.LOGTIME <![CDATA[ <= ]]>
             <include refid="char_toDate">
                 <property name="paramStr" value="#{endTime}"/>
             </include>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java
index 74edbb4..c3e2327 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/ThirdPartyDataService.java
@@ -16,4 +16,7 @@
                                         String deptid, String endTime, String beginTime, String keyWords);
 
     ResponseData countThirdPartyData(DataScope dataScope,String endTime,String beginTime);
+
+    //与countThirdPartyData相同，时间默认为今天，返回查询到数据条数
+    ResponseData countThirdPartyDataToday(DataScope dataScope);
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
index f45c9f7..6980ad4 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
@@ -14,10 +14,8 @@
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 @Slf4j
 @Service
@@ -95,6 +93,35 @@
         return responseData;
     }
 
+    /**
+     * （1）权限查询,查出所属部门的权限
+     * （2）根据权限范围，遍利表,时间限制为今天
+     * （3）封装结果
+     *
+     * @return int 数据条数
+     */
+    public ResponseData countThirdPartyDataToday(DataScope dataScope) {
+        ResponseData responseData = new ResponseData();
+        Date date = new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+        String today = formatter.format(date);
+        String beginTime = today + " 00:00:00";
+        String endTime = today + " 23:59:59";
+        try {
+            Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
+            String deviceTypes = thirdPartyMapper.getDeviceType(deptId);    //设备类型
+            List<Map<String, String>> result = countThirdRecord(dataScope, deviceTypes, beginTime, endTime);
+            responseData.setData(result.size());
+            responseData.setMessage("查询成功");
+            responseData.setCode(200);
+        } catch (DataAccessException dex) {
+            log.error("主题：查询燃气探测仪设备数据出现数据异常,开始时间：{},结束时间{},异常信息{}", beginTime, endTime, dex);
+            responseData.setMessage("查询异常");
+            responseData.setCode(500);
+        }
+        return responseData;
+    }
+
     private List<Map<String, String>> countThirdRecord(DataScope dataScope, String deviceTypes, String beginTime, String endTime) {
         List<Map<String, String>> countRecordList = new ArrayList<>();
         HashMap<String, String> countRecords = null;