diff --git a/os-ems/src/main/java/com/os/ems/report/controller/EmsReportController.java b/os-ems/src/main/java/com/os/ems/report/controller/EmsReportController.java
index 9ae33b2..802a5f3 100644
--- a/os-ems/src/main/java/com/os/ems/report/controller/EmsReportController.java
+++ b/os-ems/src/main/java/com/os/ems/report/controller/EmsReportController.java
@@ -19,7 +19,7 @@ import java.util.Map;
 
 
 /**
- * import java.util.List;Controller
+ * 能源报表Controller
  *
  * @author Yinq
  * @date 2024-05-22
@@ -75,4 +75,17 @@ public class EmsReportController extends BaseController {
         util.exportExcel(response, list, "峰平谷耗量报表" );
     }
 
+    /**
+     * 能源预览接口
+     * @param hashMap
+     * @return
+     */
+    @GetMapping("/energyPreviewReportList")
+    @ResponseBody
+    public AjaxResult energyPreviewReportList(@RequestParam(required = false) Map hashMap) {
+        List<Map<String, Object>> list = emsReportService.energyPreviewReportList(hashMap);
+        return success(list);
+    }
+
+
 }
diff --git a/os-ems/src/main/java/com/os/ems/report/mapper/EmsReportMapper.java b/os-ems/src/main/java/com/os/ems/report/mapper/EmsReportMapper.java
index 448ee2c..7c87f69 100644
--- a/os-ems/src/main/java/com/os/ems/report/mapper/EmsReportMapper.java
+++ b/os-ems/src/main/java/com/os/ems/report/mapper/EmsReportMapper.java
@@ -17,11 +17,11 @@ public interface EmsReportMapper
 {
 
     /**
-     * 统计能耗报表
+     * 统计能耗电报表
      * @param hashMap
      * @return
      */
-    List<EnergyStatisticalReport> energyStatisticalReportList(Map hashMap);
+    List<EnergyStatisticalReport> energyStatisticalDnbReportList(Map hashMap);
 
     /**
      * 峰平谷耗量报表
diff --git a/os-ems/src/main/java/com/os/ems/report/service/IEmsReportService.java b/os-ems/src/main/java/com/os/ems/report/service/IEmsReportService.java
index 95bb856..ad091d0 100644
--- a/os-ems/src/main/java/com/os/ems/report/service/IEmsReportService.java
+++ b/os-ems/src/main/java/com/os/ems/report/service/IEmsReportService.java
@@ -28,4 +28,11 @@ public interface IEmsReportService {
      * @return
      */
     List<PeaksValleysConsumptionReport> peaksValleysConsumptionReportList(Map hashMap);
+
+    /**
+     * 能源预览接口
+     * @param hashMap
+     * @return
+     */
+    List<Map<String, Object>> energyPreviewReportList(Map hashMap);
 }
diff --git a/os-ems/src/main/java/com/os/ems/report/service/impl/EmsReportServiceImpl.java b/os-ems/src/main/java/com/os/ems/report/service/impl/EmsReportServiceImpl.java
index 7f33b1f..2835032 100644
--- a/os-ems/src/main/java/com/os/ems/report/service/impl/EmsReportServiceImpl.java
+++ b/os-ems/src/main/java/com/os/ems/report/service/impl/EmsReportServiceImpl.java
@@ -1,5 +1,10 @@
 package com.os.ems.report.service.impl;
 
+import com.os.common.utils.StringUtils;
+import com.os.ems.base.domain.EmsBaseMonitorWorkUnit;
+import com.os.ems.base.domain.EmsBaseWorkUnit;
+import com.os.ems.base.mapper.EmsBaseMonitorWorkUnitMapper;
+import com.os.ems.base.mapper.EmsBaseWorkUnitMapper;
 import com.os.ems.report.domain.EnergyStatisticalReport;
 import com.os.ems.report.domain.PeaksValleysConsumptionReport;
 import com.os.ems.report.mapper.EmsReportMapper;
