Merge remote-tracking branch 'origin/develop_master' into develop_master

# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

adc-da-search/src/main/java/com/adc/da/search/service/impl/ElasticsearchServiceImpl.java

@@ -120,7 +120,7 @@ public class ElasticsearchServiceImpl implements ElasticsearchService {
     }
 
     /**
-     * 指定ID数据添加接口实现，
+     * 指定ID数据添加接口实现
      * @param jsonObject 要增加的数据
      * @param index      索引，类似数据库
      * @param type       类型，类似表 (自6.0改版以后，一个索引里只允许有一种类型，

adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java

@@ -3,6 +3,8 @@ package com.adc.da.search.service.impl;
 import com.adc.da.search.entity.*;
 import com.adc.da.search.service.SearchCenterService;
 import com.adc.da.search.util.InitStandAttrSearchUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -96,6 +98,8 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                             .should(QueryBuilders.wildcardQuery("standEnName.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                             .should(QueryBuilders.wildcardQuery("standNature.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                             .should(QueryBuilders.wildcardQuery("textStatus.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
+                            .should(QueryBuilders.wildcardQuery("numbershow.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
+                            .should(QueryBuilders.wildcardQuery("content.keyword", "*"+searchInfoEO.getSelectValue()+"*"))
                             .should(QueryBuilders.wildcardQuery("standSystem.keyword", "*"+searchInfoEO.getSelectValue()+"*"));
                     break;
                 case "laws":
@@ -217,6 +221,23 @@ public class SearchCenterServiceImpl implements SearchCenterService {
                 Map.Entry::getKey,
                 Map.Entry::getValue));
 
+        if(sarStandAttrEOStr == null){
+            collectAttrMap = new TreeMap<>();
+
+            if(searchInfoEO.getCYSD() != null && StringUtils.isNotBlank(searchInfoEO.getCYSD())){
+                List<String> fieldList = Arrays.asList(searchInfoEO.getCYSD() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
+                JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList));
+                collectAttrMap.put("CYSD",array);
+            }
+
+            if(searchInfoEO.getCLLX() != null && StringUtils.isNotBlank(searchInfoEO.getCLLX())){
+                List<String> fieldList = Arrays.asList(searchInfoEO.getCLLX() .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
+                JSONArray array= JSONArray.parseArray(JSON.toJSONString(fieldList));
+                collectAttrMap.put("CLLX",array);
+            }
+
+        }
+
         String fieldInfo = InitStandAttrSearchUtil.queryField;
         List<String> fieldInfoList = Arrays.asList(fieldInfo .split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList());
 
@@ -224,8 +245,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         for (String field : fieldInfoList) {
             // 关键字查询属性字段
             String keyWordField = field + ".keyword";
+            String keyWordField2 = field + "Name.keyword";
             if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){
-                boolQueryBuilderMust.should(QueryBuilders.wildcardQuery(keyWordField, "*"+searchInfoEO.getSelectValue()+"*"));
+                boolQueryBuilderMust.should(QueryBuilders.wildcardQuery(keyWordField2, "*"+searchInfoEO.getSelectValue()+"*"));
             }else {
                 if(collectAttrMap.containsKey(field)){
                     List<String> fields = new ArrayList<>();
@@ -967,7 +989,7 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){
             QueryBuilder multiQueryBuilder = QueryBuilders.multiMatchQuery("");
             multiQueryBuilder = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(),
-                    "title","textContent","issue_time"
+                    "title","textContent"
             ).minimumShouldMatch("100%").field("title",10f);
             boolQueryBuilder.must(multiQueryBuilder);
 //            boolQueryBuilder.should()
@@ -1067,11 +1089,10 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         BoolQueryBuilder boolQueryMust = QueryBuilders.boolQuery();
         QueryBuilder multiQueryBuilder;
         multiQueryBuilder = QueryBuilders.multiMatchQuery(value,
-                "title","textContent","issue_time").minimumShouldMatch("100%").field("title",1f);
+                "title","textContent").minimumShouldMatch("100%").field("title",1f);
         boolQueryMust.must(multiQueryBuilder);
         boolQueryShould.should(QueryBuilders.wildcardQuery("title", "*"+searchInfoEO.getSelectValue()+"*").boost(10f))
                 .should(QueryBuilders.wildcardQuery("textContent", "*"+searchInfoEO.getSelectValue()+"*"))
-                .should(QueryBuilders.wildcardQuery("issue_time", "*"+searchInfoEO.getSelectValue()+"*"))
         .should(multiQueryBuilder);
         boolQueryBuilder.should(boolQueryShould);
         //在结果中检索

adc-da-search/src/main/java/com/adc/da/search/service/impl/StandLawsSearchServiceImpl.java

@@ -164,48 +164,48 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             }else {
                 contentBuilder.append("标准体系:").append(attrInfoMap.get("standSystem")).append("  ");
                 if (StringUtils.isBlank(String.valueOf(attrInfoMap.get("BDTBH")))){
-                    contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBH")).append("  ");
+                    contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBHName")).append("  ");
                 }else {
-                    contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBH")).append("  ");
+                    contentBuilder.append("被代替标准编号: ").append(attrInfoMap.get("BDTBZBHName")).append("  ");
                 }
             }
 
-            contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQ")).append("  ");
+            contentBuilder.append("实施日期(标准文本):").append(attrInfoMap.get("SSRQName")).append("  ");
-            contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQ")).append("  ");
+            contentBuilder.append("新车型实施日期(标准文本):").append(attrInfoMap.get("XCXSSRQName")).append("  ");
-            contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQ")).append("  ");
+            contentBuilder.append("在产车实施日期(标准文本):").append(attrInfoMap.get("ZCCSSRQName")).append("  ");
 
             if (isForeign) {
-                contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append("  ");
+                contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append("  ");
             }else {
-                contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDW")).append("  ");
+                contentBuilder.append("归口管理部门:").append(attrInfoMap.get("GKDWName")).append("  ");
-                contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJG")).append("  ");
+                contentBuilder.append("起草单位:").append(attrInfoMap.get("FBJGName")).append("  ");
-                contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMR")).append("  ");
+                contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).append("  ");
-                contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSD")).append("  ");
+                contentBuilder.append("我司参与深度:").append(attrInfoMap.get("CYSDName")).append("  ");
-                contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPM")).append("  ");
+                contentBuilder.append("我司参与制标排名:").append(attrInfoMap.get("CYZBPMName")).append("  ");
             }
-            contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLX")).append("  ");
+            contentBuilder.append("适用车型:").append(attrInfoMap.get("CLLXName")).append("  ");
-            contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLX")).append("  ");
+            contentBuilder.append("能源类型:").append(attrInfoMap.get("NYLXName")).append("  ");
-            contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPX")).append("  ");
+            contentBuilder.append("适用产品线:").append(attrInfoMap.get("SYCPXName")).append("  ");
-            contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZ")).append("  ");
+            contentBuilder.append("适用认证:").append(attrInfoMap.get("SYRZName")).append("  ");
-            contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBM")).append("  ");
+            contentBuilder.append("责任部门:").append(attrInfoMap.get("ZRBMName")).append("  ");
-            contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCS")).append("  ");
+            contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).append("  ");
-            contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBM")).append("  ");
+            contentBuilder.append("关联模块--乘用车VPPS编码:").append(attrInfoMap.get("CYCVPPSBMName")).append("  ");
-            contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCN")).append("  ");
+            contentBuilder.append("关联模块--乘用车vpps中文名称:").append(attrInfoMap.get("CYCVPPSCNName")).append("  ");
-            contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBM")).append("  ");
+            contentBuilder.append("关联模块--卡车VPPS编码:").append(attrInfoMap.get("KCCVPPSBMName")).append("  ");
-            contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCN")).append("  ");
+            contentBuilder.append("关联模块--卡车vpps中文名称:").append(attrInfoMap.get("KCCVPPSCNName")).append("  ");
-            contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXH")).append("  ");
+            contentBuilder.append("模块结构单元变型号:").append(attrInfoMap.get("DYBXHName")).append("  ");
-            contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMC")).append("  ");
+            contentBuilder.append("模块结构单元名称:").append(attrInfoMap.get("DYMCName")).append("  ");
 
-            contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJH")).append("  ");
+            contentBuilder.append("代替标准号:").append(attrInfoMap.get("DTBJHName")).append("  ");
-            contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJ")).append("  ");
+            contentBuilder.append("引用标准:").append(attrInfoMap.get("YYBJName")).append("  ");
-            contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJ")).append("  ");
+            contentBuilder.append("被引用标准:").append(attrInfoMap.get("BYYBJName")).append("  ");
             if (isForeign) {
-                contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLB")).append("  ");
+                contentBuilder.append("体系类别:").append(attrInfoMap.get("TXLBName")).append("  ");
             }else {
-                contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBH")).append("  ");
+                contentBuilder.append("采标编号:").append(attrInfoMap.get("CBBHName")).append("  ");
-                contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCD")).append("  ");
+                contentBuilder.append("采标程度:").append(attrInfoMap.get("CBCDName")).append("  ");
-                contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZ")).append("  ");
+                contentBuilder.append("部分代替标准号:").append(attrInfoMap.get("BFDTBZName")).append("  ");
-                contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZ")).append("  ");
+                contentBuilder.append("被部分代替标准号:").append(attrInfoMap.get("BBFDTBZName")).append("  ");
             }
 
             if (attrInfoMap.containsKey("content")){

adc-da-slrs/src/main/java/com/adc/da/mq/service/SendStandMQService.java

@@ -9,6 +9,7 @@ import com.adc.da.utils.util.InitStandAttrUtil;
 import com.rabbitmq.client.Channel;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
+import org.json.JSONTokener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.annotation.Exchange;
@@ -72,6 +73,7 @@ public class SendStandMQService {
         SarStandardsInfo infoEO = (SarStandardsInfo) JSONObject.toBean(jsonobject,SarStandardsInfo.class);
         String sarStandAttrEOStr = infoEO.getSarStandAttrEOStr();
         Map<String,Object> attrInfoMap = JSONObject.fromObject(sarStandAttrEOStr);
+        Map<String,Object> infoMap = infoEO.getAttrInfoMap();
 
         // 往索引表中插入数据
         String getCodeName = "";
@@ -111,6 +113,7 @@ public class SendStandMQService {
         }
         saveMap.put("issueTime",dateFormatToStr(infoEO.getIssueTime()));
 
+        saveMap.put("standNature",infoEO.getStandNature());
         saveMap.put("synopsis",infoEO.getSynopsis());
         saveMap.put("standType",infoEO.getStandType());
         saveMap.put("textStatus",infoEO.getTextStatus());
@@ -134,6 +137,12 @@ public class SendStandMQService {
         // 动态存储属性字段
         for (String field : fieldInfoList) {
             saveMap.put(field,attrInfoMap.getOrDefault(field,""));
+            Object json= new JSONTokener(infoMap.get(field).toString()).nextValue();
+            String fieldValue = "";
+            if(!json.toString().equals("null")){
+                fieldValue = infoMap.get(field).toString();
+            }
+            saveMap.put(field+"Name",fieldValue);
         }
 
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java

@@ -5,9 +5,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 
 import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
-import com.adc.da.slrs.sarStandItems.entity.FindStandDto;
+import com.adc.da.slrs.sarStandItems.entity.*;
-import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
-import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
 import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
 import com.adc.da.util.UUIDUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
 import io.swagger.annotations.Api;
 import com.adc.da.base.web.BaseController;
 
@@ -55,6 +52,17 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         }
     }
 
+    @ApiOperation(value = "分解单查询")
+    @GetMapping("/querySarItemAndInterpretation")
+    public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
+        List<SarItemVO> sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page);
+
+        return Result.success("200",sarItemVOS);
+    }
+
+
+
+
     @ApiOperation(value = "分解单查询(带时间)")
     @GetMapping("/findAllItemsTimes")
     public List<SarItemsTime> findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java

@@ -1,8 +1,6 @@
 package com.adc.da.slrs.sarStandItems.dao;
 
-import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
+import com.adc.da.slrs.sarStandItems.entity.*;
-import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
-import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto;
 import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
 import com.adc.da.sys.common.SelectionResult;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -24,6 +22,8 @@ import java.util.Set;
 @Mapper
 public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
 
+    List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
+
     List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);
 
     int querySarStandItemsListCount(SarStandItemsEOPage page);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java

@@ -0,0 +1,36 @@
+package com.adc.da.slrs.sarStandItems.entity;
+
+import com.adc.da.base.page.BasePage;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+
+@Data
+public class FindSarItemsPageReqDTO {
+
+    private static final long serialVersionUID = 1L;
+    private Integer page = 1;
+    private Integer pageSize = 20;
+
+
+    @ApiModelProperty(value = "标准id")
+    private String standId;
+
+    @ApiModelProperty(value = "条款名称")
+    private String itemsName;
+
+    @ApiModelProperty(value = "新车型实施日期")
+    @DateTimeFormat(pattern = "yyy-MM-dd")
+    private Date XCXSSRQ;
+
+    @ApiModelProperty(value = "在产车实施日期")
+    @DateTimeFormat(pattern = "yyy-MM-dd")
+    private Date ZCCSSRQ;
+
+    @ApiModelProperty(value = "文件类型")
+    private String fileType;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java

@@ -0,0 +1,67 @@
+package com.adc.da.slrs.sarStandItems.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value="标准分解单显示对象", description="")
+public class SarItemVO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+
+    @ApiModelProperty(value = "标准ID")
+    private String standId;
+
+    @ApiModelProperty(value = "条款号")
+    private String itemsNum;
+
+    @ApiModelProperty(value = "条款名称")
+    private String itemsName;
+
+    @ApiModelProperty(value = "条款内容")
+    private String itemsTitle;
+
+    @ApiModelProperty(value = "解读内容--条款要求")
+    private String termsConditions;
+
+    @ApiModelProperty(value = "新车实施日期")
+    @DateTimeFormat
+    private Date XCXSSRQ;
+
+    @ApiModelProperty(value = "在产车实施日期")
+    @DateTimeFormat
+    private Date ZCCSSRQ;
+
+    @ApiModelProperty(value = "适用车型")
+    private String applyArctic;
+
+
+    @ApiModelProperty(value = "责任部门")
+    private String responsibleUnit;
+
+
+    @ApiModelProperty(value = "责任工程师")
+    private String dutyEngineer;
+
+    @ApiModelProperty(value = "相对于上一版本变化点")
+    private String comparedWithPrevious;
+
+    @ApiModelProperty(value = "合规性分析")
+    private String complianceState;
+
+    @ApiModelProperty(value = "符合性要求-符合性状态")
+    private String complianceRequire;
+
+    @ApiModelProperty(value = "文件类型")
+    private String fileType;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java

@@ -189,4 +189,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
     public List<SarStandItemsDto> findAllItems(String type,String[] ids){
         return dao.selectAllItemsByIds(type,ids);
     }
+
+
+    public List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
+        return dao.querySarItemAndInterpretation(page);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java

@@ -382,6 +382,30 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
+    public void attrInfoSearchDetails(SarStandardsInfo row) throws Exception {
+        String fieldInfo = InitStandAttrUtil.queryField;
+        String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
+        row.setCollectId(collectId);
+        // 查询属性表数据
+        if (StringUtils.isNotBlank(fieldInfo)) {
+            Map<String, Object> getAttrMap = sarStandAttrInfoEODao.selectStandFieldAndData(fieldInfo, row.getId());
+            if (InitStandAttrUtil.clobFieldList != null && !InitStandAttrUtil.clobFieldList.isEmpty()) {
+                // 遍历修改所有clob类型的值
+                for (String clobField : InitStandAttrUtil.clobFieldList) {
+                    Clob clobValue = (Clob) getAttrMap.get(clobField);
+                    String fieldValue = FieldConvertUtil.ClobToString(clobValue);
+                    getAttrMap.put(clobField, fieldValue);
+                }
+            }
+
+            if (getAttrMap != null && !getAttrMap.isEmpty()) {
+                row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
+            }
+
+            row.setAttrInfoMap(getAttrMap);
+        }
+    }
+
 
     private Map<String, Object> transformUpperCase(Map<String, Object> orgMap) {
         Map<String, Object> resultMap = new HashMap<>();
@@ -428,6 +452,25 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
+    public void attrInfoShowSearchDetails(SarStandardsInfo row) throws Exception {
+        if (row != null) {
+            attrInfoSearchDetails(row);
+            Map<String, Object> getAttrMap = row.getAttrInfoMap();
+            if (getAttrMap != null && getAttrMap.size() > 0) {
+                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
+                    String name = entry.getKey();
+                    String value = "";
+                    if (entry.getValue() != null && InitStandAttrUtil.selectionFieldList != null && InitStandAttrUtil.selectionFieldList.size() > 0 && InitStandAttrUtil.selectionFieldList.contains(name)) {
+                        value = entry.getValue().toString();
+                        List<String> valArr = Arrays.asList(value.split(","));
+                        value = dicTypeEODao.getDicNamesByCodes(valArr);
+                        entry.setValue(value);
+                    }
+                }
+            }
+        }
+    }
+
     public void attrInfoShow(List<SarStandardsInfo> sarlist) throws Exception {
         for (SarStandardsInfo row : sarlist) {
             attrInfoDetails(row);
@@ -1099,7 +1142,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //        replaseStandState(sarStandardsInfoEO);
         // 记录修改日志
         saveUpdateLog(sarStandardsInfoEO, beforeSarStandardsInfo);
-        if(elasflag) {
+        if(elasflag) { //what?
+            attrInfoShowSearchDetails(sarStandardsInfoEO);
             createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
             List<String> bhs = new ArrayList<>(Arrays.asList(String.valueOf(map.get("DTBJH")).split(",")));
             for (String bh :bhs) {

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -51,6 +51,23 @@
         <result column="foShow" property="foShow"/>
     </resultMap>
 
+    <resultMap id="sarItemVOResultMap" type="com.adc.da.slrs.sarStandItems.entity.SarItemVO">
+        <id column="id" property="id"/>
+        <result column="STAND_ID" property="standId"/>
+        <result column="ITEMS_NUM" property="itemsNum"/>
+        <result column="ITEMS_NAME" property="itemsName"/>
+        <result column="ITEMS_TITLE" property="itemsTitle"/>
+        <result column="TERMS_CONDITIONS" property="termsConditions"/>
+        <result column="XCXSSRQ" property="XCXSSRQ"/>
+        <result column="ZCCSSRQ" property="ZCCSSRQ"/>
+        <result column="APPLY_ARCTIC" property="applyArctic"/>
+        <result column="RESPONSIBLE_UNIT" property="responsibleUnit"/>
+        <result column="DUTY_ENGINEER" property="dutyEngineer"/>
+        <result column="compared_with_previous" property="comparedWithPrevious"/>
+        <result column="compliance_state" property="complianceState"/>
+        <result column="COMPLIANCE_REQUIR" property="complianceRequire"/>
+        <result column="FILE_TYPE" property="fileType"/>
+    </resultMap>
 
 
     <!-- SAR_STAND_ITEMS table all fields -->
@@ -69,10 +86,13 @@
 
     <!-- 查询条件 -->
     <sql id="Base_Where_Clause">
-        left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and SAR_STANDARDS_INFO.valid_flag=0)
+        left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and
-        left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and dicClaimType.dic_id is
+        SAR_STANDARDS_INFO.valid_flag=0)
+        left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and
+        dicClaimType.dic_id is
         not null and dicClaimType.valid_flag = 0)
-        left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID =  SAR_STAND_ITEMS.duty_engineer and tsdutyEngineer.valid_flag=0
+        left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and
+        tsdutyEngineer.valid_flag=0
         and tsdutyEngineer.DISABLE_FLAG=0)
         left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0
         and tsFo.DISABLE_FLAG=0)
@@ -130,7 +150,8 @@
                 and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%')
             </if>
             <if test="nameOrRequest != null">
-                and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%'))
+                and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or
+                SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%'))
             </if>
             <if test="itemsName != null">
                 and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName}
@@ -143,8 +164,10 @@
             </if>
             <if test="standNum != null">
                 and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' ||
-                SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null)
+                SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR
-                or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like concat(concat('%',#{standNum}),'%')
+                is not null)
+                or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like
+                concat(concat('%',#{standNum}),'%')
                 and SAR_STANDARDS_INFO.STAND_YEAR is null))
             </if>
             <if test="id != null">
@@ -329,7 +352,8 @@
 
     <!-- 根据id查询 SAR_STAND_ITEMS -->
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">
-        select <include refid="Base_Query_Column_List" />
+        select
+        <include refid="Base_Query_Column_List"/>
         from SAR_STAND_ITEMS
         where id = #{value}
 
@@ -348,12 +372,50 @@
         <include refid="Base_Where_Clause"/>
     </select>
 
+    <select id="querySarItemAndInterpretation" resultMap="sarItemVOResultMap"
+            parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
+            SELECT
+	        *
+            FROM
+	            sar_stand_items AS a
+            LEFT JOIN sar_interpretation_national_standard AS b ON a.STAND_ID = b.STAND_ID
+        <where>
+
+            <if test="standId!=null and standId!=''">
+                and a.stand_id=#{standId}
+            </if>
+
+            <if test="fileType !=null and fileType!=''">
+               and a.file_type=#{fileType}
+            </if>
+
+            <if test="itemsName != null and itemsName!=''">
+                and a.ITEMS_NAME=#{itemsName}
+            </if>
+            <if test="XCXSSRQ !=null and XCXSSRQ!=''">
+                and a.XCXSSRQ=#{XCXSSRQ}
+            </if>
+            <if test="ZCCSSRQ !=null and ZCCSSRQ != ''">
+                and a.ZCCSSRQ=#{ZCCSSRQ}
+            </if>
+        </where>
+        LIMIT #{page},#{pageSize}
+
+
+    </select>
+
     <!-- 查询SAR_STAND_ITEMS列表 -->
     <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
-        select <include refid="Base_Column_List" /> from
+        select
+        <include refid="Base_Column_List"/>
+        from
         (select tmp_tb.* from
-        (select SAR_STAND_ITEMS.modify_time,  SAR_STAND_ITEMS.creation_time,  SAR_STAND_ITEMS.creation_user,  SAR_STAND_ITEMS.valid_flag,  SAR_STAND_ITEMS.remarks,  SAR_STAND_ITEMS.responsible_unit,  SAR_STAND_ITEMS.energy_kind,  SAR_STAND_ITEMS.apply_arctic, tack_time, parts,  SAR_STAND_ITEMS.items_name,  SAR_STAND_ITEMS.items_num,  SAR_STAND_ITEMS.stand_id,  SAR_STAND_ITEMS.id
+        (select SAR_STAND_ITEMS.modify_time, SAR_STAND_ITEMS.creation_time, SAR_STAND_ITEMS.creation_user,
-        ,TS_ORG.org_name as responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS
+        SAR_STAND_ITEMS.valid_flag, SAR_STAND_ITEMS.remarks, SAR_STAND_ITEMS.responsible_unit,
+        SAR_STAND_ITEMS.energy_kind, SAR_STAND_ITEMS.apply_arctic, tack_time, parts, SAR_STAND_ITEMS.items_name,
+        SAR_STAND_ITEMS.items_num, SAR_STAND_ITEMS.stand_id, SAR_STAND_ITEMS.id
+        ,TS_ORG.org_name as
+        responsibleUnitShow,SAR_STAND_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_STAND_ITEMS.TERMS_CONDITIONS
         from SAR_STAND_ITEMS
         <include refid="Base_Where_Clause"/>
         <if test="pager.orderCondition != null and pager.orderCondition != ''">
@@ -363,7 +425,9 @@
     </select>
 
     <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">
-        select <include refid="Base_Column_List"/> from SAR_STAND_ITEMS
+        select
+        <include refid="Base_Column_List"/>
+        from SAR_STAND_ITEMS
         <include refid="Base_Where_Clause"/>
         <if test="pager.orderCondition != null and pager.orderCondition != ''">
             ${pager.orderCondition}
@@ -376,7 +440,8 @@
         SELECT
         group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',')
         FROM
-        SAR_STAND_ITEM_VAL  left join TS_DICTYPE  on  (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val  and TS_DICTYPE.dic_id is not null)
+        SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and
+        TS_DICTYPE.dic_id is not null)
         WHERE
         SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id
         AND SAR_STAND_ITEM_VAL.property_type = 'APPLY_ARCTIC'
@@ -385,16 +450,20 @@
         SELECT
         group_concat(TS_DICTYPE.DIC_TYPE_NAME ORDER BY SAR_STAND_ITEM_VAL.property_type separator ',')
         FROM
-        SAR_STAND_ITEM_VAL left join TS_DICTYPE  on  (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val  and TS_DICTYPE.dic_id is not null)
+        SAR_STAND_ITEM_VAL left join TS_DICTYPE on (TS_DICTYPE.dic_type_code = SAR_STAND_ITEM_VAL.property_val and
+        TS_DICTYPE.dic_id is not null)
         WHERE
         SAR_STAND_ITEM_VAL.ITEM_ID = SAR_STAND_ITEMS.id
         AND SAR_STAND_ITEM_VAL.property_type = 'ENERGY_KIND'
         ) AS emergyKindShow
         from SAR_STAND_ITEMS left join TS_ORG on (SAR_STAND_ITEMS.responsible_unit =TS_ORG.id)
-        left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and SAR_STANDARDS_INFO.valid_flag=0)
+        left join SAR_STANDARDS_INFO on (SAR_STANDARDS_INFO.id = SAR_STAND_ITEMS.stand_id and
-        left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and dicClaimType.dic_id is
+        SAR_STANDARDS_INFO.valid_flag=0)
+        left join TS_DICTYPE dicClaimType on (dicClaimType.dic_type_code = SAR_STAND_ITEMS.claim_type and
+        dicClaimType.dic_id is
         not null and dicClaimType.valid_flag = 0)
-        left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID =  SAR_STAND_ITEMS.duty_engineer and tsdutyEngineer.valid_flag=0
+        left join TS_USER tsdutyEngineer on (tsdutyEngineer.USID = SAR_STAND_ITEMS.duty_engineer and
+        tsdutyEngineer.valid_flag=0
         and tsdutyEngineer.DISABLE_FLAG=0)
         left join TS_USER tsFo on (tsFo.USID = SAR_STAND_ITEMS.fo and tsFo.valid_flag=0
         and tsFo.DISABLE_FLAG=0)
@@ -451,7 +520,8 @@
             and SAR_STAND_ITEMS.parts like concat(concat('%', #{parts}),'%')
         </if>
         <if test="nameOrRequest != null">
-            and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%'))
+            and (SAR_STAND_ITEMS.items_name like concat(concat('%', #{nameOrRequest}),'%') or
+            SAR_STAND_ITEMS.TERMS_CONDITIONS like concat(concat('%', #{nameOrRequest}),'%'))
         </if>
         <if test="itemsName != null">
             and SAR_STAND_ITEMS.items_name ${itemsNameOperator} #{itemsName}
@@ -464,8 +534,10 @@
         </if>
         <if test="standNum != null">
             and ((SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER || '-' ||
-            SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is not null)
+            SAR_STANDARDS_INFO.STAND_YEAR like concat(concat('%',#{standNum}),'%') and SAR_STANDARDS_INFO.STAND_YEAR is
-            or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like concat(concat('%',#{standNum}),'%')
+            not null)
+            or (SAR_STANDARDS_INFO.STAND_SORT || ' ' || SAR_STANDARDS_INFO.STAND_NUMBER like
+            concat(concat('%',#{standNum}),'%')
             and SAR_STANDARDS_INFO.STAND_YEAR is null))
         </if>
         <if test="id != null">
@@ -613,7 +685,8 @@
         </if>
     </select>
 
-    <select id="selectAllItemsClaimType" resultType="com.adc.da.sys.common.SelectionResult" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
+    <select id="selectAllItemsClaimType" resultType="com.adc.da.sys.common.SelectionResult"
+            parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
         select stand_id as label,claim_type as value from SAR_STAND_ITEMS
         where valid_flag = 0 and claim_type != ''
         <if test="standId != null">
@@ -627,7 +700,8 @@
         </if>
     </select>
 
-    <select id="selectAllItemsSvpps" resultType="com.adc.da.sys.common.SelectionResult" parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
+    <select id="selectAllItemsSvpps" resultType="com.adc.da.sys.common.SelectionResult"
+            parameterType="com.adc.da.slrs.sarStandItems.entity.SarStandItems">
         select stand_id as label,svpps as value from SAR_STAND_ITEMS
         where valid_flag = 0 and svpps != ''
         <if test="standId != null">
@@ -643,6 +717,9 @@
 
 
     <select id="selectAllItemsByIds" resultType="com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto">
+        select
+        ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as
+        responsibleEngineer
         select ID,STAND_ID,ITEMS_NUM,ITEMS_NAME,RESPONSIBLE_UNIT,SVPPS,APPLY_ARCTIC,CLAIM_TYPE,BUS_STAND_COVER,DUTY_ENGINEER as responsibleEngineer,XCXSSRQ as xcxssrq,ZCCSSRQ as zccssrq
         from SAR_STAND_ITEMS
         where FILE_TYPE=#{type}