From 02a8b6c96967ffbb4dfb5333f0983611a4c3171a Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 24 Aug 2021 17:29:53 +0800 Subject: [PATCH] feat: There is no way the ES BUSS --- .../da/search/entity/SeniorSearchInfoEO.java | 7 + .../service/impl/SearchCenterServiceImpl.java | 191 +++------- .../impl/StandLawsSearchServiceImpl.java | 66 ++-- .../com/adc/da/mq/CreateStandMQService.java | 2 +- .../java/com/adc/da/mq/SendBussMQService.java | 67 ++-- .../dao/SarBussStandMenuDao.java | 2 + .../dao/SarBussionessStandDao.java | 2 + .../entity/SarBussionessStand.java | 343 +++++++++++++++++- .../impl/SarBussionessStandServiceImpl.java | 86 ++++- .../SarBussionessStandMapper.xml | 6 +- 10 files changed, 522 insertions(+), 250 deletions(-) diff --git a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java index 73f47f22..e48419ea 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java +++ b/adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java @@ -40,6 +40,9 @@ public class SeniorSearchInfoEO extends BasePage { @ApiModelProperty(value = "标准编号") private String standNumber; + @ApiModelProperty(value = "企标编号") + private String standCode; + @ApiModelProperty(value = "标准年份") private String standYear; @@ -107,6 +110,9 @@ public class SeniorSearchInfoEO extends BasePage { @ApiModelProperty(value = "文本状态") private String textStatus; + @ApiModelProperty(value = "文本状态-企标") + private String textStatusBuss; + @ApiModelProperty(value = "标准体系") private String standSystem; @@ -223,6 +229,7 @@ public class SeniorSearchInfoEO extends BasePage { private String advanceSearchVOStr; private String CLLX; private String CYSD; + private String QCDW; private String CBCD; private String ZRLX; private String SYCLLX; diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 0ee34bf2..5d76f289 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -153,44 +153,20 @@ public class SearchCenterServiceImpl implements SearchCenterService { .should(QueryBuilders.wildcardQuery("stand_number", "*"+searchInfoEO.getSelectValue()+"*")); break; case "bussstand": - multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(), - numbershowSplit,nameshowSplit,numbershowStr,nameshowStr,"numberExpNull","standstateshow", "standEnName",replaceStandNumStr, - replacedStandNumStr,"countryShow","synopsis","standSortShow","ZQCBMShow","ZQCBM","stand_status", - "baseSearchContent",content,"numbershow","nameshow","standstateshow","issue_time","replaceStandNum","replacedStandNum","QBMJShow","QBSQShow","XHQBMShow","SVPPSName","XGBMName","ZYQCRShow","ZRBMShow","ZQCBMName","QTQCRShow","content","FSRQString","FZRQString","put_time","XGLC","WFSPJSName","GFXYYWJ","XGBMShow").minimumShouldMatch("100%"); - boolQueryMust.must(multiQueryBuilder); - boolQueryShould.should(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(numbershowStr, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(numbershowSplit, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery(nameshowSplit, "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZQCBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZQCBM", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("stand_status", "*"+searchInfoEO.getSelectValue()+"*")) - - .should(QueryBuilders.wildcardQuery("numbershow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standEnName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("content", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("nameshow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("standstateshow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("replaceStandNum", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("replacedStandNum", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("QBMJShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("QBSQShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XHQBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("SVPPSName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XGBMName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZYQCRShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZRBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("ZQCBMName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("QTQCRShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FSRQString", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("FZRQString", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XGLC", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("WFSPJSName", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("GFXYYWJ", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("XGBMShow", "*"+searchInfoEO.getSelectValue()+"*")) - .should(QueryBuilders.wildcardQuery("put_time", "*"+searchInfoEO.getSelectValue()+"*")); + boolQueryShould.should(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("stand_code.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*")) + .should(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getSelectValue()+"*")); + if (isRqFormat(searchInfoEO.getSelectValue())) { + Long starttime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); + Long endtime = dateFormatToStr(searchInfoEO.getSelectValue()).getTime(); + RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); + boolQueryShould.should(rangeQueryBuilder); + RangeQueryBuilder rangeQueryBuilder2 = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); + boolQueryShould.should(rangeQueryBuilder2); + } break; default: break; } @@ -262,6 +238,12 @@ public class SearchCenterServiceImpl implements SearchCenterService { if(sarStandAttrEOStr == null){ collectAttrMap = new TreeMap<>(); + if(searchInfoEO.getQCDW() != null && StringUtils.isNotBlank(searchInfoEO.getQCDW())){ + List fieldList = Arrays.asList(searchInfoEO.getQCDW() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); + JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList)); + collectAttrMap.put("QCDW",array); + } + if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){ List fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList)); @@ -576,115 +558,42 @@ public class SearchCenterServiceImpl implements SearchCenterService { * boolQueryBuilder :must * */ public BoolQueryBuilder queryBussStandMsg(SeniorSearchInfoEO searchInfoEO, BoolQueryBuilder boolQueryBuilder, SearchRequestBuilder searchRequestBuilder) throws Exception{ - String nameshowStr = "nameshow"; - String replacedStandNumStr = "replaced_stand_num"; - String replaceStandNumStr = "replace_stand_num"; - // 高级搜索项，只针对标准 - //分类代号 - if (StringUtils.isNotBlank(searchInfoEO.getClassifyCode())) { - boolQueryBuilder.must(QueryBuilders.matchQuery("classifyCode", searchInfoEO.getClassifyCode())); - } - //编号，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtils.isNotBlank(searchInfoEO.getStandNumber())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("standNumber", "*"+searchInfoEO.getStandNumber()+"*")); - } - //名称，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtils.isNotBlank(searchInfoEO.getNameShow())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery(nameshowStr, "*"+searchInfoEO.getNameShow()+"*")); - } - //标准英文名称 - if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) { - boolQueryBuilder.must(QueryBuilders.matchQuery("standEnName", searchInfoEO.getStandEnName())); - } - if (searchInfoEO.getPutYear() != null && StringUtils.isNotEmpty(searchInfoEO.getPutYear())) { - boolQueryBuilder.must(QueryBuilders.wildcardQuery("putYear", "*"+searchInfoEO.getPutYear()+"*")); - } - //代替标准号 - if (StringUtils.isNotBlank(searchInfoEO.getReplaceStandNum())) { - boolQueryBuilder.must(QueryBuilders.matchQuery(replaceStandNumStr, searchInfoEO.getReplaceStandNum())); - } - //主起草部门 - if (StringUtils.isNotBlank(searchInfoEO.getZQCBM())) { - boolQueryBuilder.must(QueryBuilders.matchQuery("ZQCBM", searchInfoEO.getZQCBM())); - } - //被代替标准号 - if (StringUtils.isNotBlank(searchInfoEO.getReplacedStandNum())) { - boolQueryBuilder.must(QueryBuilders.matchQuery(replacedStandNumStr, searchInfoEO.getReplacedStandNum())); - } - //标准状态，国内外标准，国内外法规，企业标准 有此属性 - if (StringUtils.isNotBlank(searchInfoEO.getStandState())) { - // 如果等于All，相当于不限制，查询全部 - if (!searchInfoEO.getStandState().equals("all") && !searchInfoEO.getStandState().equals("[]")) { - String[] arrlist = searchInfoEO.getStandState().split(","); - boolQueryBuilder.must(QueryBuilders.termsQuery("statecode.keyword", arrlist)); - //boolQueryBuilder.must(QueryBuilders.matchQuery("statecode", searchInfoEO.getStandState())); + if(searchInfoEO.getSelectValue() == null || searchInfoEO.getSelectValue().equals("")){ + // 高级搜索项，只针对标准 + if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("standSort.keyword", "*"+searchInfoEO.getStandSort()+"*")); } - } - //发布日期 - if (searchInfoEO.getIssueTime() != null) { - Long starttime = searchInfoEO.getIssueTime().getTime(); - Long endtime = searchInfoEO.getIssueTime().getTime(); - RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); - boolQueryBuilder.filter(rangeQueryBuilder); - } - //实施日期，国内外标准，国内外法规，企业标准 有此属性 - if (searchInfoEO.getPutTime() != null) { - Long starttime = searchInfoEO.getPutTime().getTime(); - Long endtime = searchInfoEO.getPutTime().getTime(); - RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery("put_time").format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); - boolQueryBuilder.filter(rangeQueryBuilder); - } - //国家，国内外标准，国内外法规有此属性 - if (StringUtils.isNotBlank(searchInfoEO.getCountry())) { - // 如果等于All，相当于不限制，查询全部 - if (!searchInfoEO.getCountry().equals("all") && !searchInfoEO.getCountry().equals("[]") ) { - String[] arrlist = searchInfoEO.getCountry().split(","); - boolQueryBuilder.must(QueryBuilders.termsQuery("country.keyword", arrlist)); + if (StringUtils.isNotBlank(searchInfoEO.getStandCode())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("standCode.keyword", "*"+searchInfoEO.getStandCode()+"*")); } - } - //标准类别，国内外标准有此属性 - if (StringUtils.isNotBlank(searchInfoEO.getStandSort())) { - // 如果等于All，相当于不限制，查询全部 - if (!searchInfoEO.getStandSort().equals("all")&& !searchInfoEO.getStandSort().equals("[]")) { - String[] arrlist = searchInfoEO.getStandSort().split(","); - boolQueryBuilder.must(QueryBuilders.termsQuery("stand_sort.keyword", arrlist)); - //boolQueryBuilder.must(QueryBuilders.matchQuery("stand_sort", searchInfoEO.getStandSort())); + if (StringUtils.isNotBlank(searchInfoEO.getStandYear())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("standYear.keyword", "*"+searchInfoEO.getStandYear()+"*")); } - } - //发布时间范围 - if (searchInfoEO.getIssueTimeSt() != null || searchInfoEO.getIssueTimeEd() != null) { - Long starttime = 0L; - Long endtime = 0L; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (searchInfoEO.getIssueTimeSt() != null) { - starttime = searchInfoEO.getIssueTimeSt().getTime(); - } else { - starttime = sdf.parse("1970-01-01 00:00:00").getTime(); + if (StringUtils.isNotBlank(searchInfoEO.getStandName())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("standName.keyword", "*"+searchInfoEO.getStandName()+"*")); } - if (searchInfoEO.getIssueTimeEd() != null) { - endtime = searchInfoEO.getIssueTimeEd().getTime(); - } else { - endtime = sdf.parse("2999-01-01 00:00:00").getTime(); + if (StringUtils.isNotBlank(searchInfoEO.getStandEnName())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getStandEnName()+"*")); } - RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); - boolQueryBuilder.filter(rangeQueryBuilder); - } - if (searchInfoEO.getPutTimeSt() != null || searchInfoEO.getPutTimeEd() != null) { - Long starttime = 0L; - Long endtime = 0L; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (searchInfoEO.getPutTimeSt() != null) { - starttime = searchInfoEO.getPutTimeSt().getTime(); - } else { - starttime = sdf.parse("1970-01-01 00:00:00").getTime(); + + if (StringUtils.isNotBlank(searchInfoEO.getTextStatusBuss())) { + boolQueryBuilder.must(QueryBuilders.wildcardQuery("textStatusBuss.keyword", "*"+searchInfoEO.getTextStatusBuss()+"*")); } - if (searchInfoEO.getPutTimeEd() != null) { - endtime = searchInfoEO.getPutTimeEd().getTime(); - } else { - endtime = sdf.parse("2999-01-01 00:00:00").getTime(); + + if (searchInfoEO.getIssueTime() != null) { + Long starttime = searchInfoEO.getIssueTime().getTime(); + Long endtime = searchInfoEO.getIssueTime().getTime(); + RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(ISSUE_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); + boolQueryBuilder.filter(rangeQueryBuilder); } - RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); - boolQueryBuilder.filter(rangeQueryBuilder); + + if (searchInfoEO.getPutTime() != null) { + Long starttime = searchInfoEO.getPutTime().getTime(); + Long endtime = searchInfoEO.getPutTime().getTime(); + RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(PUT_TIME).format(EPOCH_MILLIS).from(starttime).to(endtime).includeLower(true).includeUpper(true); + boolQueryBuilder.filter(rangeQueryBuilder); + } + } querySeniorMsg(searchInfoEO,boolQueryBuilder); return boolQueryBuilder; @@ -734,7 +643,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { String[] seniortypeLaws = {"country","statecode","SYCLLX","ZRLX","WSSFCY"}; seniortype = seniortypeLaws.clone(); } else if ("bussstand".equals(searchInfoEO.getSelectIndex())) { - String[] seniortypeBuss = {"statecode","ZQCBM"}; + String[] seniortypeBuss = {"textStatusBuss","QCDW"}; seniortype = seniortypeBuss.clone(); } else { String[] seniortypeMsg = {"module"}; 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 b801bb84..b45fe99e 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 @@ -277,7 +277,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { String con = String.valueOf(attrInfoMap.get("content")); con = con.replace(",",""); if (StringUtils.isBlank(con)){ - attrInfoMap.put("content","--"); + attrInfoMap.put("content",""); } } } @@ -288,7 +288,7 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { if (null != attrInfoMap.get("issue_time") && !"".equals(attrInfoMap.get("issue_time")) && !"null".equals(attrInfoMap.get("issue_time"))) { fullTextSearchEO.put("issue_time", attrInfoMap.get("issue_time")); }else { - fullTextSearchEO.put("issue_time", "--"); + fullTextSearchEO.put("issue_time", ""); } }else if ("bussstand".equals(attrInfoMap.get("type"))){ @@ -297,42 +297,28 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { attrInfoMap.put(key, "null"); } } - fullTextSearchEO.put("title",attrInfoMap.get("standNumber")+" - 《"+attrInfoMap.get("nameshow")+"》"); + fullTextSearchEO.put("title",attrInfoMap.get("stand_code")); StringBuilder contentBuilder = new StringBuilder(); - SimpleDateFormat format = new SimpleDateFormat("yyyy-M-dd HH:mm:ss"); - contentBuilder.append("企标编号: ").append(String.valueOf(attrInfoMap.get("numbershow"))).append(" "); - contentBuilder.append("企标名称: ").append(String.valueOf(attrInfoMap.get("nameshow"))).append(" "); - contentBuilder.append("英文名称: ").append(attrInfoMap.get("standEnName")).append(" "); - contentBuilder.append("标准状态: ").append(String.valueOf(attrInfoMap.get("standstateshow"))).append(" "); -// contentBuilder.append("发布日期:"+String.valueOf(attrInfoMap.get("issue_time"))+" "); - contentBuilder.append("标准实施日期: "); - contentBuilder.append(String.valueOf(attrInfoMap.get("put_time"))); - contentBuilder.append("代替企标编号: ").append(attrInfoMap.get("replaceStandNum")); - contentBuilder.append("被代替企标编号: ").append(attrInfoMap.get("replacedStandNum")); - contentBuilder.append("废止日期: "); - if (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("FZRQString")).trim())) { - contentBuilder.append(String.valueOf(attrInfoMap.get("FZRQString"))).append(" "); - }else{ - contentBuilder.append("--").append(" "); - } - contentBuilder.append("复审日期: "); - if (StringUtils.isNotBlank(String.valueOf(attrInfoMap.get("FSRQString")).trim())) { - contentBuilder.append(String.valueOf(attrInfoMap.get("FSRQString"))).append(" "); - }else{ - contentBuilder.append("--").append(" "); - } - contentBuilder.append("密级: ").append(String.valueOf(attrInfoMap.get("QBMJShow"))).append(" "); - contentBuilder.append("授权: ").append(String.valueOf(attrInfoMap.get("QBSQShow"))).append(" "); - contentBuilder.append("涉及会签部门: ").append(String.valueOf(attrInfoMap.get("XHQBMShow"))).append(" "); - contentBuilder.append("SVPPS: ").append(String.valueOf(attrInfoMap.get("SVPPSName"))).append(" "); - contentBuilder.append("相关部门: ").append(String.valueOf(attrInfoMap.get("XGBMShow"))).append(" "); - contentBuilder.append("主起草人: ").append(String.valueOf(attrInfoMap.get("ZYQCRShow"))).append(" "); - contentBuilder.append("起草部门: ").append(String.valueOf(attrInfoMap.get("ZRBMShow"))).append(" "); - contentBuilder.append("主起草部门: ").append(String.valueOf(attrInfoMap.get("ZQCBMName"))).append(" "); - contentBuilder.append("其他起草人: ").append(String.valueOf(attrInfoMap.get("QTQCRShow"))).append(" "); - contentBuilder.append("外发审批角色: ").append(String.valueOf(attrInfoMap.get("WFSPJSShow"))).append(" "); - contentBuilder.append("规范性引用文件: ").append(String.valueOf(attrInfoMap.get("GFXYYWJ"))).append(" "); - contentBuilder.append("相关流程: ").append(String.valueOf(attrInfoMap.get("XGLC"))).append(" "); + contentBuilder.append("企标类别:").append(attrInfoMap.get("standSort")).append(" "); + contentBuilder.append("标准年份:").append(attrInfoMap.get("standYear")).append(" "); + contentBuilder.append("企标名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("企标英文名称:").append(attrInfoMap.get("standName")).append(" "); + contentBuilder.append("文本状态:").append(attrInfoMap.get("textStatusBussName")).append(" "); + contentBuilder.append("企标实施日期:").append(attrInfoMap.get("putTime")).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("QCRBUSSName")).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")); @@ -347,10 +333,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService { StringBuilder textContent = replaceAll(contentBuilder, "null", "--"); fullTextSearchEO.put("textContent",textContent.toString()); - if (null != attrInfoMap.get("issue_time") && !"".equals(attrInfoMap.get("issue_time")) && !"null".equals(attrInfoMap.get("issue_time"))) { - fullTextSearchEO.put("issue_time", attrInfoMap.get("issue_time")); + if (null != attrInfoMap.get("issueTime") && !"".equals(attrInfoMap.get("issueTime")) && !"null".equals(attrInfoMap.get("issueTime"))) { + fullTextSearchEO.put("issue_time", attrInfoMap.get("issueTime")); }else { - fullTextSearchEO.put("issue_time", "--"); + fullTextSearchEO.put("issue_time", ""); } } return fullTextSearchEO; diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java index d4592457..c0ef3345 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/CreateStandMQService.java @@ -43,7 +43,7 @@ public class CreateStandMQService { this.rabbitTemplate.convertAndSend("laws-exchange_SQ_GSAR", "laws-key_SQ_GSAR", lawsMap); } - public void sendBussStandMQ(SarBussionessStand sarBussionessStandEO, String addOrUpdate) throws Exception{ + public void sendBussStandMQ(Object sarBussionessStandEO, String addOrUpdate) throws Exception{ JSONObject json = JSONObject.fromObject(sarBussionessStandEO); String sarBussInfoStr = json.toString(); Map bussMap = new HashMap(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java index 32692c49..dd744f40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/mq/SendBussMQService.java @@ -69,81 +69,57 @@ public class SendBussMQService { public void insertOrUpdateBussInfo(Map bussMap) throws Exception { String addOrUpdate = bussMap.get("addOrUpdate").toString(); + String sarBuss = bussMap.get("sarBuss").toString(); + JSONObject jsonobject = JSONObject.fromObject(sarBuss); + SarBussionessStand infoEO = (SarBussionessStand) JSONObject.toBean(jsonobject,SarBussionessStand.class); String FZRQFSRQ = null; if ("updateFromAct".equals(addOrUpdate)){ addOrUpdate = "update"; FZRQFSRQ = "1"; } - String sarBuss = bussMap.get("sarBuss").toString(); - JSONObject jsonobject = JSONObject.fromObject(sarBuss); - SarBussionessStand infoEO = (SarBussionessStand) JSONObject.toBean(jsonobject, SarBussionessStand.class); - String jsonobject1 = infoEO.getSarStandAttrEOStr(); - Map map1 = new HashMap<>(); - if (StringUtils.isEmpty(jsonobject1)){ - map1.put("null","null"); - }else { - map1 = JSONObject.fromObject(jsonobject1); - } + + String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr(); + Map attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr); + Map infoMap = infoEO.getAttrInfoCaseMap(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //修改索引信息表 // 往索引表中插入数据 String baseSearchContent = ""; String getCodeName = ""; Map saveMap = new HashMap<>(); - String a = null; - try{ - a = sdf.format(infoEO.getIssueTime()); - saveMap.put("issue_time"," "+a); - }catch (Exception e){ - saveMap.put("issue_time"," "); - } - - //发布日期 高级查询 + saveMap.put("issueTime",dateFormatToStr(infoEO.getIssueTime())); Date issue_time_data = null; - if (StringUtils.isNotBlank(a)) { + if (StringUtils.isNotBlank(infoEO.getIssueTime())) { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - issue_time_data = format.parse(saveMap.get("issue_time")+" 00:00:00"); + issue_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00"); } catch (ParseException ignored) { } } if (issue_time_data != null) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(issue_time_data); - int month = calendar.get(Calendar.MONTH)+1; - String times = calendar.get(Calendar.YEAR) + String.format("%02d", month) + String.format("%02d",calendar.get(Calendar.DAY_OF_MONTH)); - saveMap.put("issue_time_data",Long.valueOf(times)); + saveMap.put("issue_time_data",issue_time_data.getTime()); }else{ saveMap.put("issue_time_data",-1000000000000000000L); } - try{ - saveMap.put("put_time"," "+ sdf.format(infoEO.getPutTime())); - }catch (Exception e){ - saveMap.put("put_time"," "); - } - //实施日期 高级查询 + saveMap.put("putTime",dateFormatToStr(infoEO.getPutTime())); Date put_time_data = null; - if (StringUtils.isNotBlank(a)) { + if (StringUtils.isNotBlank(infoEO.getPutTime())) { try { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - put_time_data = format.parse(saveMap.get("put_time")+" 00:00:00"); + put_time_data = format.parse(dateFormatToStr(infoEO.getIssueTime())+" 00:00:00"); } catch (ParseException ignored) { } } if (put_time_data != null) { - Calendar calendar = Calendar.getInstance(); - calendar.setTime(put_time_data); - int month = calendar.get(Calendar.MONTH)+1; - String times = calendar.get(Calendar.YEAR) + String.format("%02d", month) + String.format("%02d",calendar.get(Calendar.DAY_OF_MONTH)); - saveMap.put("put_time_data",Long.valueOf(times)); + saveMap.put("put_time_data",put_time_data.getTime()); }else{ saveMap.put("put_time_data",-1000000000000000000L); } -// saveMap.put("put_time",sdf.format(infoEO.getPutTime())); saveMap.put("id",infoEO.getId()); saveMap.put("standSort",infoEO.getStandSort()); @@ -172,6 +148,13 @@ public class SendBussMQService { String codeName = sysInfoEOService.getDicNamesByCodes(infoEO.getStandStatus()); saveMap.put("standstateshow",codeName); } + String textStatusBussName = ""; + if(infoEO.getTextStatusBuss() != null && StringUtils.isNotBlank(infoEO.getTextStatusBuss())){ + List valArr = Arrays.asList(infoEO.getTextStatusBuss().split(",")); + textStatusBussName = dicTypeEODao.getDicNamesByCodes(valArr); + } + saveMap.put("textStatusBuss",infoEO.getTextStatusBuss()); + saveMap.put("textStatusBussName",textStatusBussName); //新加字段 saveMap.put("country",infoEO.getApplyCountry()); if(StringUtils.isNotEmpty(infoEO.getApplyCountry())){ @@ -179,10 +162,6 @@ public class SendBussMQService { saveMap.put("countryShow",codeName); } // 自定义属性字段 - String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr(); - Map attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr); - Map infoMap = infoEO.getAttrInfoMap(); - if (attrInfoMap != null && !attrInfoMap.isEmpty()) { attrInfoMap = sysInfoEOService.changeSelectInfo(attrInfoMap, "stand",baseSearchContent); saveMap.putAll(attrInfoMap); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java index 15c9afe4..c1337157 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/dao/SarBussStandMenuDao.java @@ -31,4 +31,6 @@ public interface SarBussStandMenuDao extends BaseMapper { int deleteByStandIdAndMenuId (SarBussStandMenu sarStandMenuEO); + int insertSelective (SarBussStandMenu sarStandMenuEO); + } 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 1cf77e97..0b7d0854 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 @@ -97,6 +97,8 @@ public interface SarBussionessStandDao extends BaseMapper { int updateByPrimaryKeySelective(SarBussionessStand sarBussionessStandEO); + int insertSelective(SarBussionessStand sarBussionessStandEO); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java index 77b9cb49..d5a1699d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -52,13 +52,12 @@ public class SarBussionessStand extends BaseEntity { @ApiModelProperty(value = "发布日期") @TableField("ISSUE_TIME") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date issueTime; + private String issueTime; @ApiModelProperty(value = "实施日期") @TableField("PUT_TIME") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - private Date putTime; + private String putTime; @ApiModelProperty(value = "代替标准号") @TableField("REPLACE_STAND_NUM") @@ -192,5 +191,343 @@ public class SarBussionessStand extends BaseEntity { @TableField(exist = false) private List attrInfoList = new ArrayList<>(); + public static long getSerialVersionUID() { + return serialVersionUID; + } + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getStandCode() { + return standCode; + } + + public void setStandCode(String standCode) { + this.standCode = standCode; + } + + public String getStandName() { + return standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getStandEnName() { + return standEnName; + } + + public void setStandEnName(String standEnName) { + this.standEnName = standEnName; + } + + public String getIssueTime() { + return issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public String getPutTime() { + return putTime; + } + + public void setPutTime(String putTime) { + this.putTime = putTime; + } + + public String getReplaceStandNum() { + return replaceStandNum; + } + + public void setReplaceStandNum(String replaceStandNum) { + this.replaceStandNum = replaceStandNum; + } + + public String getReplacedStandNum() { + return replacedStandNum; + } + + public void setReplacedStandNum(String replacedStandNum) { + this.replacedStandNum = replacedStandNum; + } + + public String getStandStatus() { + return standStatus; + } + + public void setStandStatus(String standStatus) { + this.standStatus = standStatus; + } + + public String getApplyCountry() { + return applyCountry; + } + + public void setApplyCountry(String applyCountry) { + this.applyCountry = applyCountry; + } + + public String getStandNature() { + return standNature; + } + + public void setStandNature(String standNature) { + this.standNature = standNature; + } + + public String getStandSort() { + return standSort; + } + + public void setStandSort(String standSort) { + this.standSort = standSort; + } + + public String getStandYear() { + return standYear; + } + + public void setStandYear(String standYear) { + this.standYear = standYear; + } + + public Integer getValidFlag() { + return validFlag; + } + + public void setValidFlag(Integer validFlag) { + this.validFlag = validFlag; + } + + public Date getCreationTime() { + return creationTime; + } + + public void setCreationTime(Date creationTime) { + this.creationTime = creationTime; + } + + public Date getModifyTime() { + return modifyTime; + } + + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + public String getTextStatusBuss() { + return textStatusBuss; + } + + public void setTextStatusBuss(String textStatusBuss) { + this.textStatusBuss = textStatusBuss; + } + + public String getFirstPutTime() { + return firstPutTime; + } + + public void setFirstPutTime(String firstPutTime) { + this.firstPutTime = firstPutTime; + } + + public String getPutTimeShow() { + return putTimeShow; + } + + public void setPutTimeShow(String putTimeShow) { + this.putTimeShow = putTimeShow; + } + + public String getIssueTimeShow() { + return issueTimeShow; + } + + public void setIssueTimeShow(String issueTimeShow) { + this.issueTimeShow = issueTimeShow; + } + + public String getIssueTimeStr() { + return issueTimeStr; + } + + public void setIssueTimeStr(String issueTimeStr) { + this.issueTimeStr = issueTimeStr; + } + + public String getPutTimeStr() { + return putTimeStr; + } + + public void setPutTimeStr(String putTimeStr) { + this.putTimeStr = putTimeStr; + } + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String getMenuParentId() { + return menuParentId; + } + + public void setMenuParentId(String menuParentId) { + this.menuParentId = menuParentId; + } + + public String getStandStatusShow() { + return standStatusShow; + } + + public void setStandStatusShow(String standStatusShow) { + this.standStatusShow = standStatusShow; + } + + public String getStandNatrueShow() { + return standNatrueShow; + } + + public void setStandNatrueShow(String standNatrueShow) { + this.standNatrueShow = standNatrueShow; + } + + public String getStandSortShow() { + return standSortShow; + } + + public void setStandSortShow(String standSortShow) { + this.standSortShow = standSortShow; + } + + public String getApplyCountryShow() { + return applyCountryShow; + } + + public void setApplyCountryShow(String applyCountryShow) { + this.applyCountryShow = applyCountryShow; + } + + public List getStandFileList() { + return standFileList; + } + + public void setStandFileList(List standFileList) { + this.standFileList = standFileList; + } + + public List getOpinionFilesList() { + return opinionFilesList; + } + + public void setOpinionFilesList(List opinionFilesList) { + this.opinionFilesList = opinionFilesList; + } + + public List getRelevanceFileList() { + return relevanceFileList; + } + + public void setRelevanceFileList(List relevanceFileList) { + this.relevanceFileList = relevanceFileList; + } + + public String getCollectId() { + return collectId; + } + + public void setCollectId(String collectId) { + this.collectId = collectId; + } + + public String getStandFileClassify() { + return standFileClassify; + } + + public void setStandFileClassify(String standFileClassify) { + this.standFileClassify = standFileClassify; + } + + public String getAttId() { + return attId; + } + + public void setAttId(String attId) { + this.attId = attId; + } + + public int getUpReplaceNumFlag() { + return upReplaceNumFlag; + } + + public void setUpReplaceNumFlag(int upReplaceNumFlag) { + this.upReplaceNumFlag = upReplaceNumFlag; + } + + public int getUpNumFlag() { + return upNumFlag; + } + + public void setUpNumFlag(int upNumFlag) { + this.upNumFlag = upNumFlag; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Map getAttrInfoMap() { + return attrInfoMap; + } + + public void setAttrInfoMap(Map attrInfoMap) { + this.attrInfoMap = attrInfoMap; + } + + public Map getAttrInfoCaseMap() { + return attrInfoCaseMap; + } + + public void setAttrInfoCaseMap(Map attrInfoCaseMap) { + this.attrInfoCaseMap = attrInfoCaseMap; + } + + public String getSarStandAttrEOStr() { + return sarStandAttrEOStr; + } + + public void setSarStandAttrEOStr(String sarStandAttrEOStr) { + this.sarStandAttrEOStr = sarStandAttrEOStr; + } + + public String getFileIds() { + return fileIds; + } + + public void setFileIds(String fileIds) { + this.fileIds = fileIds; + } + + public List getAttrInfoList() { + return attrInfoList; + } + + public void setAttrInfoList(List attrInfoList) { + this.attrInfoList = attrInfoList; + } } 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 f872d44c..cf8d22fb 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 @@ -187,6 +187,49 @@ public class SarBussionessStandServiceImpl extends ServiceImpl createSarBussionessStand(SarBussionessStand sarBussionessStandEO) throws Exception { + //标准信息表中插入一条数据 + sarBussionessStandEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); + sarBussionessStandEO.setCreationTime(new Date()); + sarBussionessStandEO.setModifyTime(new Date()); + sarBussionessStandEO.setId(UUIDUtils.randomUUID20()); + //根据新建标准所在目录，确定此处是否需要在标准目录关联表中插入数据 + if (StringUtils.isNotEmpty(sarBussionessStandEO.getMenuId())) { + SarBussStandMenu sarStandMenuEO = new SarBussStandMenu(); + sarStandMenuEO.setBussStandId(sarBussionessStandEO.getId()); + sarStandMenuEO.setMenuId(sarBussionessStandEO.getMenuId()); + sarStandMenuEO.setValidFlag(ValueStateEnum.VALUE_TRUE.getValue()); + sarStandMenuEO.setId(UUIDUtils.randomUUID20()); + sarBussStandMenuEODao.insertSelective(sarStandMenuEO); + } + int insertresult = sarBussionessStandEODao.insertSelective(sarBussionessStandEO); + if (insertresult >= 1) { + // 根据代替标准号 ，修改代替标准号标准中的，被代替标准号 + updateReplaceConnect(sarBussionessStandEO); + //编写预警信息 +// writeWarnings(sarBussionessStandEO); + // 处理属性表信息 + if (StringUtils.isNotBlank(sarBussionessStandEO.getSarStandAttrEOStr())) { + createStandAttrInfo(sarBussionessStandEO); + } + // 增加关联事件 + String sortName = sysInfoEOService.getDicNamesByCodes(sarBussionessStandEO.getStandSort()); + String number = sortName + " " + sarBussionessStandEO.getStandCode(); + if (StringUtils.isNotBlank(sarBussionessStandEO.getStandYear())) { + number += "-" + sarBussionessStandEO.getStandYear(); + } + String content = "新增" + number + " 《" + sarBussionessStandEO.getStandName() + "》"; + sarUpdLogEOService.createBaseLog(sarBussionessStandEO.getId(),"BUSINESS",content); + if(elasflag) { + attrInfoShowSearchDetails(sarBussionessStandEO,"add"); + createStandMQService.sendBussStandMQ(sarBussionessStandEO,"add"); + } + return Result.success("00", "插入数据成功", sarBussionessStandEO); + } else { + return Result.error("01", "插入输入过程中出错"); + } + } + @Override public List getSarBussionessStand(String exportType, String exportContent,String userId) throws Exception { @@ -324,6 +367,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl changeMap (SarBussionessStand sarStandardsInfoEO,Map map) { - map.put("country",sarStandardsInfoEO.getApplyCountry()); - map.put("standSort",sarStandardsInfoEO.getStandSort()); - map.put("standNumber",sarStandardsInfoEO.getStandCode()); - map.put("standYear",sarStandardsInfoEO.getStandYear()); - map.put("standName",sarStandardsInfoEO.getStandName()); - map.put("standEnName",sarStandardsInfoEO.getStandEnName()); - map.put("standNature",sarStandardsInfoEO.getStandNature()); - map.put("standState",sarStandardsInfoEO.getStandStatus()); - if (sarStandardsInfoEO.getIssueTime() != null) { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - String issueStr = format.format(sarStandardsInfoEO.getIssueTime()); - map.put("issueTime",issueStr); - } - if (sarStandardsInfoEO.getPutTime() != null) { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - String issueStr = format.format(sarStandardsInfoEO.getPutTime()); - map.put("putTime",issueStr); - } + map.put("country",verifyObj(sarStandardsInfoEO.getApplyCountry())); + map.put("standSort",verifyObj(sarStandardsInfoEO.getStandSort())); + map.put("standNumber",verifyObj(sarStandardsInfoEO.getStandCode())); + map.put("standYear",verifyObj(sarStandardsInfoEO.getStandYear())); + map.put("standName",verifyObj(sarStandardsInfoEO.getStandName())); + map.put("standEnName",verifyObj(sarStandardsInfoEO.getStandEnName())); + map.put("standNature",verifyObj(sarStandardsInfoEO.getStandNature())); + map.put("standState",verifyObj(sarStandardsInfoEO.getStandStatus())); +// if (sarStandardsInfoEO.getIssueTime() != null) { +// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); +// String issueStr = format.format(sarStandardsInfoEO.getIssueTime()); +// map.put("issueTime",issueStr); +// } + map.put("issueTime", verifyObj(sarStandardsInfoEO.getIssueTime())); + map.put("putTime", verifyObj(sarStandardsInfoEO.getPutTime())); +// if (sarStandardsInfoEO.getPutTime() != null) { +// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); +// String issueStr = format.format(sarStandardsInfoEO.getPutTime()); +// map.put("putTime",issueStr); +// } map.put("replaceStandNum",sarStandardsInfoEO.getReplaceStandNum()); map.put("replacedStandNum",sarStandardsInfoEO.getReplacedStandNum()); return map; } + private Object verifyObj(Object str){ + return str == null ? "" : str; + } + public void updateCollectAndShare(SarBussionessStand sarBussionessStandEO) throws Exception { //修改收藏表中 String number = sarBussionessStandEO.getStandCode()+ "）"; diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index 1e3996d7..0aecf221 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -463,7 +463,7 @@ - left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) + left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) @@ -546,7 +546,7 @@ - left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) + left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.TEXT_STATUS_BUSS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) @@ -659,7 +659,7 @@