更新文件 WechatScanLoginMapper.xml

src/main/resources/mapper/template/WechatScanLoginMapper.xml

@@ -17,6 +17,7 @@
 
     <resultMap id="Energy" type="com.template.model.tongji.EnergyTj">
         <result property="name" column="name"/>
+        <result property="meterName" column="meter_name"/>
         <result property="num" column="num"/>
     </resultMap>
 
@@ -70,39 +71,49 @@
 
     <!--每个月各水表数据统计-->
     <select id="getWaterTjByMonAndBuild" parameterType="String" resultMap="Energy">
-        select a.name,SUM(IFNULL(b.num,0)) as num from `smart_build` a left join (
-            select a.`build_id`,IFNULL(b.num,0) as num from `smart_build_meter` a left join (
-            select meter_id,IFNULL(SUM(meter_power),0) as num from `smart_meter_detail`
-            where deleted=0 and meter_type=0 and update_time like concat(#{month}, '%')
-            group by meter_id ) b on a.`meter_id`=b.`meter_id`) b on a.id=b.build_id
-        group by a.`name`
+        select e.name,d.name as meter_name,d.num from (
+              select c.name,b.build_id,a.num from (
+              select meter_id,IFNULL(SUM(meter_power),0) as num from `smart_meter_detail`
+              where deleted=0 and meter_type=0 and update_time like concat(#{month}, '%')
+              group by meter_id ) a left join `smart_build_meter` b
+                                              on a.meter_id=b.meter_id
+                                    left join `smart_meter` c on a.meter_id=c.id
+              where b.meter_type=0 and c.meter_type=0 and b.`deleted`=0 and c.`deleted`=0 ) d
+              left join `smart_build` e on d.build_id=e.id
+        where e.deleted=0
     </select>
 
     <!--每个月各电表数据统计-->
     <select id="getElcTjByMonAndBuild" parameterType="String" resultMap="Energy">
-        select a.name,SUM(IFNULL(b.num,0)) as num from `smart_build` a left join (
-            select a.`build_id`,IFNULL(b.num,0) as num from `smart_build_meter` a left join (
-                select meter_id,IFNULL(SUM(meter_power),0) as num from `smart_meter_detail`
-                where deleted=0 and meter_type=1 and update_time like concat(#{month}, '%')
-                group by meter_id ) b on a.`meter_id`=b.`meter_id`) b on a.id=b.build_id
-        group by a.`name`
+        select e.name,d.name as meter_name,d.num from (
+          select c.name,b.build_id,a.num from (
+          select meter_id,IFNULL(SUM(meter_power),0) as num from `smart_meter_detail`
+          where deleted=0 and meter_type=1 and update_time like concat(#{month}, '%')
+          group by meter_id ) a left join `smart_build_meter` b
+                                          on a.meter_id=b.meter_id
+                                left join `smart_meter` c on a.meter_id=c.id
+          where b.meter_type=1 and c.meter_type=1 and b.`deleted`=0 and c.`deleted`=0 ) d
+          left join `smart_build` e on d.build_id=e.id
+        where e.deleted=0
     </select>
 
     <!--每个月每个楼栋查询-->
     <select id="getTjByMon" parameterType="String" resultMap="MonthT">
-        select * from `month_meter_detail` where `name`=#{name} and `date`=#{month} and `type`=#{type}
+        select * from `month_meter_detail` where `name`=#{name} and `meter_name`=#{meterName} and `date`=#{month} and `type`=#{type}
     </select>
 
     <insert id="insertMonthMeter" parameterType="com.template.model.tongji.EnergyTj" useGeneratedKeys="true">
         INSERT INTO `month_meter_detail`
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">`name`,</if>
+            <if test="meterName != null">`meter_name`,</if>
             <if test="type != null">`type`,</if>
             <if test="date != null">`date`,</if>
             <if test="num != null">`num`,</if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
+            <if test="meterName != null">#{meterName},</if>
             <if test="type != null">#{type},</if>
             <if test="date != null">#{date},</if>
             <if test="num != null">#{num},</if>
@@ -121,38 +132,48 @@
 
     <!--每天各水表数据统计-->
     <select id="getWaterTjByDayAndBuild" parameterType="String" resultMap="Energy">
-        select a.name,SUM(IFNULL(b.num,0)) as num from `smart_build` a left join (
-            select a.`build_id`,IFNULL(b.num,0) as num from `smart_build_meter` a left join (
-                select meter_id,IFNULL(SUM(meter_power),0) as num from `smart_meter_detail`
-                where deleted=0 and meter_type=0 and update_time like concat(#{day}, '%')
-                group by meter_id ) b on a.`meter_id`=b.`meter_id`) b on a.id=b.build_id
-        group by a.`name`
+        select e.name,d.name as meter_name,d.num from (
+            select c.name,b.build_id,a.num from (
+              select meter_id,IFNULL(SUM(meter_power),0) as num from `smart_meter_detail`
+              where deleted=0 and meter_type=0 and update_time like concat(#{day}, '%')
+              group by meter_id ) a left join `smart_build_meter` b
+              on a.meter_id=b.meter_id
+              left join `smart_meter` c on a.meter_id=c.id
+              where b.meter_type=0 and c.meter_type=0 and b.`deleted`=0 and c.`deleted`=0 ) d
+              left join `smart_build` e on d.build_id=e.id
+            where e.deleted=0
     </select>
 
     <!--每天各电表数据统计-->
     <select id="getElcTjByDayAndBuild" parameterType="String" resultMap="Energy">
-        select a.name,SUM(IFNULL(b.num,0)) as num from `smart_build` a left join (
-            select a.`build_id`,IFNULL(b.num,0) as num from `smart_build_meter` a left join (
-                select meter_id,IFNULL(SUM(meter_power),0) as num from `smart_meter_detail`
-                where deleted=0 and meter_type=1 and update_time like concat(#{day}, '%')
-                group by meter_id ) b on a.`meter_id`=b.`meter_id`) b on a.id=b.build_id
-        group by a.`name`
+        select e.name,d.name as meter_name,d.num from (
+          select c.name,b.build_id,a.num from (
+          select meter_id,IFNULL(SUM(meter_power),0) as num from `smart_meter_detail`
+          where deleted=0 and meter_type=1 and update_time like concat(#{day}, '%')
+          group by meter_id ) a left join `smart_build_meter` b
+                  on a.meter_id=b.meter_id
+          left join `smart_meter` c on a.meter_id=c.id
+          where b.meter_type=1 and c.meter_type=1 and b.`deleted`=0 and c.`deleted`=0 ) d
+          left join `smart_build` e on d.build_id=e.id
+        where e.deleted=0
     </select>
 
     <select id="getTjByDay" parameterType="String" resultMap="DayT">
-        select * from `day_meter_detail` where `name`=#{name} and `date`=#{day} and `type`=#{type}
+        select * from `day_meter_detail` where `name`=#{name} and `meter_name`=#{meterName} and `date`=#{day} and `type`=#{type}
     </select>
 
     <insert id="insertDayMeter" parameterType="com.template.model.tongji.EnergyTj" useGeneratedKeys="true">
         INSERT INTO `day_meter_detail`
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">`name`,</if>
+            <if test="meterName != null">`meter_name`,</if>
             <if test="type != null">`type`,</if>
             <if test="date != null">`date`,</if>
             <if test="num != null">`num`,</if>
         </trim>
         <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
+            <if test="meterName != null">#{meterName},</if>
             <if test="type != null">#{type},</if>
             <if test="date != null">#{date},</if>
             <if test="num != null">#{num},</if>