Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IdxBizFanHealthIndexServiceImpl.java

@@ -102,7 +102,6 @@ public class IdxBizFanHealthIndexServiceImpl extends BaseService<IdxBizFanHealth
             SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
-        sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
     //限制必须是区间时间段
     if(startTime==null||endTime==null){
 

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -73,7 +73,7 @@
         count( 1 ) as value
         FROM
         sjgl_zsj_zsbtz a
-        INNER JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL` = 'station'
+        LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL` = 'station'
         <where>
             <if test="parentCode != null and parentCode != ''">
                 b.ORG_CODE  like concat(#{parentCode},'%')
@@ -89,7 +89,7 @@
             count(1) as value
         FROM
         fdgl_job_main a
-        INNER JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL` = 'station'
+        LEFT JOIN privilege_company b on a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL` = 'station'
         <where>
             <if test="parentCode != null and parentCode != ''">
                 b.ORG_CODE  like concat(#{parentCode},'%')
@@ -110,7 +110,7 @@
         else 3 end) as sort
         FROM
         sjgl_zsj_zsbtz a
-        INNER JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL`  = 'station'
+        LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL`  = 'station'
         <where>
             <if test="parentCode != null and parentCode != ''">
                 AND b.ORG_CODE like concat(#{parentCode},'%')
@@ -122,9 +122,9 @@
                 AND a.QRCODE_COLOR = #{qrCodeColor}
             </if>
             <if test="ne != null and ne != ''">
-                AND a.QRCODE_COLOR != #{ne}
             </if>
         </where>
+        AND a.QRCODE_COLOR != #{ne}
         ORDER BY  sort asc, a.UPDATE_STAMP DESC
         limit #{current},#{size}
     </select>
@@ -134,7 +134,7 @@
         count(1)
         FROM
         sjgl_zsj_zsbtz a
-        INNER JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL`  = 'station'
+        LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL`  = 'station'
         <where>
             <if test="parentCode != null and parentCode != ''">
                 AND b.ORG_CODE like concat(#{parentCode},'%')
@@ -165,7 +165,7 @@
         else 3 end as sort
         FROM
         fdgl_job_main a
-        INNER JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL` = 'station'
+        LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL` = 'station'
         left join sjgl_zsj_zsbtz c on a.EQUIP_DBID = c.DBID
         <where>
             <if test="parentCode != null and parentCode != ''">
@@ -190,7 +190,7 @@
         count(1)
         FROM
         fdgl_job_main a
-        INNER JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL` = 'station'
+        LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE and b.IS_DELETED = false AND b.`LEVEL` = 'station'
         <where>
             <if test="parentCode != null and parentCode != ''">
                 AND b.ORG_CODE like concat(#{parentCode},'%')