Skip to content

A
amos-boot-biz
Commit e0b78da1 authored by 麻笑宇's avatar 麻笑宇
Browse files
Options

feat(statistics): 优化高级搜索功能

- 在 CompanyAdvanceSearchEnum、EquipAdvanceSearchEnum 和 PersonAdvanceSearchEnum 中添加 argKey 字段 - 更新相关枚举值，为需要动态参数的 URL 添加占位符 - 修改 ComprehensiveStatisticalAnalysisController 中的 queryUnitByOrgCode 方法参数 - 在 ConditionEnum 中添加等于条件
parent a95bdc4b
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 47 deletions
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/CompanyAdvanceSearchEnum.java
View file @ e0b78da1
...@@ -13,15 +13,15 @@ public enum CompanyAdvanceSearchEnum { ...@@ -13,15 +13,15 @@ public enum CompanyAdvanceSearchEnum {
/** /**
* 高级搜索枚举 * 高级搜索枚举
*/ */
ADDRESS("详细地址", "address", TechnicalParameter.ParamType.STRING,"",null), ADDRESS("详细地址", "address", TechnicalParameter.ParamType.STRING,"",null,null),
EXPIRYDATE("许可有效期", "expiryDate",TechnicalParameter.ParamType.DATE,"",null), EXPIRYDATE("许可有效期", "expiryDate",TechnicalParameter.ParamType.DATE,"",null,null),
UNIT_TYPE("企业类型", "unitType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null), UNIT_TYPE("企业类型", "unitType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null,null),
REGULATORY_LABELS("企业等级", "regulatoryLabels",null,"",null), REGULATORY_LABELS("企业等级", "regulatoryLabels",null,"",null,null),
INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","HYZGBM"), INDUSTRY_SUPERVISOR("行业主管部门", "industrySupervisor",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","HYZGBM",null),
ITEM_CODE("许可项目", "itemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK",null), ITEM_CODE("许可项目", "itemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK",null,null),
SUB_ITEM_CODE("许可子项目", "subItemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK",null), SUB_ITEM_CODE("许可子项目", "subItemCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryXK?type={type}",null,"itemCode"),
OPERATING_STATUS("经营状态", "operatingStatus",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","jyzt"), OPERATING_STATUS("经营状态", "operatingStatus",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData?type={type}","jyzt",null),
EQUIP_CATEGORY("监管设备类型", "equipCategory",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null), EQUIP_CATEGORY("监管设备类型", "equipCategory",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null,null),
; ;
...@@ -30,6 +30,7 @@ public enum CompanyAdvanceSearchEnum { ...@@ -30,6 +30,7 @@ public enum CompanyAdvanceSearchEnum {
private TechnicalParameter.ParamType paramType; private TechnicalParameter.ParamType paramType;
private String url; private String url;
private String dataKey; private String dataKey;
private String argKey;
public static JSONArray getAll(){ public static JSONArray getAll(){
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
...@@ -39,6 +40,7 @@ public enum CompanyAdvanceSearchEnum { ...@@ -39,6 +40,7 @@ public enum CompanyAdvanceSearchEnum {
jsonObject.put("value", item.code); jsonObject.put("value", item.code);
jsonObject.put("key", item.code); jsonObject.put("key", item.code);
jsonObject.put("dataKey", item.dataKey); jsonObject.put("dataKey", item.dataKey);
jsonObject.put("argKey", item.argKey);
jsonObject.put("paramType", item.paramType); jsonObject.put("paramType", item.paramType);
jsonObject.put("isMulti", false); jsonObject.put("isMulti", false);
if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){ if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/ConditionEnum.java
View file @ e0b78da1
...@@ -29,6 +29,7 @@ public enum ConditionEnum { ...@@ -29,6 +29,7 @@ public enum ConditionEnum {
dateLe("小于等于", "le", TechnicalParameter.ParamType.DATE), dateLe("小于等于", "le", TechnicalParameter.ParamType.DATE),
in("包含","in", null), in("包含","in", null),
notin("不包含","notin", null), notin("不包含","notin", null),
eq("等于","eq", null),
; ;
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/EquipAdvanceSearchEnum.java
View file @ e0b78da1
...@@ -13,31 +13,31 @@ public enum EquipAdvanceSearchEnum { ...@@ -13,31 +13,31 @@ public enum EquipAdvanceSearchEnum {
/** /**
* 高级搜索枚举 * 高级搜索枚举
*/ */
USE_ORG_CODE("使用登记证编号", "USE_ORG_CODE", TechnicalParameter.ParamType.STRING,"",null), USE_ORG_CODE("使用登记证编号", "USE_ORG_CODE", TechnicalParameter.ParamType.STRING,"",null,null),
EQU_LIST("设备种类", "EQU_LIST",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null), EQU_LIST("设备种类", "EQU_LIST",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null,null),
EQU_CATEGORY("设备类别", "EQU_CATEGORY",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquCategory",null), EQU_CATEGORY("设备类别", "EQU_CATEGORY",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquCategory?type={type}",null,"EQU_LIST"),
EQU_DEFINE("设备品种", "EQU_DEFINE",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquDefine",null), EQU_DEFINE("设备品种", "EQU_DEFINE",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquDefine?type={type}",null,"EQU_CATEGORY"),
PRODUCT_NAME("设备名称", "PRODUCT_NAME", TechnicalParameter.ParamType.STRING,"",null), PRODUCT_NAME("设备名称", "PRODUCT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
TECH_PARAM("技术参数", "techParam", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryTechParam",null), TECH_PARAM("技术参数", "techParam", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryTechParam?type={type}",null,"EQU_LIST"),
PARAM_RANGE("参数范围", "paramRange", TechnicalParameter.ParamType.STRING,"",null), PARAM_RANGE("参数范围", "paramRange", TechnicalParameter.ParamType.STRING,"",null,null),
NEXT_INSPECT_DATE("检验有效期", "nextInspectDate", TechnicalParameter.ParamType.DATE,"",null), NEXT_INSPECT_DATE("检验有效期", "nextInspectDate", TechnicalParameter.ParamType.DATE,"",null,null),
EQU_STATE("设备状态", "EQU_STATE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquState",null), EQU_STATE("设备状态", "EQU_STATE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquState",null,null),
IS_SUPERVISORY_CODE("赋码状态", "IS_SUPERVISORY_CODE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryIsSupervisoryCode",null), IS_SUPERVISORY_CODE("赋码状态", "IS_SUPERVISORY_CODE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryIsSupervisoryCode",null,null),
DATA_QUALITY_SCORE("设备等级", "DATA_QUALITY_SCORE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDataQualityScore",null), DATA_QUALITY_SCORE("设备等级", "DATA_QUALITY_SCORE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDataQualityScore",null,null),
USC_DATE("使用年限", "USC_DATE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUscDate",null), USC_DATE("使用年限", "USC_DATE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUscDate",null,null),
UNIT_TYPE("所属单位类型", "unitType", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null), UNIT_TYPE("所属单位类型", "unitType", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitType",null,null),
USC_UNIT_NAME("所属单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null), USC_UNIT_NAME("所属单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
PRODUCE_UNIT_NAME("制造单位名称", "PRODUCE_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null), PRODUCE_UNIT_NAME("制造单位名称", "PRODUCE_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
DESIGN_UNIT_NAME("设计单位名称", "DESIGN_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null), DESIGN_UNIT_NAME("设计单位名称", "DESIGN_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
ME_UNIT_NAME("维保单位名称", "ME_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null), ME_UNIT_NAME("维保单位名称", "ME_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
AZUSC_UNIT_NAME("安装单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null), AZUSC_UNIT_NAME("安装单位名称", "USC_UNIT_NAME", TechnicalParameter.ParamType.STRING,"",null,null),
CODE96333("96333识别码", "CODE96333", TechnicalParameter.ParamType.STRING,"",null), CODE96333("96333识别码", "CODE96333", TechnicalParameter.ParamType.STRING,"",null,null),
SUPERVISORY_CODE("监管码", "SUPERVISORY_CODE", TechnicalParameter.ParamType.STRING,"",null), SUPERVISORY_CODE("监管码", "SUPERVISORY_CODE", TechnicalParameter.ParamType.STRING,"",null,null),
EQU_TYPE("设备型号", "EQU_TYPE", TechnicalParameter.ParamType.STRING,"",null), EQU_TYPE("设备型号", "EQU_TYPE", TechnicalParameter.ParamType.STRING,"",null,null),
PRODUCE_DATE("制造日期", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,"",null), PRODUCE_DATE("制造日期", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,"",null,null),
// PRODUCE_DATE("是否进口", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,""), // PRODUCE_DATE("是否进口", "PRODUCE_DATE", TechnicalParameter.ParamType.DATE,""),
USE_PLACE_CODE("使用地点", "USE_PLACE_CODE", TechnicalParameter.ParamType.STRING,"",null), USE_PLACE_CODE("使用地点", "USE_PLACE_CODE", TechnicalParameter.ParamType.STRING,"",null,null),
USE_PLACE("使用场所", "USE_PLACE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","ADDRESS"), USE_PLACE("使用场所", "USE_PLACE", null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","ADDRESS",null),
; ;
...@@ -46,6 +46,7 @@ public enum EquipAdvanceSearchEnum { ...@@ -46,6 +46,7 @@ public enum EquipAdvanceSearchEnum {
private TechnicalParameter.ParamType paramType; private TechnicalParameter.ParamType paramType;
private String url; private String url;
private String dataKey; private String dataKey;
private String argKey;
public static JSONArray getAll(){ public static JSONArray getAll(){
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
...@@ -55,6 +56,7 @@ public enum EquipAdvanceSearchEnum { ...@@ -55,6 +56,7 @@ public enum EquipAdvanceSearchEnum {
jsonObject.put("value", item.code); jsonObject.put("value", item.code);
jsonObject.put("key", item.code); jsonObject.put("key", item.code);
jsonObject.put("dataKey", item.dataKey); jsonObject.put("dataKey", item.dataKey);
jsonObject.put("argKey", item.argKey);
jsonObject.put("paramType", item.paramType); jsonObject.put("paramType", item.paramType);
jsonObject.put("isMulti", false); jsonObject.put("isMulti", false);
if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){ if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/PersonAdvanceSearchEnum.java
View file @ e0b78da1
...@@ -13,20 +13,20 @@ public enum PersonAdvanceSearchEnum { ...@@ -13,20 +13,20 @@ public enum PersonAdvanceSearchEnum {
/** /**
* 高级搜索枚举 * 高级搜索枚举
*/ */
NAME("人员名称", "name", TechnicalParameter.ParamType.STRING,"",null), NAME("人员名称", "name", TechnicalParameter.ParamType.STRING,"",null,null),
NEWPOST("人员类型", "newPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX",null), NEWPOST("人员类型", "newPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX",null,null),
SUBPOST("人员子类型", "subPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX",null), SUBPOST("人员子类型", "subPost",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryRYLX?type={type}",null,"newPost"),
// REGULATORY_LABELS("有无资质", "regulatoryLabels",null,""), // REGULATORY_LABELS("有无资质", "regulatoryLabels",null,""),
// REGULATORY_LABELS("资质状态", "regulatoryLabels",null,""), // REGULATORY_LABELS("资质状态", "regulatoryLabels",null,""),
CERT_TYPE("证书类型", "certType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertType",null), CERT_TYPE("证书类型", "certType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryCertType",null,null),
PERMISSION_LEVEL("证书级别", "permissionLevel",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryPermissionLevel",null), PERMISSION_LEVEL("证书级别", "permissionLevel",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryPermissionLevel",null,null),
JOB_ITEM("作业项目", "jobItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM",null), JOB_ITEM("作业项目", "jobItem",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryZYXM?type={type}",null,"certType|permissionLevel"),
ISSUE_DATE("发证日期", "issueDate",TechnicalParameter.ParamType.DATE,"",null), ISSUE_DATE("发证日期", "issueDate",TechnicalParameter.ParamType.DATE,"",null,null),
EDUCATION("学历", "education",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","XLLX"), EDUCATION("学历", "education",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryDicData","XLLX",null),
ADDRESS("住址", "address",TechnicalParameter.ParamType.STRING,"",null), ADDRESS("住址", "address",TechnicalParameter.ParamType.STRING,"",null,null),
UNITCODE("所属企业", "unitCode", TechnicalParameter.ParamType.STRING,"",null), UNITCODE("所属企业", "unitCode", TechnicalParameter.ParamType.STRING,"",null,null),
SUPERVISEORGCODE("管辖机构", "superviseOrgCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitByOrgCode",null), SUPERVISEORGCODE("管辖机构", "superviseOrgCode",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryUnitByOrgCode?type={type}",null,"orgTreeId"),
EQUIP_TYPE("监管设备类型", "equipType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null), EQUIP_TYPE("监管设备类型", "equipType",null,"/statistics/comprehensiveStatisticalAnalysis/select/queryEquipList",null,null),
; ;
...@@ -35,6 +35,7 @@ public enum PersonAdvanceSearchEnum { ...@@ -35,6 +35,7 @@ public enum PersonAdvanceSearchEnum {
private TechnicalParameter.ParamType paramType; private TechnicalParameter.ParamType paramType;
private String url; private String url;
private String dataKe; private String dataKe;
private String argKey;
public static JSONArray getAll(){ public static JSONArray getAll(){
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
...@@ -44,6 +45,7 @@ public enum PersonAdvanceSearchEnum { ...@@ -44,6 +45,7 @@ public enum PersonAdvanceSearchEnum {
jsonObject.put("value", item.code); jsonObject.put("value", item.code);
jsonObject.put("key", item.code); jsonObject.put("key", item.code);
jsonObject.put("dataKey", item.code); jsonObject.put("dataKey", item.code);
jsonObject.put("argKey", item.argKey);
jsonObject.put("paramType", item.paramType); jsonObject.put("paramType", item.paramType);
jsonObject.put("isMulti", false); jsonObject.put("isMulti", false);
if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){ if(TechnicalParameter.ParamType.BIG_DECIMAL.equals(item.paramType)){
......
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ComprehensiveStatisticalAnalysisController.java
View file @ e0b78da1
...@@ -142,8 +142,8 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController { ...@@ -142,8 +142,8 @@ public class ComprehensiveStatisticalAnalysisController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/select/queryUnitByOrgCode") @GetMapping(value = "/select/queryUnitByOrgCode")
@ApiOperation(httpMethod = "GET", value = "根据监管机构查询企业", notes = "根据监管机构查询企业") @ApiOperation(httpMethod = "GET", value = "根据监管机构查询企业", notes = "根据监管机构查询企业")
public ResponseModel<JSONArray> queryUnitByOrgCode(@RequestParam String orgCode) { public ResponseModel<JSONArray> queryUnitByOrgCode(@RequestParam String type) {
return ResponseHelper.buildResponse(statisticalAnalysisService.queryUnitByOrgCode(orgCode)); return ResponseHelper.buildResponse(statisticalAnalysisService.queryUnitByOrgCode(type));
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment