fix(大屏):大屏接口修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableMapper.xml

@@ -119,7 +119,7 @@
                use.RECORD                                                                           as record,
                (select FACTORY_NUM from idx_biz_jg_factory_info jfi where jede.equ_id = jfi.RECORD) as factoryNum,
                (select EQU_CODE from idx_biz_jg_register_info jri where jede.equ_id = jri.RECORD)   as equCode
-        FROM tzs_jg_enable_disable jed
+            FROM tzs_jg_enable_disable jed
                  LEFT JOIN tzs_jg_enable_disable_eq jede on jed.sequence_nbr = jede.enable_disable_apply_id
                  LEFT JOIN idx_biz_jg_use_info use on jede.equ_id = use.RECORD
         where jed.sequence_nbr = #{sequenceNbr}
@@ -137,7 +137,8 @@
             INNER JOIN tzs_jg_enable_disable_eq tjede ON tjede.enable_disable_apply_id = tjed.sequence_nbr
             INNER JOIN idx_biz_jg_register_info jri ON tjede.equ_id = jri.record
         WHERE pc.company_code = #{cityCode}
-            AND ( tjed.audit_pass_date BETWEEN #{ beginDate } AND #{ endDate } )
+            AND tjed.audit_pass_date <![CDATA[ >= ]]> #{beginDate}
+            AND tjed.audit_pass_date <![CDATA[ < ]]> #{endDate}
             AND tjed.is_delete = 0
         GROUP BY jri.equ_category
     </select>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml

@@ -269,8 +269,10 @@
             INNER JOIN idx_biz_jg_register_info jri ON tjsce.equ_id = jri.record
         WHERE pc.company_code = #{cityCode}
           AND ( tjsc.audit_pass_date BETWEEN #{ beginDate } AND #{ endDate } )
+          AND tjsc.audit_pass_date <![CDATA[ >= ]]> #{beginDate}
+          AND tjsc.audit_pass_date <![CDATA[ < ]]> #{endDate}
           AND tjsc.is_delete = 0
-        GROUP BY jri.equ_category
+          GROUP BY jri.equ_category
     </select>
 
     <select id="getScrappedDeviceCount" resultType="java.util.Map">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -1500,7 +1500,8 @@
             INNER JOIN tzs_jg_use_registration_eq tjure ON tjure.equip_transfer_id = tjur.sequence_nbr
             INNER JOIN idx_biz_jg_register_info jri ON tjure.equ_id = jri.record
         WHERE pc.company_code = #{cityCode}
-          and (tjur.audit_pass_date between #{beginDate} and #{endDate})
+          AND tjur.audit_pass_date <![CDATA[ >= ]]> #{beginDate}
+          AND tjur.audit_pass_date <![CDATA[ < ]]> #{endDate}
           and tjur.is_delete = 0
         GROUP BY jri.equ_category
     </select>
@@ -1574,34 +1575,25 @@
         ORDER BY ui.REC_DATE DESC
     </select>
     <select id="stopStateCount" resultType="java.util.Map">
-        SELECT COUNT
-                   ( * ),
+        SELECT COUNT(*),
                EQU_LIST as equList,
                EQU_CATEGORY as equCategory
         FROM
             idx_biz_jg_register_info
         WHERE
                 "RECORD" IN (
-                SELECT
-                    equ_id
-                FROM
-                    tzs_jg_enable_disable_eq
-                WHERE
-                        "enable_disable_apply_id" IN (
-                        SELECT A
-                                   .sequence_nbr
-                        FROM
-                            tzs_jg_enable_disable
-                                A LEFT JOIN tz_base_enterprise_info b ON A.use_unit_credit_code = b.use_unit_code
-                        WHERE
-                            A.audit_status LIKE'%已完成%'
+                SELECT equ_id FROM tzs_jg_enable_disable_eq
+                WHERE "enable_disable_apply_id" IN (
+                        SELECT A.sequence_nbr
+                        FROM tzs_jg_enable_disable A
+                        LEFT JOIN tz_base_enterprise_info b ON A.use_unit_credit_code = b.use_unit_code
+                        WHERE A.audit_status LIKE'%已完成%'
                           AND b.supervise_org_code LIKE concat ( #{orgCode}, '%' )
                           AND A.apply_type = 'SB_TY'
                           AND A.audit_pass_date > CURDATE ( ) - 30
                     )
             )
-        GROUP BY
-            "EQU_CATEGORY"
+        GROUP BY "EQU_CATEGORY"
     </select>
 
     <select id="cancelStateCount" resultType="java.util.Map">

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -300,7 +300,7 @@ public class JGDPStatisticsServiceImpl {
 
     public Map<String, Object> useRegisterCountByEquList(DPFilterParamDto dpFilterParamDto) {
         // 1.查询条件构造未上送时间时，默认查询数据为近一个月数据
-        this.setDefaultFilter(dpFilterParamDto);
+        this.applyDefaultDateRange(dpFilterParamDto);
         // 2.按照前端约定格式返回数据
         Map<String, Object> result = new HashMap<>();
         List<LegendDataDto> legendDataDtos = this.buildLegendDataList();
@@ -375,6 +375,15 @@ public class JGDPStatisticsServiceImpl {
         }
     }
 
+    private void applyDefaultDateRange(DPFilterParamDto dpFilterParamDto) {
+        if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
+            dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -30).toDateStr());
+        }
+        if (StringUtils.isEmpty(dpFilterParamDto.getEndDate())) {
+            dpFilterParamDto.setEndDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), 1).toDateStr());
+        }
+    }
+
     private void setDefaultFilter30(DPFilterParamDto dpFilterParamDto) {
         if (StringUtils.isEmpty(dpFilterParamDto.getBeginDate())) {
             dpFilterParamDto.setBeginDate(cn.hutool.core.date.DateUtil.offsetDay(new Date(), -29).toDateStr());