Merge branch 'develop_tzs_register_to_0715' of…

Merge branch 'develop_tzs_register_to_0715' of http://36.40.66.175:5000/moa/amos-boot-biz into develop_tzs_register_to_0715

Merge branch 'develop_tzs_register_to_0715' of…
b9a4ca92 · suhuiguang · 06d70205 · 7ec2b164 · b9a4ca92 · b9a4ca92
Commit b9a4ca92 authored Jul 22, 2024 by suhuiguang
13 changed files
--- a/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/DPStatisticsServiceImpl.java
+++ b/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/DPStatisticsServiceImpl.java
@@ -89,6 +89,18 @@ public class DPStatisticsServiceImpl {
     */
    private final static String COMPANY_TYPE_FILLING = "充装单位";
+    /**
+     * 监管-中屏-地图行政区划code
+     */
+    private final static String REGION_CODE = "regionCode";
+    /**
+     * 监管-中屏-地图行政区划code
+     */
+    private final static String REGION_NAME = "regionName";
    @Autowired
    private EquipmentCategoryMapper equipmentCategoryMapper;
@@ -1297,13 +1309,42 @@ public class DPStatisticsServiceImpl {
            if (itemResult == null) {
                itemResult = new HashMap<>();
            }
-            itemResult.put("regionCode", r.getRegionCode());
+            itemResult.put(REGION_CODE, r.getRegionCode());
-            itemResult.put("regionName", r.getRegionName());
+            itemResult.put(REGION_NAME, r.getRegionName());
            return itemResult;
        }).collect(Collectors.toList());
