From f830341998eb11880bcdce5231ef9d5eb06f9920 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 1 Aug 2024 19:42:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(87795):=20=E9=A6=96=E9=A1=B5-=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E6=A3=80=E7=B4=A2-=E5=85=A8=E9=83=A8-=E6=9C=80?= =?UTF-8?q?=E5=A4=9A=E5=B1=95=E7=A4=BA=E5=8D=81=E6=9D=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/mapper/LawsHomeSearchMapper.java | 2 +- .../impl/LawsHomeSearchServiceImpl.java | 20 ++++++++++++++----- .../LawsHomeAdvancedSearchExportExcelVO.java | 4 ++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java index 17c52377..eb3d7924 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java @@ -104,7 +104,7 @@ public interface LawsHomeSearchMapper extends BaseMapper> getAdvancedSearchAll(IPage page, + IPage> getAdvancedSearchAll(IPage page, @Param("selectFieldByDomestic") String selectFieldByDomestic, @Param("selectFieldByEnterprise") String selectFieldByEnterprise, @Param("queryConditionByDomestic") String queryConditionByDomestic, diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java index 9402bd03..7452e9ff 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java @@ -1527,10 +1527,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { Map parameterMapByEnterprise = new HashMap<>(parameterMap); // 显示字段 - String selectFieldByDomestic = "standard_number, standard_name, null, " + - "implementation_date, new_product_impl_date, new_auth_impl_date, create_time, 1 resource_type"; - String selectFieldByEnterprise = "standard_number, standard_name, " + - "release_date, implementation_date, null, null, create_time, 3 resource_type"; + String selectFieldByDomestic = "standard_number, standard_name, null, implementation_date, " + + "new_product_impl_date, new_auth_impl_date, standard_state, create_time, 1 resource_type"; + String selectFieldByEnterprise = "standard_number, standard_name, release_date, implementation_date, " + + "null, null, standard_state, create_time, 3 resource_type"; // 构建搜索条件 String orderBy = "order by create_time desc"; @@ -1544,12 +1544,22 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { // 分页参数 long pageNo = Long.parseLong(String.valueOf(parameterMap.get("pageNo"))); long pageSize = Long.parseLong(String.valueOf(parameterMap.get("pageSize"))); - IPage page = new Page(pageNo, pageSize); + IPage page = new Page<>(pageNo, pageSize); // 查询数据 IPage> advancedSearchAll = lawsHomeSearchMapper.getAdvancedSearchAll(page, selectFieldByDomestic, selectFieldByEnterprise, queryConditionByDomestic, queryConditionByEnterprise); + + // 标准状态翻译 + for (Map data : advancedSearchAll.getRecords()) { + String resourceType = String.valueOf(data.get("resource_type")); + String standardState = String.valueOf(data.get(STANDARD_STATE)); + String code = LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD.equals(resourceType) + ? STANDARD_STATE : ENTERPRISE_STANDARD_STATE; + String dictText = sysDictService.queryDictTextByKey(code, standardState); + data.put("standard_state_dictText", dictText); + } return Result.OK(advancedSearchAll); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java index febd66af..23bcb4c1 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java @@ -66,6 +66,6 @@ public class LawsHomeAdvancedSearchExportExcelVO implements Serializable { * 标准状态 */ @ApiModelProperty(value = "标准状态") - @Excel(name = "标准状态", width = 20, dicCode = "standard_state") - private String standardState; + @Excel(name = "标准状态", width = 20) + private String standardStateDictText; }