diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java index 77620cf7..5806c642 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java @@ -188,86 +188,8 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } - StringBuilder contentBuilder = new StringBuilder(); - contentBuilder.append("标准类别:").append(attrInfoMap.get("standSort")).append(" "); - contentBuilder.append("标准编号:").append(attrInfoMap.get("standNumber")).append(" "); - contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); - contentBuilder.append("标准名称:").append(attrInfoMap.get("standName")).append(" "); - contentBuilder.append("标准英文名称:").append(attrInfoMap.get("standEnName")).append(" "); - contentBuilder.append("标准性质:").append(attrInfoMap.get("standNatureName")).append(" "); - contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusName")).append(" "); - contentBuilder.append("标准发布日期:").append(attrInfoMap.get("issueTime")).append(" "); - contentBuilder.append("是否纳入认证清单:").append(attrInfoMap.get("isRelateAccessName")).append(" "); - - // 区分国内、海外 - if (isForeign) { - contentBuilder.append("标准状态:").append(attrInfoMap.get("standstateshow")).append(" "); - contentBuilder.append("标签:").append(attrInfoMap.get("gxhbq")).append(" "); - }else { - contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append(" "); - if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){ - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBHName")).append(" "); - }else { - contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBHName")).append(" "); - } - } - - contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQName")).append(" "); - contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQName")).append(" "); - contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQName")).append(" "); - - if (isForeign) { - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); - }else { - contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); -// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); - contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" "); -// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); - contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); - contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); - contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); - } - contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLXName")).append(" "); - contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); - contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); - contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); -// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); - contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); -// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); - contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); - contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); - contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); - contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); - contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCNName")).append(" "); - contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append(" "); - contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append(" "); - - contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJHName")).append(" "); - contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJName")).append(" "); - contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJName")).append(" "); - if (isForeign) { - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); - }else { - contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBHName")).append(" "); - contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCDName")).append(" "); - contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZName")).append(" "); - contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZName")).append(" "); - } - - if (attrInfoMap.containsKey("content")){ - if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ - String con = String.valueOf(attrInfoMap.get("content")); - con = con.replace(",",""); - if (StringUtils.isBlank(con)){ - attrInfoMap.put("content","--"); - } - } - } - - contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); - StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); - fullTextSearchEO.put("textContent",textContent.toString()); + // 逻辑字段 if ("FOREIGN".equals(String.valueOf(attrInfoMap.get("standType")))){ fullTextSearchEO.put("standTypeOrder","2"); }else { @@ -298,6 +220,92 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("issue_time", "--"); fullTextSearchEO.put("issue_time_order", "--"); } + + // 文本内容字段 + try { + StringBuilder contentBuilder = new StringBuilder(); + + contentBuilder.append("标准类别:").append(attrInfoMap.get("standSort")).append(" "); + contentBuilder.append("标准编号:").append(attrInfoMap.get("standNumber")).append(" "); + contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); + contentBuilder.append("标准名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("标准英文名称:").append(attrInfoMap.get("standEnName")).append(" "); + contentBuilder.append("标准性质:").append(attrInfoMap.get("standNatureName")).append(" "); + contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusName")).append(" "); + contentBuilder.append("标准发布日期:").append(attrInfoMap.get("issueTime")).append(" "); + contentBuilder.append("是否纳入认证清单:").append(attrInfoMap.get("isRelateAccessName")).append(" "); + + // 区分国内、海外 + if (isForeign) { + contentBuilder.append("标准状态:").append(attrInfoMap.get("standstateshow")).append(" "); + contentBuilder.append("标签:").append(attrInfoMap.get("gxhbq")).append(" "); + }else { + contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append(" "); + if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){ + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBHName")).append(" "); + }else { + contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBHName")).append(" "); + } + } + + contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQName")).append(" "); + contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQName")).append(" "); + contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQName")).append(" "); + + if (isForeign) { + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); + }else { + contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append(" "); +// contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append(" "); + contentBuilder.append("起草单位:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append(" "); + contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append(" "); + contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append(" "); + contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append(" "); + } + contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLXName")).append(" "); + contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append(" "); + contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append(" "); + contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append(" "); +// contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append(" "); + contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append(" "); +// contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append(" "); + contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append(" "); + contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append(" "); + contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append(" "); + contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append(" "); + contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCNName")).append(" "); + contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append(" "); + contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append(" "); + + contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJHName")).append(" "); + contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJName")).append(" "); + contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJName")).append(" "); + if (isForeign) { + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append(" "); + }else { + contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBHName")).append(" "); + contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCDName")).append(" "); + contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZName")).append(" "); + contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZName")).append(" "); + } + + if (attrInfoMap.containsKey("content")){ + if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ + String con = String.valueOf(attrInfoMap.get("content")); + con = con.replace(",",""); + if (StringUtils.isBlank(con)){ + attrInfoMap.put("content","--"); + } + } + } + + contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); + StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); + fullTextSearchEO.put("textContent",textContent.toString()); + }catch (Exception e){ + logger.info("err:" + errFilter(e.getMessage())); + } } else if("laws".equals(attrInfoMap.get("type"))){ // 政策全文 for (String key : attrInfoMap.keySet()) { @@ -305,60 +313,12 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } + // 逻辑字段 if(StringUtils.isNotBlank(attrInfoMap.getOrDefault("lawsName","").toString())){ fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+" "+attrInfoMap.getOrDefault("lawsNumber","")+" "+attrInfoMap.getOrDefault("lawsName","")); }else{ fullTextSearchEO.put("title",attrInfoMap.get("lawsTypeName")+" "+attrInfoMap.getOrDefault("lawsNumber","")+" "+attrInfoMap.getOrDefault("lawsEnName","")); } - - StringBuilder contentBuilder = new StringBuilder(); - contentBuilder.append("政策分类: ").append(attrInfoMap.get("lawsTypeName")).append(" "); - contentBuilder.append("政策编号: ").append(attrInfoMap.get("lawsNumber")).append(" "); - contentBuilder.append("中文名称: ").append(attrInfoMap.get("lawsName")).append(" "); - contentBuilder.append("英文名称: ").append(attrInfoMap.get("lawsEnName")).append(" "); - contentBuilder.append("政策文号: ").append(attrInfoMap.get("lawsNo")).append(" "); -// contentBuilder.append("发布日期:"+attrInfoMap.get("issueTime")+" "); - contentBuilder.append("地区: ").append(attrInfoMap.get("country")).append(" "); - contentBuilder.append("发文日期: ").append(attrInfoMap.get("issueTime")).append(" "); - contentBuilder.append("发文单位: ").append(attrInfoMap.get("issueCompany")).append(" "); - contentBuilder.append("征集意见周期-起始时间: ").append(attrInfoMap.get("commentCycleStart")).append(" "); - contentBuilder.append("征集意见周期-结束时间: ").append(attrInfoMap.get("commentCycleEnd")).append(" "); - contentBuilder.append("文本状态: ").append(attrInfoMap.get("lawsTextStateName")).append(" "); - contentBuilder.append("适用区域: ").append(attrInfoMap.get("lawsSyqyName")).append(" "); - contentBuilder.append("适用车型: ").append(attrInfoMap.get("lawsSycxName")).append(" "); - contentBuilder.append("是否纳入认证清单: ").append(attrInfoMap.get("isRelateAccessName")).append(" "); - contentBuilder.append("年度: ").append(attrInfoMap.get("lawsYearName")).append(" "); - contentBuilder.append("福田转发通知文号: ").append(attrInfoMap.get("lawsNotisyncNum")).append(" "); - contentBuilder.append("信息简报: ").append(attrInfoMap.get("lawsBulletin")).append(" "); - contentBuilder.append("标签: ").append(attrInfoMap.get("lawsLabel")).append(" "); - contentBuilder.append("备注: ").append(attrInfoMap.get("lawsRemark")).append(" "); - contentBuilder.append("实施日期（文本）: ").append(attrInfoMap.get("SSRQLAWSName")).append(" "); - contentBuilder.append("新车型实施日期（文本）: ").append(attrInfoMap.get("XCXSSRQLAWSName")).append(" "); - contentBuilder.append("在产车实施日期（文本）: ").append(attrInfoMap.get("ZCXSSRQLAWSName")).append(" "); - contentBuilder.append("发布机构: ").append(attrInfoMap.get("FBJGLAWSName")).append(" "); - contentBuilder.append("我司参与深度: ").append(attrInfoMap.get("CYSDLAWSName")).append(" "); - contentBuilder.append("投稿人: ").append(attrInfoMap.get("TGRLAWSName")).append(" "); - contentBuilder.append("投稿单位: ").append(attrInfoMap.get("TGRLAWSName")).append(" "); - contentBuilder.append("能源类型: ").append(attrInfoMap.get("NYLXLAWSName")).append(" "); - contentBuilder.append("适用认证: ").append(attrInfoMap.get("YYRZLAWSName")).append(" "); - contentBuilder.append("责任部门: ").append(attrInfoMap.get("ZRBMLAWSName")).append(" "); - contentBuilder.append("责任工程师: ").append(attrInfoMap.get("ZRGCSLAWSName")).append(" "); - contentBuilder.append("代替文件号: ").append(attrInfoMap.get("DTWJHLAWSName")).append(" "); - contentBuilder.append("被代替文件号: ").append(attrInfoMap.get("BDTWJHLAWSName")).append(" "); - contentBuilder.append("引用标准&政策: ").append(attrInfoMap.get("YYBZZCLAWSName")).append(" "); -// contentBuilder.append("相关资料:"+attrInfoMap.get("")+" "); - if (attrInfoMap.containsKey("content")){ - if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ - String con = String.valueOf(attrInfoMap.get("content")); - con = con.replace(",",""); - if (StringUtils.isBlank(con)){ - attrInfoMap.put("content",""); - } - } - } - contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); - StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); - fullTextSearchEO.put("textContent",textContent.toString()); fullTextSearchEO.put("standTypeOrder","4"); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("lawsTypeName")),dicMap)); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("lawsYearName"))); @@ -376,6 +336,60 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("issue_time", "--"); fullTextSearchEO.put("issue_time_order", "--"); } + + // 文本内容字段 + try { + StringBuilder contentBuilder = new StringBuilder(); + contentBuilder.append("政策分类: ").append(attrInfoMap.get("lawsTypeName")).append(" "); + contentBuilder.append("政策编号: ").append(attrInfoMap.get("lawsNumber")).append(" "); + contentBuilder.append("中文名称: ").append(attrInfoMap.get("lawsName")).append(" "); + contentBuilder.append("英文名称: ").append(attrInfoMap.get("lawsEnName")).append(" "); + contentBuilder.append("政策文号: ").append(attrInfoMap.get("lawsNo")).append(" "); +// contentBuilder.append("发布日期:"+attrInfoMap.get("issueTime")+" "); + contentBuilder.append("地区: ").append(attrInfoMap.get("country")).append(" "); + contentBuilder.append("发文日期: ").append(attrInfoMap.get("issueTime")).append(" "); + contentBuilder.append("发文单位: ").append(attrInfoMap.get("issueCompany")).append(" "); + contentBuilder.append("征集意见周期-起始时间: ").append(attrInfoMap.get("commentCycleStart")).append(" "); + contentBuilder.append("征集意见周期-结束时间: ").append(attrInfoMap.get("commentCycleEnd")).append(" "); + contentBuilder.append("文本状态: ").append(attrInfoMap.get("lawsTextStateName")).append(" "); + contentBuilder.append("适用区域: ").append(attrInfoMap.get("lawsSyqyName")).append(" "); + contentBuilder.append("适用车型: ").append(attrInfoMap.get("lawsSycxName")).append(" "); + contentBuilder.append("是否纳入认证清单: ").append(attrInfoMap.get("isRelateAccessName")).append(" "); + contentBuilder.append("年度: ").append(attrInfoMap.get("lawsYearName")).append(" "); + contentBuilder.append("福田转发通知文号: ").append(attrInfoMap.get("lawsNotisyncNum")).append(" "); + contentBuilder.append("信息简报: ").append(attrInfoMap.get("lawsBulletin")).append(" "); + contentBuilder.append("标签: ").append(attrInfoMap.get("lawsLabel")).append(" "); + contentBuilder.append("备注: ").append(attrInfoMap.get("lawsRemark")).append(" "); + contentBuilder.append("实施日期（文本）: ").append(attrInfoMap.get("SSRQLAWSName")).append(" "); + contentBuilder.append("新车型实施日期（文本）: ").append(attrInfoMap.get("XCXSSRQLAWSName")).append(" "); + contentBuilder.append("在产车实施日期（文本）: ").append(attrInfoMap.get("ZCXSSRQLAWSName")).append(" "); + contentBuilder.append("发布机构: ").append(attrInfoMap.get("FBJGLAWSName")).append(" "); + contentBuilder.append("我司参与深度: ").append(attrInfoMap.get("CYSDLAWSName")).append(" "); + contentBuilder.append("投稿人: ").append(attrInfoMap.get("TGRLAWSName")).append(" "); + contentBuilder.append("投稿单位: ").append(attrInfoMap.get("TGRLAWSName")).append(" "); + contentBuilder.append("能源类型: ").append(attrInfoMap.get("NYLXLAWSName")).append(" "); + contentBuilder.append("适用认证: ").append(attrInfoMap.get("YYRZLAWSName")).append(" "); + contentBuilder.append("责任部门: ").append(attrInfoMap.get("ZRBMLAWSName")).append(" "); + contentBuilder.append("责任工程师: ").append(attrInfoMap.get("ZRGCSLAWSName")).append(" "); + contentBuilder.append("代替文件号: ").append(attrInfoMap.get("DTWJHLAWSName")).append(" "); + contentBuilder.append("被代替文件号: ").append(attrInfoMap.get("BDTWJHLAWSName")).append(" "); + contentBuilder.append("引用标准&政策: ").append(attrInfoMap.get("YYBZZCLAWSName")).append(" "); +// contentBuilder.append("相关资料:"+attrInfoMap.get("")+" "); + if (attrInfoMap.containsKey("content")){ + if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ + String con = String.valueOf(attrInfoMap.get("content")); + con = con.replace(",",""); + if (StringUtils.isBlank(con)){ + attrInfoMap.put("content",""); + } + } + } + contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); + StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); + fullTextSearchEO.put("textContent",textContent.toString()); + }catch (Exception e){ + logger.info("err:" + errFilter(e.getMessage())); + } }else if ("bussstand".equals(attrInfoMap.get("type"))){ for (String key : attrInfoMap.keySet()) { @@ -388,44 +402,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { }else{ fullTextSearchEO.put("title",attrInfoMap.get("stand_code")+" "+attrInfoMap.getOrDefault("stand_en_name","")); } - StringBuilder contentBuilder = new StringBuilder(); - contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); - contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); - contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" "); - contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); - contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); - contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); - contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); - contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); - contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); -// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); - contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" "); -// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); - contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" "); - contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" "); - contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" "); - contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" "); - contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXCLASSName")).append(" "); - contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBBUSSName")).append(" "); - contentBuilder.append("关联模块VPPS编码:").append(attrInfoMap.get("VPPSBMBUSSName")).append(" "); - contentBuilder.append("关联模块中文名称:").append(attrInfoMap.get("VPPSCNBUSSName")).append(" "); - contentBuilder.append("代替企标编号:").append(attrInfoMap.get("DTQBBHBUSSName")).append(" "); - contentBuilder.append("被代替企标编号:").append(attrInfoMap.get("BDTQBBHBUSSName")).append(" "); - - if (attrInfoMap.containsKey("content")){ - if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ - String con = String.valueOf(attrInfoMap.get("content")); - con = con.replace(",",""); - if (StringUtils.isBlank(con)){ - attrInfoMap.put("content","--"); - } - } - } - contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); -// contentBuilder.append("相关计划:"+String.valueOf(attrInfoMap.get(""))+" "); - - StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); - fullTextSearchEO.put("textContent",textContent.toString()); + // 逻辑字段 fullTextSearchEO.put("standTypeOrder","3"); fullTextSearchEO.put("standSortOrder",esStateOrder(String.valueOf(attrInfoMap.get("standSort")),dicMap)); fullTextSearchEO.put("yearOrder", String.valueOf(attrInfoMap.get("standYear"))); @@ -442,10 +419,60 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { fullTextSearchEO.put("issue_time", "--"); fullTextSearchEO.put("issue_time_order", "--"); } + // 文本内容字段 + try { + StringBuilder contentBuilder = new StringBuilder(); + contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); + contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); + contentBuilder.append("企标名称:").append(attrInfoMap.get("stand_name")).append(" "); + contentBuilder.append("企标英文名称:").append(attrInfoMap.get("stand_en_name")).append(" "); + contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); + contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).append(" "); + contentBuilder.append("企标发布日期:").append(attrInfoMap.get("issueTime")).append(" "); + contentBuilder.append("废止日期:").append(attrInfoMap.get("FZRQBUSSName")).append(" "); + contentBuilder.append("复审日期:").append(attrInfoMap.get("FSRQBUSSName")).append(" "); +// contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDWName")).append(" "); + contentBuilder.append("起草部门:").append(attrInfoMap.get("QCDW")).append(" "); +// contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).append(" "); + contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSS")).append(" "); + contentBuilder.append("文件上传人员:").append(attrInfoMap.get("WJSCRYBUSSName")).append(" "); + contentBuilder.append("适用车型:").append(attrInfoMap.get("SYCXCLASSName")).append(" "); + contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXCLASSName")).append(" "); + contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXCLASSName")).append(" "); + contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBBUSSName")).append(" "); + contentBuilder.append("关联模块VPPS编码:").append(attrInfoMap.get("VPPSBMBUSSName")).append(" "); + contentBuilder.append("关联模块中文名称:").append(attrInfoMap.get("VPPSCNBUSSName")).append(" "); + contentBuilder.append("代替企标编号:").append(attrInfoMap.get("DTQBBHBUSSName")).append(" "); + contentBuilder.append("被代替企标编号:").append(attrInfoMap.get("BDTQBBHBUSSName")).append(" "); + + if (attrInfoMap.containsKey("content")){ + if (null !=attrInfoMap.get("content") && StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("content")))){ + String con = String.valueOf(attrInfoMap.get("content")); + con = con.replace(",",""); + if (StringUtils.isBlank(con)){ + attrInfoMap.put("content","--"); + } + } + } + contentBuilder.append("标准文本: ").append(attrInfoMap.get("content")).append(" "); +// contentBuilder.append("相关计划:"+String.valueOf(attrInfoMap.get(""))+" "); + + StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); + fullTextSearchEO.put("textContent",textContent.toString()); + }catch (Exception e){ + logger.info("err:" + errFilter(e.getMessage())); + } } return fullTextSearchEO; } + private String errFilter(String str){ + if (str.contains("Cause")){ + str = str.split("Cause")[0].replaceAll("\\r\\n###",""); + } + return str; + } + private String esStateOrder(String data, Map dicMap){ if(StringUtils.isNotBlank(data)){ data = data.replace(" ",""); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index b6c1068f..376af408 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -83,8 +83,8 @@ public class SarBussionessStandController extends BaseController getStandInfoByReviseStatus(String reviseStatus) { - SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus); + public ResponseMessage getStandInfoByReviseStatus(String reviseStatus,String standSort) { + SarBussionessStand result = sarBussionessStandEOService.getStandInfoByReviseStatus(reviseStatus,standSort); return Result.success(result); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 84b36f01..49cef6a8 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -38,7 +38,7 @@ public interface SarBussionessStandDao extends BaseMapper { List queryByBussStateSync(SarBussionessStand sarBussionessStand); - SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort); SarBussionessStand selectByPrimaryKey(String standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index eafda7a5..4ab28a1e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -19,7 +19,7 @@ import java.util.List; */ public interface ISarBussionessStandService extends IService { - SarBussionessStand getStandInfoByReviseStatus(String reviseStatus); + SarBussionessStand getStandInfoByReviseStatus(String reviseStatus,String standSort); void attrInfoDetails (SarBussionessStand row) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 84b93d36..9e1d44df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -162,8 +162,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl deleteSarBussionessStand(SarBussionessStandEOPage page) throws Exception { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java index 371858e1..d1c84a84 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -16,6 +16,8 @@ public class SarBussionessStandEOPage extends BasePage { private String textStatusBuss; + private String reviseStatus; + public String getTextStatusBuss() { return textStatusBuss; } @@ -176,6 +178,14 @@ public class SarBussionessStandEOPage extends BasePage { private String syncParam; + public String getReviseStatus() { + return reviseStatus; + } + + public void setReviseStatus(String reviseStatus) { + this.reviseStatus = reviseStatus; + } + public String getSyncParam() { return syncParam; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java index 5982d778..eca54f03 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/BussStandExportUtil.java @@ -106,6 +106,9 @@ public class BussStandExportUtil { case "文本状态": value = verifyBean(sarStandardsInfoEO.getStandStatusShow()); break; + case "企标制修订状态": + value = verifyBean(sarStandardsInfoEO.getReviseStatus()); + break; case "企标实施日期": String putTime=""; if(sarStandardsInfoEO.getPutTime() != null){ @@ -160,7 +163,32 @@ public class BussStandExportUtil { private static String verifyBean(String value){ String val = ""; if(StringUtils.isNotBlank(value)){ - val =value; + if(value.contains("buss1_")){ + if("buss1_1".equals(value)){ + val = "制定"; + }else if("buss1_2".equals(value)){ + val = "修订"; + }else { + val = ""; + } + }else if(value.contains("buss2_")){ + switch (value) { + case "buss2_1": + val = "制定"; + break; + case "buss2_2": + val = "修订"; + break; + case "buss2_3": + val = "修改"; + break; + default: + val = ""; + break; + } + }else { + val =value; + } }else { val = ""; } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java index 18a5bf30..1e8f3a1b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/FieldConvertUtil.java @@ -54,7 +54,7 @@ public class FieldConvertUtil { "个性化标签,政策文本,过程稿件,新车型实施日期（文本）,在产车实施日期（文本）,EOP实施日期（文本）,SVPPS," + "相关部门,责任部门,FO,维护工程师,归口管理部门,发布机构,我司是否参与,相关资料"; - public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期"; + public static String exportBaseFieldNamesBuss = "企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态"; public static String exportAttrFieldNamesBuss = "SVPPS,规范性引用文件,废止日期,复审日期,密级,授权,相关部门," + "需会签部门,起草部门,主要起草人,起草分标委,企标文本,过程文本"; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml index ea2a0ca4..bf96e138 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/askQuestions/AskQuestionsMapper.xml @@ -6,9 +6,10 @@ SELECT DISTINCT aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING, - aq.STANDARD_NAME + aq.STANDARD_NAME, + MAX(aq.QUESTION_TIME) as questionTime FROM ask_questions aq - LEFT JOIN reply ON aq.ID = reply.ASK_ID + LEFT JOIN (SELECT DISTINCT re.ANSWERER,re.ASK_ID FROM reply re) reply ON aq.ID = reply.ASK_ID LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER LEFT JOIN ts_user t2 ON t2.USID = reply.ANSWERER @@ -37,6 +38,13 @@ AND reply.ANSWERER = #{askQuestions.answerer} + GROUP BY + aq.STANDARD_ID, + aq.CLASSIFICATION, + aq.STANDARD_ENCDOING, + aq.STANDARD_NAME + ORDER BY + questionTime DESC SELECT - DISTINCT aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING, - aq.STANDARD_NAME + aq.STANDARD_NAME, + MAX(aq.QUESTION_TIME) as questionTime FROM ask_questions aq LEFT JOIN reply ON aq.ID = reply.ASK_ID AND reply.STATE = '0' LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER @@ -99,6 +107,13 @@ AND aq.CLASSIFICATION = #{askQuestions.classification} + GROUP BY + aq.STANDARD_ID, + aq.CLASSIFICATION, + aq.STANDARD_ENCDOING, + aq.STANDARD_NAME + ORDER BY + questionTime DESC SELECT - DISTINCT - aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,aq.STANDARD_NAME + aq.STANDARD_ID,aq.CLASSIFICATION,aq.STANDARD_ENCDOING,aq.STANDARD_NAME, + MAX(aq.QUESTION_TIME) as questionTime FROM ask_questions aq LEFT JOIN reply ON aq.ID = reply.ASK_ID LEFT JOIN ts_user t1 ON t1.USID = aq.QUESTIONER @@ -134,6 +149,13 @@ AND aq.CLASSIFICATION = #{askQuestions.classification} + GROUP BY + aq.STANDARD_ID, + aq.CLASSIFICATION, + aq.STANDARD_ENCDOING, + aq.STANDARD_NAME + ORDER BY + questionTime DESC @@ -488,6 +487,9 @@ and text_status_buss=#{textStatusBuss} + + and revise_status=#{reviseStatus} + and SAR_BUSSIONESS_STAND.MODIFY_TIME between DATE_SUB(NOW(),INTERVAL 7 day) and DATE_SUB(NOW(),INTERVAL -1 day) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml index ff6a748f..722f5ea0 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandIdea/SarPublicIdeaAllMapper.xml @@ -3,7 +3,7 @@ @@ -31,7 +32,7 @@ FROM ( SELECT (@i:=@i+1) as rows, - sar_public_idea_all.id,sar_public_idea_all.reason,ts_institution.name as dept_name,sar_public_idea_all.old_text, + sar_public_idea_all.id,sar_public_idea_all.reason,concat(t2.name,'_',ts_institution.name) as dept_name,sar_public_idea_all.old_text, sar_public_idea_all.wk_flag,sar_public_idea_all.new_text,ts_user.INSTITUTION_ID as dept_id, sar_public_idea_all.part_code,sar_public_idea_all.user_name, sar_public_idea_all.user_id,sar_public_idea_all.content,sar_public_idea_all.idea_id,sar_public_idea_all.cid, @@ -39,6 +40,7 @@ FROM (sar_public_idea_all,(SELECT @i:=0)j) left join ts_user on sar_public_idea_all.user_id=ts_user.USID left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID + left join ts_institution t2 on ts_institution.parent_id=t2.id WHERE sar_public_idea_all.idea_id = #{ideaId} )c @@ -53,11 +55,12 @@