Merge branch 'dev' of https://git.njzscloud.com/lzq/njzscloud into dev

njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/mapper/SupervisionStatisticsMapper.java

@@ -64,4 +64,9 @@ public interface SupervisionStatisticsMapper {
 
     @SuppressWarnings("MybatisXMapperMethodInspection")
     List<Map<String, Object>> dataTable();
+
+    Integer getTotalCarCount();
+
+    @SuppressWarnings("MybatisXMapperMethodInspection")
+    List<Map<String, Object>> getKehuList();
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/bs/service/SupervisionStatisticsService.java

@@ -47,11 +47,13 @@ public class SupervisionStatisticsService {
 
         CarSummary carSummary = supervisionStatisticsMapper.getCarSummary();
         Integer todayCarCount = supervisionStatisticsMapper.getTodayCarCount();
+        Integer totalCarCount = supervisionStatisticsMapper.getTotalCarCount();
         List<RegionSummary> regionSummary = supervisionStatisticsMapper.getRegionSummary();
         List<CompanySummary> companySummary = supervisionStatisticsMapper.getCompanySummary();
         List<StationInfo> stationInfo = supervisionStatisticsMapper.getStationInfo();
         List<Order> orders = supervisionStatisticsMapper.getOrders();
         List<Project> projects = supervisionStatisticsMapper.getProjects();
+        List<Map<String, Object>> kehu = supervisionStatisticsMapper.getKehuList();
 
         return MapUtil.<String, Object>builder()
                 .put("dispatchSummary", dispatchSummary == null ? new DispatchSummary() : dispatchSummary)
@@ -59,11 +61,13 @@ public class SupervisionStatisticsService {
                 .put("disposeTotalWeight", disposeTotalWeight == null ? 0 : disposeTotalWeight)
                 .put("carSummary", carSummary == null ? new CarSummary() : carSummary)
                 .put("todayCarCount", todayCarCount == null ? 0 : todayCarCount)
+                .put("totalCarCount", totalCarCount == null ? 0 : totalCarCount)
                 .put("regionSummary", regionSummary == null ? new ArrayList<>() : regionSummary)
                 .put("companySummary", companySummary == null ? new ArrayList<>() : companySummary)
                 .put("stationInfo", stationInfo == null ? new ArrayList<>() : stationInfo)
                 .put("orders", orders == null ? new ArrayList<>() : orders)
                 .put("projects", projects == null ? new ArrayList<>() : projects)
+                .put("kehu", kehu == null ? new ArrayList<>() : kehu)
                 .build();
     }
 

njzscloud-svr/src/main/resources/mapper/bs/SupervisionStatisticsMapper.xml

@@ -52,11 +52,18 @@
     <select id="getTodayCarCount" resultType="java.lang.Integer">
         SELECT COUNT(*) car_count
         FROM order_info a
-        WHERE a.create_time >= UNIX_TIMESTAMP(CURDATE())
+        WHERE UNIX_TIMESTAMP(a.create_time) >= UNIX_TIMESTAMP(CURDATE())
-          AND a.create_time <![CDATA[ < ]]> UNIX_TIMESTAMP(DATE_ADD(CURDATE(), INTERVAL 24 HOUR))
+          AND UNIX_TIMESTAMP(a.create_time) <![CDATA[ < ]]> UNIX_TIMESTAMP(DATE_ADD(CURDATE(), INTERVAL 24 HOUR))
           AND a.order_status = 'YiWanCheng'
     </select>
 
+    <select id="getTotalCarCount" resultType="java.lang.Integer">
+        SELECT COUNT(*)
+        FROM biz_truck
+        WHERE audit_status = 'TongGuo'
+          AND deleted = 0
+    </select>
+
     <select id="getRegionSummary" resultType="com.njzscloud.supervisory.bs.pojo.result.RegionSummary">
         SELECT b.area,
                IFNULL(SUM(c.settle_weight), 0) total_weight
@@ -411,4 +418,27 @@
                 AND create_time >= CURDATE()
                 AND create_time <![CDATA[ < ]]> DATE_ADD(CURDATE(), INTERVAL 1 DAY)) t
     </select>
+    <select id="getKehuList" resultType="java.util.Map">
+        SELECT a.biz_obj                      bizObj,
+               CASE a.biz_obj
+                   WHEN 'GeRen' THEN '个人'
+                   WHEN 'WuYe' THEN '物业'
+                   WHEN 'ShiGongDanWei' THEN '施工单位'
+                   WHEN 'ChaiQian' THEN '拆迁公司'
+                   WHEN 'SheQu' THEN '社区/村/街道'
+                   ELSE ''
+                   END                        bizObjTxt,
+               b.company_name                 companyName,
+               IFNULL(b.contacts, a.nickname) contacts,
+               IFNULL(b.phone, a.phone)       phone,
+               b.province_name                provinceName,
+               b.city_name                    cityName,
+               b.area_name                    areaName,
+               b.address,
+               b.uscc
+        FROM sys_user a
+                 LEFT JOIN biz_company b ON b.user_id = a.id AND b.audit_status = 'TongGuo' AND b.deleted = 0
+        WHERE a.biz_obj IN ('WuYe', 'ShiGongDanWei', 'ChaiQian', 'SheQu')
+          AND a.deleted = 0
+    </select>
 </mapper>