Merge remote-tracking branch 'origin/master'

@@ -26,4 +26,7 @@ public interface FactoryOperateCenterMapper {
 
 
     List<Map<String, String>> getReportCount(@Param("departId") String departId, @Param("month") String month,
     List<Map<String, String>> getReportCount(@Param("departId") String departId, @Param("month") String month,
                                              @Param("reportName") String reportName);
                                              @Param("reportName") String reportName);
+
+    Map<String, Object> getSdyData(@Param("view2119") String view2119, @Param("view3a24") String view3a24,
+                                   @Param("departId") String departId, @Param("dateTime") String dateTime);
 }
 }

@@ -128,4 +128,21 @@
             depart_id = #{departId}
             depart_id = #{departId}
             AND time LIKE CONCAT(#{month},'%')
             AND time LIKE CONCAT(#{month},'%')
     </select>
     </select>
+
+    <select id="getSdyData" resultType="java.util.HashMap">
+        select
+            ROUND(SUM(v.CSL)/10000,2) AS CLSL,
+            v3.DLHJ,
+            v3.YJHJ
+        from ${view2119} v
+        LEFT JOIN (select ROUND(SUM(v.DLHJ),2) AS DLHJ,ROUND(SUM(IFNULL(v.PAMRJ,0)+
+            IFNULL(v.SCLPAMZ,0)+IFNULL(v.SCLPAMF,0)+IFNULL(v.NACLO,0)+IFNULL(v.PACGT,0)+
+            IFNULL(v.PACYT,0)+IFNULL(v.PFS,0)+IFNULL(v.FHTY,0)+IFNULL(v.RYXNJ,0)+IFNULL(v.YWL,0)+
+            IFNULL(v.GXCLJ,0)+IFNULL(v.CH3COONA,0)+IFNULL(v.HXT,0)+IFNULL(v.FECL3,0)+IFNULL(v.SH,0)+
+            IFNULL(v.CH3COOH,0)+IFNULL(v.FESO4G,0)+IFNULL(v.FESO4Y,0)+IFNULL(v.H2O2,0)),2) AS YJHJ,
+            v.depart_id,v.time
+        from ${view3a24} v where v.depart_id = #{departId} and v.time like CONCAT(#{dateTime},'%')) v3
+        ON v.depart_id = v3.depart_id
+        where v.depart_id = #{departId} and v.time like CONCAT(#{dateTime},'%')
+    </select>
 </mapper>
 </mapper>