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 1fd2a350..8e250451 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 @@ -1470,10 +1470,14 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { JSON.parseArray(JSON.toJSONString(commonPageNoPermissions), LawsHomeAdvancedSearchExportExcelVO.class); for (LawsHomeAdvancedSearchExportExcelVO lawsHomeAdvancedSearchExportExcelVO : lawsHomeAdvancedSearchExportExcelVOS) { + if (!Objects.isNull(lawsHomeAdvancedSearchExportExcelVO.getStandardState())){ + String dictText = sysDictService.queryDictTextByKey(ENTERPRISE_STANDARD_STATE, + lawsHomeAdvancedSearchExportExcelVO.getStandardState()); + lawsHomeAdvancedSearchExportExcelVO.setStandardStateDictText(dictText); + } lawsHomeAdvancedSearchExportExcelVO.setResourceType(LawsHomeSearchCommon.LAWS_ENTERPRISE_STANDARD); } - // Step.3 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); try { @@ -1501,6 +1505,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService { JSON.parseArray(JSON.toJSONString(commonPageNoPermissions), LawsHomeAdvancedSearchExportExcelVO.class); for (LawsHomeAdvancedSearchExportExcelVO lawsHomeAdvancedSearchExportExcelVO : lawsHomeAdvancedSearchExportExcelVOS) { + if (!Objects.isNull(lawsHomeAdvancedSearchExportExcelVO.getStandardState())){ + String dictText = sysDictService.queryDictTextByKey(STANDARD_STATE, + lawsHomeAdvancedSearchExportExcelVO.getStandardState()); + lawsHomeAdvancedSearchExportExcelVO.setStandardStateDictText(dictText); + } lawsHomeAdvancedSearchExportExcelVO.setResourceType(LawsHomeSearchCommon.LAWS_DOMESTIC_STANDARD); } 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 23bcb4c1..27db8d8f 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,11 @@ public class LawsHomeAdvancedSearchExportExcelVO implements Serializable { * 标准状态 */ @ApiModelProperty(value = "标准状态") + private String standardState; + /** + * 标准状态 翻译 + */ + @ApiModelProperty(value = "标准状态 翻译") @Excel(name = "标准状态", width = 20) private String standardStateDictText; }