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

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

@@ -1499,7 +1499,7 @@
         FROM
             privilege_company pc
             INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
-               INNER JOIN tzs_jg_use_registration tjur ON tjur.use_unit_credit_code = bi.use_unit_code
+            INNER JOIN tzs_jg_use_registration tjur ON tjur.use_unit_credit_code = bi.use_unit_code
             AND tjur.status = '已完成'
             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

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

@@ -1549,7 +1549,7 @@ public class JGDPStatisticsServiceImpl {
     public Map<String, Object> getRegEquCount(DPFilterParamDto dpFilterParamDto) {
         String orgCodeP = stCommonService.getAndSetOrgCode(dpFilterParamDto);
         Map<String, Object> resultMap = new HashMap<>();
-        String startTime = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        String startTime = LocalDate.now().minusDays(30).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         //使用登记
         List<Map<String, Object>> uselist = jgStatisticsMapper.useEquCount(orgCodeP, startTime);
         Map<String, Integer> useCountMap = new HashMap<>();
@@ -3074,8 +3074,8 @@ public class JGDPStatisticsServiceImpl {
 
         objMap.put("completedBusinessTypes", judgeTheBusinessAccordingByRecord(record, objMap));
         // 账号类型（用于车用气瓶流程页面-》监管审核-》打开设备详情 时隐藏保存按钮）
-        ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        objMap.put("accountType", reginParams.getCompany().getCompanyType());
+        //ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+        //objMap.put("accountType", reginParams.getCompany().getCompanyType());
         // 登记日期
         if (!ValidationUtil.isEmpty(registerInfo.getUseOrgCode())) {
             Optional<JgUseRegistrationManage> firstRecord = jgUseRegistrationManageMapper.selectList(new QueryWrapper<JgUseRegistrationManage>().lambda()