1.企业详情模板设备列表增加筛选

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

@@ -114,6 +114,7 @@ public class DPSubServiceImpl {
             map.put("showPage", true);
             map.put("api", api);
             map.put("rowKey", JsonValueUtils.getValueByKey(jsonObject, "visualParams", "visualParams.rowKey"));
+            map.put("filters", JsonValueUtils.getValueByKey(jsonObject, "visualParams", "visualParams.filters"));
             return map;
         }
         return apiResult;

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

 package com.yeejoin.amos.boot.module.statistcs.biz.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
@@ -11,6 +12,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,12 +36,16 @@ public class EquipmentBizServiceImpl {
      * 设备字典,通过设备父类code,获得子类
      */
     public List<EquipmentCategory> getChildren(String code) {
+        List<EquipmentCategory> equipmentCategories = new ArrayList<>();
+        if(StrUtil.isEmpty(code)){
+            return equipmentCategories;
+        }
         LambdaQueryWrapper<EquipmentCategory> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(EquipmentCategory::getCode, code);
         EquipmentCategory equipmentCategory = equipmentCategoryMapper.selectOne(wrapper);
         LambdaQueryWrapper<EquipmentCategory> wrapper2 = new LambdaQueryWrapper<>();
         wrapper2.eq(EquipmentCategory::getParentId, equipmentCategory.getId());
-        List<EquipmentCategory> equipmentCategories = equipmentCategoryMapper.selectList(wrapper2);
+        equipmentCategories = equipmentCategoryMapper.selectList(wrapper2);
         return equipmentCategories;
     }
 

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

@@ -2155,6 +2155,21 @@ public class JGDPStatisticsServiceImpl {
                 boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
             }
         }
+
+        if (!ObjectUtils.isEmpty(map.getString("USE_ORG_CODE"))) {
+            BoolQueryBuilder mBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("USE_ORG_CODE"));
+            mBuilder.must(QueryBuilders.wildcardQuery("USE_ORG_CODE", "*" + test + "*"));
+            boolMust.must(mBuilder);
+        }
+
+        if (!ObjectUtils.isEmpty(map.getString("CODE96333"))) {
+            BoolQueryBuilder mBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("CODE96333"));
+            mBuilder.must(QueryBuilders.wildcardQuery("CODE96333", "*" + test + "*"));
+            boolMust.must(mBuilder);
+        }
+
         if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
             String param = QueryParser.escape(map.getString(EQU_CATEGORY));

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/company.json

@@ -60,15 +60,43 @@
       "visualParams": {
         "rowKey": "record",
         "columns": [
-          {"dataRenderingMode": "defaultText","dataIndex": "EQU_LIST","width": 150,"align": "left","title": "设备种类","key": "1"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_LIST","width": 150,"align": "left","title": "设备类型","key": "1"},
           {"dataRenderingMode": "defaultText","dataIndex": "EQU_CATEGORY","width": 160,"align": "left","title": "设备类别","key": "2"},
           {"dataRenderingMode": "defaultText","dataIndex": "EQU_DEFINE","width": 150,"align": "left","title": "设备品种","key": "3"},
           {"dataRenderingMode": "defaultText","dataIndex": "PRODUCT_NAME","width": 180,"align": "left","title": "设备名称","key": "4"},
           {"dataRenderingMode": "defaultText","dataIndex": "EQU_CODE","width": 180,"align": "left","title": "设备代码","key": "5"},
-          {"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "出厂编号/产品编码","key": "6"},
-          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCE_UNIT_NAME","width": 180,"align": "left","title": "制造单位","key": "7"},
-          {"dataRenderingMode": "defaultText","dataIndex": "USE_UNIT_NAME","width": 180,"align": "left","title": "使用单位","key": "8"},
+          {"dataRenderingMode": "defaultText","dataIndex": "USE_ORG_CODE","width": 180,"align": "left","title": "使用登记证编号","key": "6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "SUPERVISORY_CODE","width": 180,"align": "left","title": "监管码","key": "7"},
+          {"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "出厂编号/产品编码","key": "8"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_STATE","width": 180,"align": "left","title": "设备状态","key": "9"},
           {"dataRenderingMode": "actionDetailBtn","dataIndex": "action","width": 60,"align": "left","title": "操作","key": "9", "conf": { "title": "设备详情", "linkModelKey": "equip" } }
+        ],
+        "filters": [
+            {"title":"设备类型：","dataIndex":"EQU_LIST_CODE","render":"select","renderData":[],
+              "api":
+              {
+                "httpMethod":"GET",
+                "apiPath":"/statistics/dp/zl/equipTree"
+              },
+              "valueKey": "instanceId",
+              "labelKey": "instanceName"
+            },
+            {"title":"设备类别：","dataIndex":"EQU_CATEGORY_CODE","render":"select","renderData":[],
+              "api":
+              {
+                "httpMethod":"GET",
+                "apiPath":"/statistics/dp/biz-equipment/getChildren",
+                "parmas": {
+                  "code": "{EQU_LIST_CODE}"
+                }
+              },
+              "valueKey": "code",
+              "labelKey": "name"
+            },
+            {"title":"设备状态：","dataIndex":"EQU_STATE","render":"select","renderData":[{"label":"在用","value":"在用"},{"label":"停用","value":"停用"}]},
+            {"title":"赋码状态：","dataIndex":"IS_SUPERVISORY","render":"select","renderData":[{"label":"已赋码","value":"1"},{"label":"未赋码","value":"2"}]},
+            {"title":"使用登记证编号：","dataIndex":"USE_ORG_CODE","render":"input"},
+            {"title":"监管码：","dataIndex":"SUPERVISORY_CODE","render":"input"}
         ]
       }
     },