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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java

@@ -195,4 +195,26 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
 
     @ApiModelProperty(value = "接收机构公司的org_code")
     private String receiveCompanyOrgCode;
+
+    @ApiModelProperty(value = "设备移装完整详细地址")
+    private String fullAddress;
+
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    @ApiModelProperty(value = "区县")
+    private String county;
+
+    @ApiModelProperty(value = "街道")
+    private String street;
+
+    @ApiModelProperty(value = "详细地址")
+    private String address;
+
+    @ApiModelProperty(value = "属地监管部门")
+    private String orgBranchCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java

@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -284,4 +283,46 @@ public class JgChangeRegistrationUnit extends BaseEntity {
      */
     @TableField("equ_list_code")
     private String equListCode;
+
+    /**
+     * 设备移装完整详细地址
+     */
+    @TableField(value = "full_address")
+    private String fullAddress;
+
+    /**
+     * 省
+     */
+    @TableField(value = "province")
+    private String province;
+
+    /**
+     * 市
+     */
+    @TableField(value = "city")
+    private String city;
+
+    /**
+     * 区县
+     */
+    @TableField(value = "county")
+    private String county;
+
+    /**
+     * 街道
+     */
+    @TableField(value = "street")
+    private String street;
+
+    /**
+     * 详细地址
+     */
+    @TableField(value = "address")
+    private String address;
+
+    /**
+     * 属地监管部门
+     */
+    @TableField(value = "org_branch_code")
+    private String orgBranchCode;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataDockController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.DataDockServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +21,7 @@ import java.util.Map;
 @RestController
 @Api(tags = "数据对接 API")
 @RequestMapping(value = "/dataDock")
-public class DataDockController {
+public class DataDockController extends BaseController {
 
     private final DataDockServiceImpl dataDockService;
 
@@ -158,7 +159,7 @@ public class DataDockController {
     @ApiOperation(httpMethod = "POST", value = "工业 、公用、长输管道批量保存", notes = "工业 、公用、长输管道批量保存")
     @RestEventTrigger(value = "operateLogRestEventHandler")
     public ResponseModel<?> savePipingData(@RequestBody Map<String, Object> paramMap) {
-        return ResponseHelper.buildResponse(dataDockService.savePipingData(paramMap));
+        return ResponseHelper.buildResponse(dataDockService.savePipingData(paramMap, getSelectedOrgInfo().getCompany()));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/IdxBizJqEquipmentRegisterController.java

@@ -61,7 +61,7 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @RestEventTrigger(value = "operateLogRestEventHandler")
     @ApiOperation(httpMethod = "POST", value = "设备注册和更新信息", notes = "设备注册和更新信息")
     public ResponseModel<Object> submit(@RequestBody Map<String, Object> paramMap) {
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equipmentRegisterSubmit(paramMap));
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.equipmentRegisterSubmit(paramMap, getSelectedOrgInfo().getCompany()));
     }
 
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/IIdxBizJgRegisterInfoService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.web.multipart.MultipartFile;
@@ -18,7 +19,7 @@ import java.util.Map;
  */
 public interface IIdxBizJgRegisterInfoService {
 
-    ResponseModel equipmentRegisterSubmit(Map<String, Object> paramMap);
+    ResponseModel equipmentRegisterSubmit(Map<String, Object> paramMap, CompanyBo company);
 
     boolean batchDeleteByRecord(Map<String,Object> map);
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -161,6 +161,12 @@ public class DataDockServiceImpl {
     private final IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
     private final IdxBizJgInspectionDetectionInfoMapper idxBizJgInspectionDetectionInfoMapper;
 
+    @Value("${equip.detail.path:/mixuap?appId=1742358052905971713&id=1734100233714954241&formType=detail&record=%s&DATA_SOURCE=%s}")
+    private String equipRoutePath;
+
+    @Value("${pipeline.detail.path:/mixuap?appId=1742358052905971713&id=1867406434120003586&formType=detail&sequenceNbr=%s}")
+    private String pipelineRoutePath;
+
     /**
      * 西安数据对接-保存设备信息
      *
@@ -1583,6 +1589,7 @@ public class DataDockServiceImpl {
             String record = saveEquipmentDataInTransaction(equMap, dataSource, remark);
             recordSet.add(record);
         }
+        this.createResumeBatch(recordSet,dataSource, equipRoutePath, company);
         eventPublisher.publish(new EquipCreateOrEditEvent(
                 this,
                 BusinessTypeEnum.JG_NEW_EQUIP.name(),
@@ -1591,6 +1598,21 @@ public class DataDockServiceImpl {
         ));
     }
 
+
+    private void createResumeBatch(Set<String> records, String dataSource, String routePath, CompanyBo company) {
+        jgResumeInfoService.saveBatchResume(records.stream().map(record->JgResumeInfoDto.builder()
+                .businessType(BusinessTypeEnum.JG_NEW_EQUIP.getName())
+                .businessId(record)
+                .equId(record)
+                .status("正常")
+                .approvalUnitCode(company.getCompanyCode())
+                .approvalUnit(company.getCompanyName())
+                .changeContent(BusinessTypeEnum.JG_NEW_EQUIP.getName() + "业务办理")
+                .routePath(String.format(routePath, record, dataSource))
+                .build()).collect(Collectors.toList())
+        );
+    }
+
     /**
      * 批量异步保存设备数据
      *
@@ -1770,7 +1792,7 @@ public class DataDockServiceImpl {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public Object savePipingData(Map<String, Object> paramMap) {
+    public Object savePipingData(Map<String, Object> paramMap, CompanyBo company) {
         // 获取数据
         JSONObject equipInfo = JSON.parseObject(toJSONString(paramMap.get("equipInfo")), JSONObject.class);
         JSONObject attachmentUpload = JSON.parseObject(toJSONString(paramMap.get("attachmentUpload")), JSONObject.class);
@@ -1836,10 +1858,25 @@ public class DataDockServiceImpl {
                 }
             }
         }
+        this.createResumePipeline(proCon.getSequenceNbr(), String.format(pipelineRoutePath, proCon.getSequenceNbr() + ""), company);
         eventPublisher.publish(new EquipCreateOrEditEvent(this, BusinessTypeEnum.JG_NEW_PROJECT.name(), Sets.newHashSet(proCon.getSequenceNbr() + ""), EquipCreateOrEditEvent.EquipType.project));
         return Boolean.TRUE;
     }
 
+    private void createResumePipeline(Long sequenceNbr, String routePath, CompanyBo company) {
+        jgResumeInfoService.saveBatchResume(Collections.singletonList(JgResumeInfoDto.builder()
+                .businessType(BusinessTypeEnum.JG_NEW_PROJECT.getName())
+                .businessId(sequenceNbr + "")
+                .equId(sequenceNbr + "")
+                .status("正常")
+                .approvalUnitCode(company.getCompanyCode())
+                .approvalUnit(company.getCompanyName())
+                .changeContent(BusinessTypeEnum.JG_NEW_PROJECT.getName() + "业务办理")
+                .routePath(routePath)
+                .build())
+        );
+    }
+
     public void saveCertChangeRecord(JgUseRegistration useReg, JgUseRegistrationManage regManage, List<String> records, EquipRequestParamsDto paramsDto) {
         Long changeRecordId = sequence.nextId();
         JgCertificateChangeRecord changeRecord = new JgCertificateChangeRecord()

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java

@@ -87,8 +87,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     private static final String PROCESS_DEFINITION_KEY = "changeRegistrationTransfer";
     private static final String TABLE_PAGE_ID = "changeRegistrationTransfer";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
-    @Autowired
-    RestHighLevelClient restHighLevelClient;
+
     @Autowired
     RedisUtils redisUtils;
     @Autowired
@@ -121,8 +120,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     private JgChangeRegistrationUnitEqMapper jgChangeRegistrationUnitEqMapper;
     @Autowired
     private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
-    @Autowired
-    private IdxBizJgOtherInfoMapper idxBizJgOtherInfoMapper;
+
     @Autowired
     private IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     @Autowired
@@ -150,6 +148,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
     @Autowired
     private JgVehicleInformationMapper jgVehicleInformationMapper;
 
+    @Autowired
+    JgResumeInfoServiceImpl jgResumeInfoService;
+
     /**
      * 新增移装变更登记
      *
@@ -848,12 +849,31 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             this.saveChangeRecord(jgChangeRegistrationTransfer, taskV2Model);
             // 事务提交后发送数据刷新消息
             this.sendDataRefreshMsg(jgChangeRegistrationTransfer);
+            //  创建设备履历
+            this.createResume( jgChangeRegistrationTransfer, taskV2Model.getRoutePath());
         }
         // redis流程实时数据更新
         commonServiceImpl.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgChangeRegistrationTransfer));
         this.getBaseMapper().updateById(jgChangeRegistrationTransfer);
     }
 
+    private void createResume(JgChangeRegistrationTransfer jgChangeRegistrationTransfer, String routePath) {
+        LambdaQueryWrapper<JgChangeRegistrationTransferEq> lambda = new QueryWrapper<JgChangeRegistrationTransferEq>().lambda();
+        lambda.eq(JgChangeRegistrationTransferEq::getEquipTransferId, jgChangeRegistrationTransfer.getSequenceNbr());
+        List<JgChangeRegistrationTransferEq> changeRegistrationTransferEqs = jgChangeRegistrationTransferEqService.getBaseMapper().selectList(lambda);
+        jgResumeInfoService.saveBatchResume(changeRegistrationTransferEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(jgChangeRegistrationTransfer.getApplyNo())
+                .businessType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName())
+                .businessId(String.valueOf(jgChangeRegistrationTransfer.getSequenceNbr()))
+                .equId(eq.getEquId())
+                .approvalUnit(jgChangeRegistrationTransfer.getReceiveOrgName())
+                .approvalUnitCode(jgChangeRegistrationTransfer.getReceiveCompanyCode())
+                .status("正常")
+                .changeContent(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getName() + "业务办理")
+                .routePath(routePath)
+                .build()).collect(Collectors.toList())
+        );
+    }
+
     private void sendDataRefreshMsg(JgChangeRegistrationTransfer jgChangeRegistrationTransfer) {
         LambdaQueryWrapper<JgChangeRegistrationTransferEq> lambda = new QueryWrapper<JgChangeRegistrationTransferEq>().lambda();
         lambda.eq(JgChangeRegistrationTransferEq::getEquipTransferId, jgChangeRegistrationTransfer.getSequenceNbr());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgEnableDisableServiceImpl.java

@@ -126,6 +126,10 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
      */
     public static final String APPLY_TYPE_TY = "SB_TY";
 
+
+    @Autowired
+    JgResumeInfoServiceImpl jgResumeInfoService;
+
     @Transactional(rollbackFor = Exception.class)
     public List<JgEnableDisable> saveOrUpdate(JSONObject map, ReginParams reginParams) {
         try {
@@ -577,9 +581,11 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
                     taskMap.put("model", jgEnableDisable);
                     // 更新业务数据
                     updateInfoOther(jgEnableDisable);
-                    commonService.updateTaskModel(taskMap);
+                    TaskV2Model taskV2Model1 = commonService.updateTaskModel(taskMap);
                     // 完成后发送数据刷新消息
                     this.sendDataRefreshMsg(jgEnableDisable);
+                    //  创建设备履历
+                    this.createResume(jgEnableDisable, taskV2Model1.getRoutePath());
                 } else {
                     jgEnableDisable.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
                     if (!ObjectUtils.isEmpty(jgEnableDisable.getExecuteSequence())) {
@@ -654,6 +660,23 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
         }
     }
 
+    private void createResume(JgEnableDisable jgEnableDisable, String routePath) {
+        LambdaQueryWrapper<JgEnableDisableEq> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(JgEnableDisableEq::getEnableDisableApplyId, jgEnableDisable.getSequenceNbr());
+        List<JgEnableDisableEq> enableDisableEqs = jgEnableDisableEqService.list(queryWrapper);
+        jgResumeInfoService.saveBatchResume(enableDisableEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(jgEnableDisable.getApplyNo())
+                .businessType(getRegistrationClass(jgEnableDisable))
+                .businessId(String.valueOf(jgEnableDisable.getSequenceNbr()))
+                .equId(eq.getEquId())
+                .approvalUnit(jgEnableDisable.getReceiveOrgName())
+                .approvalUnitCode(jgEnableDisable.getReceiveCompanyCode())
+                .status("正常")
+                .changeContent(getRegistrationClass(jgEnableDisable) + "业务办理")
+                .routePath(routePath)
+                .build()).collect(Collectors.toList())
+        );
+    }
+
     private void sendDataRefreshMsg(JgEnableDisable jgEnableDisable) {
         LambdaQueryWrapper<JgEnableDisableEq> lambdaEq = new QueryWrapper<JgEnableDisableEq>().lambda();
         lambdaEq.eq(JgEnableDisableEq::getEnableDisableApplyId, jgEnableDisable.getSequenceNbr());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -84,7 +85,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
     TzsServiceFeignClient tzsServiceFeignClient;
 
     @Autowired
-    SuperviseInfoMapper superviseInfoMapper;
+    JgResumeInfoServiceImpl jgResumeInfoService;
     @Autowired
     CommonServiceImpl commonService;
     @Autowired
@@ -969,9 +970,30 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
             updateInfoOther(jgScrapCancel, taskV2Model.getRoutePath());
             // 发送数据变更消息
             this.sendDataRefreshMsg(jgScrapCancel);
+            //  创建设备履历
+            this.createResume(jgScrapCancel, taskV2Model.getRoutePath());
         }
         this.getBaseMapper().updateById(jgScrapCancel);
     }
+
+    private void createResume(JgScrapCancel jgScrapCancel, String routePath) {
+        LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
+        lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());
+        lambdaEq.select(JgScrapCancelEq::getEquId, BaseEntity::getSequenceNbr);
+        List<JgScrapCancelEq> scrapCancelEqs = jgScrapCancelEqService.list(lambdaEq);
+        jgResumeInfoService.saveBatchResume(scrapCancelEqs.stream().map(eq-> JgResumeInfoDto.builder().applyNo(jgScrapCancel.getApplyNo())
+                .businessType(getRegistrationClass(jgScrapCancel.getCancelType()))
+                .businessId(String.valueOf(jgScrapCancel.getSequenceNbr()))
+                .equId(eq.getEquId())
+                .approvalUnit(jgScrapCancel.getReceiveOrgName())
+                .approvalUnitCode(jgScrapCancel.getReceiveCompanyCode())
+                .status("正常")
+                .changeContent(getRegistrationClass(jgScrapCancel.getCancelType()) + "业务办理")
+                .routePath(routePath)
+                .build()).collect(Collectors.toList())
+        );
+    }
+
     private void sendDataRefreshMsg(JgScrapCancel jgScrapCancel) {
         LambdaQueryWrapper<JgScrapCancelEq> lambdaEq = new QueryWrapper<JgScrapCancelEq>().lambda();
         lambdaEq.eq(JgScrapCancelEq::getEquipTransferId, jgScrapCancel.getSequenceNbr());

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/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -123,6 +123,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
     private final String DOWNLOAD_TOPIC = "/topic/download/excel/%s";
     private final String BUCKET_NAME = "upload";
     private final String UPLOAD_PATH = "/tzs/excelTempFile";
+    private final List<String> equList = Arrays.asList("1000", "2000", "3000", "4000", "5000", "6000", "8000", "9000");
     // 大屏统计图片路径前缀
     private final String dpEquipPhotoPrefix = "/upload/tzs/dpscreen/statistic/equip/";
     // 大屏统计图片路径后缀
@@ -955,27 +956,25 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             throw new RuntimeException(e);
         }
 
-
-        Map<String, Object> sum = new HashMap<>();
-        sum.put("name", "设备总数（台套）");
-        sum.put("value", totle);
-        statics.add(sum);
-
-        BoolQueryBuilder pipeQuery = QueryBuilderUtils.copyBoolQuery(boolMust);
-
         List<Map<String, Object>> equipStatusMap = new ArrayList<>();
         getEquipStatusStatic(boolMust, builder, equipStatusMap);
         result.put("keyIndicator", equipStatusMap);
 
-        if (ObjectUtils.isEmpty(filterParams) || !filterParams.containsKey("EQU_LIST")) {
-            filterParams = new JSONObject();
-            JSONArray jsonArray = new JSONArray();
-            jsonArray.add("all");
-            filterParams.put("EQU_LIST", jsonArray);
+        String equList = ObjectUtils.isEmpty(filterParams) || "".equals(filterParams.get("equList").toString()) ? "all" : filterParams.get("equList").toString();
+        String equCategory = ObjectUtils.isEmpty(filterParams) || "".equals(filterParams.get("equCategory").toString()) ? "all" : filterParams.get("equCategory").toString();
+
+        if (!equList.equals("8000") && !equCategory.equals("2300")) {
+            BoolQueryBuilder queryBuilder = QueryBuilderUtils.copyBoolQuery(boolMust);
+            queryBuilder.mustNot(QueryBuilders.termQuery("EQU_LIST_CODE", "8000"))
+                    .mustNot(QueryBuilders.termQuery("EQU_CATEGORY_CODE", "2300"));
+            Long count = getStatisticCount(queryBuilder, StatisticalAnalysisEnum.equip.getKey());
+            Map<String, Object> sum = new HashMap<>();
+            sum.put("name", "设备总数（台套）");
+            sum.put("value", count);
+            statics.add(sum);
         }
 
-        JSONArray equList = (JSONArray) filterParams.get("EQU_LIST");
-        if (ObjectUtils.isEmpty(equList) || equList.contains("8000") || equList.contains("all")) {
+        if (equList.contains("8000") || equList.contains("all")) {
             // 获取压力管道长度
             BigDecimal pipeLength = getPipeLength(boolMust, builder, "pipeLength");
             Map<String, Object> pipeMap = new HashMap<>();
@@ -984,7 +983,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             statics.add(pipeMap);
         }
 
-        if (ObjectUtils.isEmpty(equList) || equList.contains("2000") || equList.contains("all")) {
+
+        if (equList.contains("all") || (equList.contains("2000") && "all".equals(equCategory)) || equCategory.contains("2300")) {
             // 气瓶数量
             CountRequest countRequest = new CountRequest();
             countRequest.indices(StatisticalAnalysisEnum.equip.getKey());
@@ -996,7 +996,6 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
-
             Map<String, Object> gasMap = new HashMap<>();
             gasMap.put("name", "气瓶（个）");
             gasMap.put("value", ObjectUtils.isEmpty(response) ? 0 : response.getCount());
@@ -1030,6 +1029,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
     }
 
     private void getEquipmentBoolQueryBuilder(BoolQueryBuilder boolMust, JSONObject filterParams, String filterType) {
+        HashSet<String> equListCodes = new HashSet<>();
+        HashSet<String> equCategoryCodes = new HashSet<>();
         //快捷筛选和自定义筛选解析筛选规则不一致
         if (filterType.equals("advanced")) {
             JSONObject finalFilterParams = filterParams;
@@ -1098,10 +1099,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                                     boolMust.filter(QueryBuilders.rangeQuery(field).gte(startDate).lte(endDate));
                                 }
                             } else if (k.equals("EQU_LIST") || k.equals("EQU_CATEGORY") || k.equals("EQU_DEFINE") || k.equals("DATA_QUALITY_SCORE")) {
+                                JSONArray jsonArray = (JSONArray) v;
                                 if (k.equals("EQU_LIST")) {
                                     field = "EQU_LIST_CODE";
+                                    equListCodes.addAll((jsonArray).toJavaList(String.class));
                                 } else if (k.equals("EQU_CATEGORY")) {
                                     field = "EQU_CATEGORY_CODE";
+                                    equCategoryCodes.addAll((jsonArray).toJavaList(String.class));
                                 } else if (k.equals("EQU_DEFINE")) {
                                     field = "EQU_DEFINE_CODE";
                                 }
@@ -1180,27 +1184,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         } else {
             JSONArray leftGroup = filterParams.getJSONArray("group1");
             JSONArray rightGroup = filterParams.getJSONArray("group2");
-            JSONArray equListCodes = new JSONArray();
-            leftGroup.forEach(item -> {
-                JSONObject left = JSONObject.parseObject(JSONObject.toJSONString(item));
-                String leftField = left.getString("field");
-                String leftValue = left.getString("value");
-                if (!ObjectUtils.isEmpty(leftField) && leftField.equals("EQU_LIST_CODE") && !ObjectUtils.isEmpty(leftValue)) {
-                    equListCodes.add(leftValue);
-                }
-            });
-            rightGroup.forEach(item -> {
-                JSONObject left = JSONObject.parseObject(JSONObject.toJSONString(item));
-                String rightField = left.getString("field");
-                String rightValue = left.getString("value");
-                if (!ObjectUtils.isEmpty(rightField) && rightField.equals("EQU_LIST_CODE") && !ObjectUtils.isEmpty(rightValue)) {
-                    equListCodes.add(rightValue);
-                }
-            });
-            filterParams.put("EQU_LIST", equListCodes);
             Boolean isOrGroup = or.equals(filterParams.getString("groupAndOr")) ? Boolean.TRUE : Boolean.FALSE;
             handleAdvancedFilter(boolMust, leftGroup, rightGroup, isOrGroup, StatisticalAnalysisEnum.equip.getCode());
+            equListCodes.add("8000");
+            equCategoryCodes.add("2300");
         }
+        filterParams.put("equList", String.join(",", equListCodes));
+        filterParams.put("equCategory", String.join(",", equCategoryCodes));
     }
 
     private void getEquipStatusStatic(BoolQueryBuilder boolMust, SearchSourceBuilder builder, List<Map<String, Object>> statics) {
@@ -3133,10 +3123,10 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         equipBoolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", Arrays.asList("1000", "2000", "3000", "4000", "5000", "6000", "9000")));
 
         BoolQueryBuilder companyUnitTypeBoolMust = QueryBuilders.boolQuery();
-        companyBoolMust(companyUnitTypeBoolMust,"company");
+        companyBoolMust(companyUnitTypeBoolMust, "company");
 
         BoolQueryBuilder inspectionUnitTypeBoolMust = QueryBuilders.boolQuery();
-        companyBoolMust(inspectionUnitTypeBoolMust,"inspection");
+        companyBoolMust(inspectionUnitTypeBoolMust, "inspection");
 
         BoolQueryBuilder companyBoolMust = QueryBuilders.boolQuery();
         companyBoolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));