QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(87795): 首页-高级检索-全部-最多展示十条数据

Browse Source
This commit is contained in:
yjz
2024-08-01 19:42:39 +08:00
parent 980f9e7ffa
commit f830341998
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/home/mapper/LawsHomeSearchMapper.java
+1 -1
View File
@@ -104,7 +104,7 @@ public interface LawsHomeSearchMapper extends BaseMapper<LawsHomeNormalSearchHis
* @param queryConditionByEnterprise * @param queryConditionByEnterprise
* @return * @return
*/ */
IPage<Map<String, Object>> getAdvancedSearchAll(IPage page, IPage<Map<String, Object>> getAdvancedSearchAll(IPage<Object> page,
@Param("selectFieldByDomestic") String selectFieldByDomestic, @Param("selectFieldByDomestic") String selectFieldByDomestic,
@Param("selectFieldByEnterprise") String selectFieldByEnterprise, @Param("selectFieldByEnterprise") String selectFieldByEnterprise,
@Param("queryConditionByDomestic") String queryConditionByDomestic, @Param("queryConditionByDomestic") String queryConditionByDomestic,
laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+15 -5
View File
@@ -1527,10 +1527,10 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
Map<String, Object> parameterMapByEnterprise = new HashMap<>(parameterMap); Map<String, Object> parameterMapByEnterprise = new HashMap<>(parameterMap);
// 显示字段 // 显示字段
String selectFieldByDomestic = "standard_number, standard_name, null, " + String selectFieldByDomestic = "standard_number, standard_name, null, implementation_date, " +
"implementation_date, new_product_impl_date, new_auth_impl_date, create_time, 1 resource_type"; "new_product_impl_date, new_auth_impl_date, standard_state, create_time, 1 resource_type";
String selectFieldByEnterprise = "standard_number, standard_name, " + String selectFieldByEnterprise = "standard_number, standard_name, release_date, implementation_date, " +
"release_date, implementation_date, null, null, create_time, 3 resource_type"; "null, null, standard_state, create_time, 3 resource_type";
// 构建搜索条件 // 构建搜索条件
String orderBy = "order by create_time desc"; 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 pageNo = Long.parseLong(String.valueOf(parameterMap.get("pageNo")));
long pageSize = Long.parseLong(String.valueOf(parameterMap.get("pageSize"))); long pageSize = Long.parseLong(String.valueOf(parameterMap.get("pageSize")));
IPage page = new Page(pageNo, pageSize); IPage<Object> page = new Page<>(pageNo, pageSize);
// 查询数据 // 查询数据
IPage<Map<String, Object>> advancedSearchAll = IPage<Map<String, Object>> advancedSearchAll =
lawsHomeSearchMapper.getAdvancedSearchAll(page, selectFieldByDomestic, selectFieldByEnterprise, lawsHomeSearchMapper.getAdvancedSearchAll(page, selectFieldByDomestic, selectFieldByEnterprise,
queryConditionByDomestic, queryConditionByEnterprise); queryConditionByDomestic, queryConditionByEnterprise);
// 标准状态翻译
for (Map<String, Object> 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); return Result.OK(advancedSearchAll);
} }
laws-modules/src/main/java/com/jero/modules/laws/home/vo/LawsHomeAdvancedSearchExportExcelVO.java
+2 -2
View File
@@ -66,6 +66,6 @@ public class LawsHomeAdvancedSearchExportExcelVO implements Serializable {
* 标准状态 * 标准状态
*/ */
@ApiModelProperty(value = "标准状态") @ApiModelProperty(value = "标准状态")
@Excel(name = "标准状态", width = 20, dicCode = "standard_state") @Excel(name = "标准状态", width = 20)
private String standardState; private String standardStateDictText;
} }