@@ -7,8 +12,9 @@ import com.os.ems.report.service.IEmsReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -22,28 +28,84 @@ public class EmsReportServiceImpl implements IEmsReportService {
     @Autowired
     private EmsReportMapper emsReportMapper;
 
+    @Autowired
+    private EmsBaseMonitorWorkUnitMapper emsBaseMonitorWorkUnitMapper;
+
+    @Autowired
+    private EmsBaseWorkUnitMapper emsBaseWorkUnitMapper;
+
 
     /**
      * 统计能耗报表
+     *
      * @param hashMap
      * @return
      */
     @Override
     public List<EnergyStatisticalReport> energyStatisticalReportList(Map hashMap) {
-        if (!hashMap.containsKey("dateType")){
+        if (!hashMap.containsKey("dateType") && !hashMap.containsKey("energyType")) {
             return null;
         }
         hashMap.put("timeSub", Integer.parseInt(String.valueOf(hashMap.get("dateType"))));
-        return emsReportMapper.energyStatisticalReportList(hashMap);
+        List<EnergyStatisticalReport> reportList = new ArrayList<>();
+
+        if (Objects.equals(String.valueOf(hashMap.get("energyType")), "2")){
+            reportList = emsReportMapper.energyStatisticalDnbReportList(hashMap);
+        }
+        return reportList;
     }
 
     /**
      * 峰平谷耗量报表
+     *
      * @param hashMap
      * @return
      */
     @Override
     public List<PeaksValleysConsumptionReport> peaksValleysConsumptionReportList(Map hashMap) {
+        if (!hashMap.containsKey("dateType")) {
+            return null;
+        }
         return emsReportMapper.peaksValleysConsumptionReportList(hashMap);
     }
+
+    /**
+     * 能源预览接口
+     *
+     * @param hashMap
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> energyPreviewReportList(Map hashMap) {
+        List<Map<String, Object>> resultList = new ArrayList<>();
+        if (!hashMap.containsKey("startTime") || !hashMap.containsKey("endTime")) {
+            return resultList;
+        }
+
+        EmsBaseWorkUnit workUnit = new EmsBaseWorkUnit();
+        List<EmsBaseWorkUnit> workUnits = emsBaseWorkUnitMapper.selectEmsBaseWorkUnitList(workUnit);
+
+        HashMap<String, String> selectMap = new HashMap<>();
+        selectMap.put("dateType", String.valueOf(hashMap.get("dateType")));
+        selectMap.put("energyType", String.valueOf(hashMap.get("energyType")));
+        selectMap.put("beginCollectTime", String.valueOf(hashMap.get("startTime")));
+        selectMap.put("endCollectTime", String.valueOf(hashMap.get("endTime")));
+
+        for (EmsBaseWorkUnit unit : workUnits) {
+            HashMap<String, Object> typeResultMap = new HashMap<>();
+            typeResultMap.put("unitName", unit.getWorkUnitName());
+            selectMap.put("workUnitCode", unit.getWorkUnitCode());
+            List<EnergyStatisticalReport> reportList = this.energyStatisticalReportList(selectMap);
+            BigDecimal expendSum = new BigDecimal(0);
+            for (EnergyStatisticalReport report : reportList) {
+                typeResultMap.put("expend" + report.getBeginTime(), report.getExpend());
+                expendSum = expendSum.add(report.getExpend());
+            }
+            typeResultMap.put("expendSum", expendSum.toPlainString());
+            resultList.add(typeResultMap);
+        }
+
+        return resultList;
+    }
+
 }
diff --git a/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorWorkUnitMapper.xml b/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorWorkUnitMapper.xml
index 05f7a5d..2ec3147 100644
--- a/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorWorkUnitMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/base/EmsBaseMonitorWorkUnitMapper.xml
@@ -59,6 +59,7 @@
             <if test="updatedBy != null  and updatedBy != ''">and ebmwu.updated_by = #{updatedBy}</if>
             <if test="updatedTime != null ">and ebmwu.updated_time = #{updatedTime}</if>
         </where>
+        order by ebwu.work_unit_type, ebmwu.work_unit_code, ebmwu.monitor_code
     </select>
 
     <select id="selectEmsBaseMonitorWorkUnitByObjId" parameterType="Long" resultMap="EmsBaseMonitorWorkUnitResult">
diff --git a/os-ems/src/main/resources/mapper/ems/base/EmsBaseWorkUnitMapper.xml b/os-ems/src/main/resources/mapper/ems/base/EmsBaseWorkUnitMapper.xml
index e1a746e..c2c4e67 100644
--- a/os-ems/src/main/resources/mapper/ems/base/EmsBaseWorkUnitMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/base/EmsBaseWorkUnitMapper.xml
@@ -1,54 +1,73 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.os.ems.base.mapper.EmsBaseWorkUnitMapper">
-    
+
     <resultMap type="EmsBaseWorkUnit" id="EmsBaseWorkUnitResult">
-        <result property="objId"    column="obj_id"    />
-        <result property="workUnitCode"    column="work_unit_code"    />
-        <result property="parentId"    column="parent_id"    />
-        <result property="workUnitName"    column="work_unit_name"    />
-        <result property="workUnitAddress"    column="work_unit_address"    />
-        <result property="ancestors"    column="ancestors"    />
-        <result property="workUnitSort"    column="work_unit_sort"    />
-        <result property="productLineCode"    column="product_line_code"    />
-        <result property="workUnitType"    column="work_unit_type"    />
-        <result property="isFlag"    column="is_flag"    />
-        <result property="createdBy"    column="created_by"    />
-        <result property="createdTime"    column="created_time"    />
-        <result property="updatedBy"    column="updated_by"    />
-        <result property="updatedTime"    column="updated_time"    />
+        <result property="objId" column="obj_id"/>
+        <result property="workUnitCode" column="work_unit_code"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="workUnitName" column="work_unit_name"/>
+        <result property="workUnitAddress" column="work_unit_address"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="workUnitSort" column="work_unit_sort"/>
+        <result property="productLineCode" column="product_line_code"/>
+        <result property="workUnitType" column="work_unit_type"/>
+        <result property="isFlag" column="is_flag"/>
+        <result property="createdBy" column="created_by"/>
+        <result property="createdTime" column="created_time"/>
+        <result property="updatedBy" column="updated_by"/>
+        <result property="updatedTime" column="updated_time"/>
     </resultMap>
 
     <sql id="selectEmsBaseWorkUnitVo">
-        select obj_id, work_unit_code, parent_id, work_unit_name, work_unit_address, ancestors, work_unit_sort, product_line_code, work_unit_type, is_flag, created_by, created_time, updated_by, updated_time from ems_base_work_unit
+        select obj_id,
+               work_unit_code,
+               parent_id,
+               work_unit_name,
+               work_unit_address,
+               ancestors,
+               work_unit_sort,
+               product_line_code,
+               work_unit_type,
+               is_flag,
+               created_by,
+               created_time,
+               updated_by,
+               updated_time
+        from ems_base_work_unit
     </sql>
 
     <select id="selectEmsBaseWorkUnitList" parameterType="EmsBaseWorkUnit" resultMap="EmsBaseWorkUnitResult">
         <include refid="selectEmsBaseWorkUnitVo"/>
-        <where>  
-            <if test="workUnitCode != null  and workUnitCode != ''"> and work_unit_code = #{workUnitCode}</if>
-            <if test="parentId != null "> and parent_id = #{parentId}</if>
-            <if test="workUnitName != null  and workUnitName != ''"> and work_unit_name like concat('%', #{workUnitName}, '%')</if>
-            <if test="workUnitAddress != null  and workUnitAddress != ''"> and work_unit_address = #{workUnitAddress}</if>
-            <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
-            <if test="workUnitSort != null "> and work_unit_sort = #{workUnitSort}</if>
-            <if test="productLineCode != null  and productLineCode != ''"> and product_line_code = #{productLineCode}</if>
-            <if test="workUnitType != null "> and work_unit_type = #{workUnitType}</if>
-            <if test="isFlag != null  and isFlag != ''"> and is_flag = #{isFlag}</if>
-            <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
-            <if test="createdTime != null "> and created_time = #{createdTime}</if>
-            <if test="updatedBy != null  and updatedBy != ''"> and updated_by = #{updatedBy}</if>
-            <if test="updatedTime != null "> and updated_time = #{updatedTime}</if>
+        <where>
+            <if test="workUnitCode != null  and workUnitCode != ''">and work_unit_code = #{workUnitCode}</if>
+            <if test="parentId != null ">and parent_id = #{parentId}</if>
+            <if test="workUnitName != null  and workUnitName != ''">and work_unit_name like concat('%', #{workUnitName},
+                '%')
+            </if>
+            <if test="workUnitAddress != null  and workUnitAddress != ''">and work_unit_address = #{workUnitAddress}
+            </if>
+            <if test="ancestors != null  and ancestors != ''">and ancestors = #{ancestors}</if>
+            <if test="workUnitSort != null ">and work_unit_sort = #{workUnitSort}</if>
+            <if test="productLineCode != null  and productLineCode != ''">and product_line_code = #{productLineCode}
+            </if>
+            <if test="workUnitType != null ">and work_unit_type = #{workUnitType}</if>
+            <if test="isFlag != null  and isFlag != ''">and is_flag = #{isFlag}</if>
+            <if test="createdBy != null  and createdBy != ''">and created_by = #{createdBy}</if>
+            <if test="createdTime != null ">and created_time = #{createdTime}</if>
+            <if test="updatedBy != null  and updatedBy != ''">and updated_by = #{updatedBy}</if>
+            <if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
         </where>
+        order by work_unit_type, work_unit_code
     </select>
-    
+
     <select id="selectEmsBaseWorkUnitByObjId" parameterType="Long" resultMap="EmsBaseWorkUnitResult">
         <include refid="selectEmsBaseWorkUnitVo"/>
         where obj_id = #{objId}
     </select>
-        
+
     <insert id="insertEmsBaseWorkUnit" parameterType="EmsBaseWorkUnit" useGeneratedKeys="true" keyProperty="objId">
         insert into ems_base_work_unit
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -65,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">created_time,</if>
             <if test="updatedBy != null">updated_by,</if>
             <if test="updatedTime != null">updated_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="workUnitCode != null and workUnitCode != ''">#{workUnitCode},</if>
             <if test="parentId != null">#{parentId},</if>
@@ -80,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdTime != null">#{createdTime},</if>
             <if test="updatedBy != null">#{updatedBy},</if>
             <if test="updatedTime != null">#{updatedTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmsBaseWorkUnit" parameterType="EmsBaseWorkUnit">
@@ -104,11 +123,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteEmsBaseWorkUnitByObjId" parameterType="Long">
-        delete from ems_base_work_unit where obj_id = #{objId}
+        delete
+        from ems_base_work_unit
+        where obj_id = #{objId}
     </delete>
 
     <delete id="deleteEmsBaseWorkUnitByObjIds" parameterType="String">
-        delete from ems_base_work_unit where obj_id in 
+        delete from ems_base_work_unit where obj_id in
         <foreach item="objId" collection="array" open="(" separator="," close=")">
             #{objId}
         </foreach>
diff --git a/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml b/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml
index 2bba69b..639ebec 100644
--- a/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml
+++ b/os-ems/src/main/resources/mapper/ems/report/EmsReportMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.os.ems.report.mapper.EmsReportMapper">
 
 
-    <select id="energyStatisticalReportList" resultType="com.os.ems.report.domain.EnergyStatisticalReport"
+    <select id="energyStatisticalDnbReportList" resultType="com.os.ems.report.domain.EnergyStatisticalReport"
             parameterType="java.util.HashMap">
         WITH DT AS (SELECT CAST(#{timeSub} AS INT) TIMESUB)
         SELECT WU.WORK_UNIT_CODE                                                       workUnitCode,
@@ -20,7 +20,7 @@
         CROSS JOIN DT
         WHERE RPD.EXPEND IS NOT NULL
         <if test="beginCollectTime != null and beginCollectTime != '' and endCollectTime != null and endCollectTime != ''">
-            and FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd') between  #{beginCollectTime} and #{endCollectTime}
+            and FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss') between  #{beginCollectTime} and #{endCollectTime}
         </if>
         <if test="workUnitCode != null  and workUnitCode != ''">and WU.WORK_UNIT_CODE = #{workUnitCode}</if>
         GROUP BY WU.WORK_UNIT_CODE, WU.WORK_UNIT_NAME, SUBSTRING(FORMAT(RPD.BEGIN_TIME, 'yyyy-MM-dd HH:mm:ss'), 1, DT.TIMESUB)
@@ -34,7 +34,9 @@
                sum(expend * dnb_price)     price
         FROM (
         SELECT erpd.monitor_code,
-        CONVERT(VARCHAR(10), erpd.begin_time, 120) pointTime,
+        <if test="dateType == 10">CONVERT(VARCHAR(10), erpd.begin_time, 120) pointTime,</if>
+        <if test="dateType == 7">CONVERT(VARCHAR(7), erpd.begin_time, 120) pointTime,</if>
+        <if test="dateType == 4">CONVERT(VARCHAR(4), erpd.begin_time, 120) pointTime,</if>
         NULLIF(erpd.expend, 0)                     expend,
         case
         when ebsp.price_type = 0 then '尖峰'