From e558e91ecc5905aae8ff2b9fe6b717dd8a4ce518 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 29 Nov 2023 20:18:45 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E8=8E=B7=E5=8F=96=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/ILawsCommonService.java | 7 +++++++ .../service/impl/LawsCommonServiceImpl.java | 18 ++++++++++++++++++ .../controller/LawsDomesticController.java | 8 ++++++++ .../controller/LawsEnterpriseController.java | 8 ++++++++ .../controller/LawsOverseasController.java | 8 ++++++++ 5 files changed, 49 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java index 0da2f539..74eb19dd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java @@ -199,4 +199,11 @@ public interface ILawsCommonService { * @Description: 标准文本弹框 **/ List getSplitsByStandardNumber(String standardNumber); + + /** + * 获取高级检索条件 + * @param moduleValue + * @return + */ + List getAdvancedQueryCondition(String moduleValue); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 71e0af91..5c34d201 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -2204,6 +2204,24 @@ public class LawsCommonServiceImpl implements ILawsCommonService { return sarFileSplitInfoEOList; } + @Override + public List getAdvancedQueryCondition(String module) { + // 获取操作语言 + LanguageEnum language = MessageUtils.getLanguage(); + // 获取要操作的表名 + String tableName = TableNameEnum.getTableName(module); + // 获取全部字段 + List fieldList = lawsCommonMapper.getFieldList(tableName); + fieldList = fieldList.stream().filter(lawsTag -> YesOrNoEnum.YES.getInteger() + .equals(lawsTag.getIsShowSearch())).collect(Collectors.toList()); + for (LawsTag lawsTag : fieldList) { + if (LanguageEnum.EN.equals(language)) { + lawsTag.setDbFieldTxt(lawsTag.getDbFieldEnName()); + } + } + return fieldList; + } + /** * 创建企标导入模板的Workbook * diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index 52e19ef3..33344621 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -97,6 +97,14 @@ public class LawsDomesticController { return Result.OK(lawsCommonService.getQueryCondition(MODULE_VALUE)); } + @AutoLog(value = "国内法规标准-获取高级查询条件") + @ApiOperation(value="国内法规标准-获取高级查询条件", notes="国内法规标准-获取高级查询条件") + @GetMapping(value = "getAdvancedQueryCondition") + @ApiOperationSupport(order = 5) + public Result> getAdvancedQueryCondition() { + return Result.OK(lawsCommonService.getAdvancedQueryCondition(MODULE_VALUE)); + } + @AutoLog(value = "国内法规标准-获取表单模型") @ApiOperation(value="国内法规标准-获取表单模型", notes="国内法规标准-获取表单模型") @GetMapping(value = "getFormModel") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 67efd3f9..779f87e6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -116,6 +116,14 @@ public class LawsEnterpriseController { return Result.OK(lawsCommonService.getQueryCondition(MODULE_VALUE)); } + @AutoLog(value = "企业法规标准-获取高级查询条件") + @ApiOperation(value="企业法规标准-获取高级查询条件", notes="企业法规标准-获取高级查询条件") + @GetMapping(value = "getAdvancedQueryCondition") + @ApiOperationSupport(order = 5) + public Result> getAdvancedQueryCondition() { + return Result.OK(lawsCommonService.getAdvancedQueryCondition(MODULE_VALUE)); + } + @AutoLog(value = "企业法规标准-获取表单模型") @ApiOperation(value="企业法规标准-获取表单模型", notes="企业法规标准-获取表单模型") @GetMapping(value = "getFormModel") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 6e6b4ace..11e663ef 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -97,6 +97,14 @@ public class LawsOverseasController { return Result.OK(lawsCommonService.getQueryCondition(MODULE_VALUE)); } + @AutoLog(value = "海外法规标准-获取高级查询条件") + @ApiOperation(value="海外法规标准-获取高级查询条件", notes="海外法规标准-获取高级查询条件") + @GetMapping(value = "getAdvancedQueryCondition") + @ApiOperationSupport(order = 5) + public Result> getAdvancedQueryCondition() { + return Result.OK(lawsCommonService.getAdvancedQueryCondition(MODULE_VALUE)); + } + @AutoLog(value = "海外法规标准-获取表单模型") @ApiOperation(value="海外法规标准-获取表单模型", notes="海外法规标准-获取表单模型") @GetMapping(value = "getFormModel")