+        // 杨陵区/韩城市 数据过滤添至返回结果
+        result = reginStepDataHandle(result);
+        return result;
+    }
+    private List<Map<String, Object>> reginStepDataHandle(List<Map<String, Object>> result) {
+        // 杨凌区数据统计
+        String ylOrgCode = commonMapper.getOrgCodeByCompanyCode(ReginStepEnum.YANGLING.getCode());
+        Map<String, Object> ylMap = new HashMap<>();
+        Long ylCertificateCount = jgUseRegistrationManageMapper.countCertificateByReginCode(ylOrgCode);
+        Long ylDeviceCount = equipmentCategoryMapper.countEquipByReginCode(ylOrgCode);
+        ylMap.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), ylCertificateCount);
+        ylMap.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), ylDeviceCount);
+        ylMap.put(REGION_CODE, ReginStepEnum.YANGLING.getCode());
+        ylMap.put(REGION_NAME, ReginStepEnum.YANGLING.getName());
+        result.add(ylMap);
+        // 韩城市数据统计
+        String hcOrgCode = commonMapper.getOrgCodeByCompanyCode(ReginStepEnum.HANCHENG.getCode());
+        Map<String, Object> hcMap = new HashMap<>();
+        Long hcCertificateCount = jgUseRegistrationManageMapper.countCertificateByReginCode(hcOrgCode);
+        Long hcDeviceCount = equipmentCategoryMapper.countEquipByReginCode(hcOrgCode);
+        hcMap.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), hcCertificateCount);
+        hcMap.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), hcDeviceCount);
+        hcMap.put(REGION_CODE, ReginStepEnum.HANCHENG.getCode());
+        hcMap.put(REGION_NAME, ReginStepEnum.HANCHENG.getName());
+        result.add(hcMap);
        return result;
    }
    private Map<String, Object> staticsCenterMapCountDataForRegin(DPFilterParamDto dpFilterParamDto) {
        Map<String, Object> result = new HashMap<>();
        String orgCode = regionCodeOrgCodeMap.get(dpFilterParamDto.getCityCode());

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationEquipMapper.xml
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationEquipMapper.xml
@@ -48,25 +48,31 @@
        c.equ_define
    </select>
    <select id="inspectTimeCount" resultType="java.lang.Integer">
-        SELECT COUNT(1) AS num
+        SELECT COUNT
+                   ( 1 ) AS num
        FROM
            (
                SELECT
+                    ae.sequence_nbr,
                    ae.equ_category,
-                    concat ( u.PROVINCE, '#', u.CITY, '#', u.COUNTY ) AS areaCode
+                    pc.company_code,
+                    pc.org_code
                FROM
-                    "tz_jyjc_inspection_application_equip" ae,
+                    privilege_company pc
-                    tz_jyjc_inspection_application A,
+                        INNER JOIN tz_base_enterprise_info bi ON (
-                    "idx_biz_jg_use_info" u
+                            ( bi.supervise_org_code != '50' AND bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' ) )
+                            OR ( bi.supervise_org_code = '50' AND bi.office_region LIKE CONCAT ( '%', pc.company_code, '%' ) )
+                        )
+                        INNER JOIN tz_jyjc_inspection_application A ON A.inspection_unit_code = bi.use_unit_code
+                        INNER JOIN tz_jyjc_inspection_application_equip ae ON A.sequence_nbr = ae.application_seq
                WHERE
-                    ae.equip_unicode = u."RECORD"
+                    A.status = '6616'
-                  AND A.sequence_nbr = ae.application_seq
-                  AND ( A.application_date BETWEEN #{ dpFilterParamDto.beginDate } AND #{ dpFilterParamDto.endDate } )
-                  AND A.status = '6616'
                  AND ae.equ_category = '2300'
+                  AND pc.company_code = #{dpFilterParamDto.cityCode}
+                  AND ( A.application_date BETWEEN #{ dpFilterParamDto.beginDate } AND #{ dpFilterParamDto.endDate } )
+                GROUP BY
+                    ae.sequence_nbr
            ) C
-        WHERE
-            C.areaCode LIKE concat ( '%', #{dpFilterParamDto.cityCode}, '%' )
        GROUP BY
            C.equ_category
    </select>

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPSubServiceImpl.java
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPSubServiceImpl.java
--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/company.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/company.json
@@ -21,7 +21,7 @@
      "key": "devtable",
      "displayName": "设备列表",
      "renderType": "table",
-      "formSeq": "1792821076963651585",
+      "formSeq": "",
      "dataConfig": {
        "api": {
          "httpMethod":"GET",
@@ -31,17 +31,19 @@
            "size": 14,
            "USE_UNIT_CREDIT_CODE": "{useUnitCode}"
          }
-        },
-        "columnWidth": {
-          "EQU_LIST": 150,
-          "EQU_CATEGORY": 160,
-          "EQU_DEFINE": 150,
-          "PRODUCT_NAME": 180,
-          "EQU_CODE": 180,
-          "FACTORY_NUM": 180,
-          "PRODUCE_UNIT_NAME": 180,
-          "USE_UNIT_NAME": 180
        }
+      },
+      "visualParams": {
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_LIST","width": 150,"align": "left","title": "设备种类","key": "AA6DE857-C788-494F-8F16-2ECFC7E34528"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_CATEGORY","width": 160,"align": "left","title": "设备类别","key": "611DAF3D-5B79-466C-BEF2-CC91580091FA"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_DEFINE","width": 150,"align": "left","title": "设备品种","key": "D1CB84A4-E037-446A-9469-65B76E381585"},
+          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCT_NAME","width": 180,"align": "left","title": "设备名称","key": "0BB7318F-5134-42B6-A835-FC86D68066C2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "EQU_CODE","width": 180,"align": "left","title": "设备代码","key": "6EB924FB-EFEA-4779-ADF8-78F310818D2D"},
+          {"dataRenderingMode": "defaultText","dataIndex": "FACTORY_NUM","width": 180,"align": "left","title": "出厂编号/产品编码","key": "87C53BEA-829C-4539-9FCA-E2AF6A53DA15"},
+          {"dataRenderingMode": "defaultText","dataIndex": "PRODUCE_UNIT_NAME","width": 180,"align": "left","title": "制造单位","key": "EADCED1C-C761-4209-B6C6-16298B53DD2E"},
+          {"dataRenderingMode": "defaultText","dataIndex": "USE_UNIT_NAME","width": 180,"align": "left","title": "使用单位","key": "BA4FB9F0-7F44-473F-A977-5C36A69CD541"}
+        ]
      }
    }
  ],

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_1000.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_1000.json
@@ -16,7 +16,8 @@
          "ruleData": {
            "responseSuccess": "data.result.equipInfo"
          }
-        }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
      }
    },
    {
@@ -60,7 +61,7 @@
      "key": "devtable",
      "displayName": "问题列表",
      "renderType": "table",
-      "formSeq": "1793458819301404673",
+      "formSeq": "",
      "dataConfig": {
        "api": {
          "httpMethod":"GET",
@@ -70,10 +71,20 @@
            "size": 14,
            "record": "{record}"
          }
-        },
-        "columnWidth": {
        }
+      },
+      "visualParams": {
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
      }
    }
  ],

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_2000.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_2000.json
@@ -16,7 +16,8 @@
          "ruleData": {
            "responseSuccess": "data.result.equipInfo"
          }
-        }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
      }
    },
    {
@@ -60,7 +61,7 @@
      "key": "devtable",
      "displayName": "问题列表",
      "renderType": "table",
-      "formSeq": "1793458819301404673",
+      "formSeq": "",
      "dataConfig": {
        "api": {
          "httpMethod":"GET",
@@ -70,10 +71,20 @@
            "size": 14,
            "record": "{record}"
          }
-        },
-        "columnWidth": {
        }
+      },
+      "visualParams": {
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
      }
    }
  ],

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_3000.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_3000.json
@@ -16,7 +16,8 @@
          "ruleData": {
            "responseSuccess": "data.result.equipInfo"
          }
-        }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
      }
    },
    {
@@ -60,7 +61,7 @@
      "key": "devtable",
      "displayName": "问题列表",
      "renderType": "table",
-      "formSeq": "1793458819301404673",
+      "formSeq": "",
      "dataConfig": {
        "api": {
          "httpMethod":"GET",
@@ -70,10 +71,20 @@
            "size": 14,
            "record": "{record}"
          }
-        },
-        "columnWidth": {
        }
+      },
+      "visualParams": {
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
      }
    }
  ],

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_4000.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_4000.json
@@ -16,7 +16,8 @@
          "ruleData": {
            "responseSuccess": "data.result.equipInfo"
          }
-        }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
      }
    },
    {
@@ -60,7 +61,7 @@
      "key": "devtable",
      "displayName": "问题列表",
      "renderType": "table",
-      "formSeq": "1793458819301404673",
+      "formSeq": "",
      "dataConfig": {
        "api": {
          "httpMethod":"GET",
@@ -70,10 +71,20 @@
            "size": 14,
            "record": "{record}"
          }
-        },
-        "columnWidth": {
        }
+      },
+      "visualParams": {
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
      }
    }
  ],

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_5000.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_5000.json
@@ -16,7 +16,8 @@
          "ruleData": {
            "responseSuccess": "data.result.equipInfo"
          }
-        }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
      }
    },
    {
@@ -60,7 +61,7 @@
      "key": "devtable",
      "displayName": "问题列表",
      "renderType": "table",
-      "formSeq": "1793458819301404673",
+      "formSeq": "",
      "dataConfig": {
        "api": {
          "httpMethod":"GET",
@@ -70,10 +71,20 @@
            "size": 14,
            "record": "{record}"
          }
-        },
-        "columnWidth": {
        }
+      },
+      "visualParams": {
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
      }
    }
  ],

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_6000.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_6000.json
@@ -16,7 +16,8 @@
          "ruleData": {
            "responseSuccess": "data.result.equipInfo"
          }
-        }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
      }
    },
    {
@@ -60,7 +61,7 @@
      "key": "devtable",
      "displayName": "问题列表",
      "renderType": "table",
-      "formSeq": "1793458819301404673",
+      "formSeq": "",
      "dataConfig": {
        "api": {
          "httpMethod":"GET",
@@ -70,10 +71,20 @@
            "size": 14,
            "record": "{record}"
          }
-        },
-        "columnWidth": {
        }
+      },
+      "visualParams": {
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
      }
    }
  ],

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_8000.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_8000.json
@@ -16,7 +16,8 @@
          "ruleData": {
            "responseSuccess": "data.result.equipInfo"
          }
