diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml index 329593fa..9f1798f8 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml @@ -5,40 +5,15 @@ diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java index b1bbf7db..e31b45cb 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java @@ -38,61 +38,7 @@ public class LawsSysApiInfoServiceImpl extends ServiceImpl>> getStandardData(Map parameterMap) { - // todo 未添加对接系统验证 未修改业务返回数据 - Map parameterMapByDomestic = new HashMap<>(parameterMap); - Map parameterMapByEnterprise = new HashMap<>(parameterMap); - - // 显示字段 - String selectFieldByDomestic = "standard_number, standard_name, resource_type"; - String selectFieldByEnterprise = "standard_number, standard_name, resource_type"; - - // 构建搜索条件 - String orderBy = "order by create_time desc"; - parameterMapByDomestic.put(FieldCommon.MODULE, TableNameEnum.DOMESTIC_REGULATIONS.getValue()); - parameterMapByEnterprise.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); - // 关联部门字段不一致 特殊处理 - if (parameterMap.containsKey("associate_dept")){ - parameterMapByEnterprise.put("related_department", parameterMap.get("associate_dept")); - } - String queryConditionByDomestic = - lawsCommonService.buildQueryCondition(parameterMapByDomestic).replace(orderBy, ""); - String queryConditionByEnterprise = - lawsCommonService.buildQueryCondition(parameterMapByEnterprise).replace(orderBy, ""); - - // 分页参数 - 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> 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); - - if (!Objects.isNull(data.get("release_date"))){ - Date releaseDate = (Date) data.get("release_date"); - data.put("release_date", new SimpleDateFormat("yyyy-MM-dd").format(releaseDate)); - } - if (!Objects.isNull(data.get("implementation_date"))){ - try{ - Date implementationDate = (Date) data.get("implementation_date"); - data.put("implementation_date", new SimpleDateFormat("yyyy-MM-dd").format(implementationDate)); - }catch (Exception e){ - String implementationDate = data.get("implementation_date").toString(); - data.put("implementation_date", implementationDate); - } - } - } - return Result.OK(advancedSearchAll); + return Result.OK(); } }