jiahan.wu[CR] bi大屏通用查询service方法

lzbi-module/src/main/java/com/lzbi/bi/domain/DcBusiDataScreenVo.java

@@ -14,10 +14,12 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 public class DcBusiDataScreenVo{
     private String companyName;
+    private String targetModelCode;
     private String coallost;
     private String countDate;
     private String targetUnit;
     private Double monthAll;
+    private Double dayAll;
     private Double valD1;
     private Double valD2;
     private Double valD3;

lzbi-module/src/main/resources/mapper/asset/DcBusiTargetDraftDaynewMapper.xml

@@ -281,27 +281,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             dc_busi_target_draft_daynew d,
             dc_busi_report_target_config c,
             dc_base_target_model m,
+        (
+            select
+                max(CONCAT( date_year , date_month , date_day)) max_date,
+                target_model_code,
+                organize_id
+            from
+                dc_busi_target_draft_daynew
+            where
+                organize_id in
+                <foreach item="orgId" collection="orgIds" open="(" separator="," close=")">
+                    #{orgId}
+                </foreach>
+                and CONCAT(date_year , date_month , date_day) &lt;= CONCAT(#{dateYear}, #{dateMonth}, #{dateDay})
+            group by
+                target_model_code,
+                organize_id
+        ) md,
         (
             select
             asset_code
             from
             dc_base_asset_info
             where
-                    org_id = #{orgId}
+            org_id in
+            <foreach item="orgId" collection="orgIds" open="(" separator="," close=")">
+                #{orgId}
+            </foreach>
             and asset_level = #{assetLevel}
             and asset_type = #{assetType}
-                    limit 1) a
+            limit 1
+        ) a
         where
             d.asset_code = a.asset_code
+            and CONCAT(d.date_year , d.date_month , d.date_day) = md.max_date
+            and d.target_model_code = md.target_model_code
+            and d.organize_id = md.organize_id
             and d.target_model_code = c.target_model_code
             and d.target_model_code =m.target_model_code
             and c.report_name in
             <foreach item="reportName" collection="reportNames" open="(" separator="," close=")">
                 #{reportName}
             </foreach>
-            and d.date_year = #{dateYear}
-            and d.date_month = #{dateMonth}
-            and d.date_day = #{dateDay}
     </select>
 
 </mapper>