-        }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
      }
    },
    {
@@ -60,7 +61,7 @@
      "key": "devtable",
      "displayName": "问题列表",
      "renderType": "table",
-      "formSeq": "1793458819301404673",
+      "formSeq": "",
      "dataConfig": {
        "api": {
          "httpMethod":"GET",
@@ -70,10 +71,20 @@
            "size": 14,
            "record": "{record}"
          }
-        },
-        "columnWidth": {
        }
+      },
+      "visualParams": {
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
      }
    }
  ],

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_9000.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_9000.json
@@ -16,7 +16,8 @@
          "ruleData": {
            "responseSuccess": "data.result.equipInfo"
          }
-        }
+        },
+        "paramFieldKeys": ["EQU_LIST","EQU_CATEGORY","EQU_DEFINE"]
      }
    },
    {
@@ -60,7 +61,7 @@
      "key": "devtable",
      "displayName": "问题列表",
      "renderType": "table",
-      "formSeq": "1793458819301404673",
+      "formSeq": "",
      "dataConfig": {
        "api": {
          "httpMethod":"GET",
@@ -70,10 +71,20 @@
            "size": 14,
            "record": "{record}"
          }
-        },
-        "columnWidth": {
        }
+      },
+      "visualParams": {
+        "columns": [
+          {"dataRenderingMode": "defaultText","dataIndex": "sourceType","isUrl": false,"align": "left","title": "问题主体类型","key": "58E0E2F7-4F34-4C01-9AD6-777CABC1672F"},
+          {"dataRenderingMode": "imageText","dataIndex": "problemType","isUrl": false,"imageSize": "30 * 30","align": "left","title": "问题类型","key": "8ACDE41E-CAE3-4A27-82EF-8F7452164A66","imageAttributeName": "problemTypePic"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemDesc","isUrl": false,"align": "left","title": "问题描述","key": "9FAE9BDE-D285-4F5C-9EFB-F1560A78CBA4"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemTime","isUrl": false,"align": "left","title": "问题时间","key": "F00231C2-6AB5-470E-8F50-9FDD242DA75A"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnit","isUrl": false,"align": "left","title": "主体单位","key": "8934A41D-EC48-4E67-9F3C-EC87A4742499"},
+          {"dataRenderingMode": "defaultText","dataIndex": "principalUnitType","isUrl": false,"align": "left","title": "单位类型","key": "5A81B891-D5D4-4765-A610-BF9FA7D55FAB"},
+          {"dataRenderingMode": "defaultText","dataIndex": "governingBody","isUrl": false,"align": "left","title": "管辖机构","key": "B8D224B4-3843-4270-B508-0D6D8147D3D2"},
+          {"dataRenderingMode": "defaultText","dataIndex": "regionName","isUrl": false,"align": "left","title": "所属区域","key": "BAC9DA62-A6D7-4A75-BF9E-DB7AD0B1D4A6"},
+          {"dataRenderingMode": "defaultText","dataIndex": "problemStatus","isUrl": false,"align": "left","title": "问题状态","key": "C79630FE-7C73-4AA9-A68A-F1846204582B"}
+        ]
      }
    }
  ],

--- a/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/untest_company.json
+++ b/amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/untest_company.json
-{
-  "name": "非检验检测机构模板",
-  "tabs": [
-    {
-      "key": "basic",
-      "displayName": "基本信息",
-      "renderType": "basic",
-      "formSeq": "1793454184889085953",
-      "dataConfig": {
-        "api": {
-          "reqType":"GET",
-          "url":"/tcm/baseEnterprise/getInfoByUseCode",
-          "params": {
-            "useCode": "{useUnitCode}"
-          }
-        }
-      }
-    },
-    {
-      "key": "devtable",
-      "displayName": "设备列表",
-      "renderType": "table",
-      "formSeq": "1792821076963651585",
-      "dataConfig": {
-        "api": {
-          "reqType":"GET",
-          "url":"/jg/equipment-register/page",
-          "params": {
-            "number": 1,
-            "size": 10,
-            "USE_UNIT_CREDIT_CODE": "{useUnitCode}"
-          }
-        }
-      }
-    }
-  ],
-  "content": {
-    "basic": {
-      "columns": 2,
-      "datas": [],
-      "qrcode": {
-        "src": "/public/ag/zongshu.png",
-        "text": "2023/12/26",
-        "subtext": "23:10:16"
-      },
-      "subs": []
-    }
-  }
-}
\ No newline at end of file