es字段

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

@@ -179,8 +179,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
                 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("FBJGName")).append("  ");
-                contentBuilder.append("我司署名人:").append(attrInfoMap.get("WSSMRName")).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("  ");
             }
@@ -188,8 +190,10 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             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("ZRBMName")).append("  ");
-            contentBuilder.append("责任工程师:").append(attrInfoMap.get("ZRGCSName")).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("  ");
@@ -309,15 +313,17 @@ public class StandLawsSearchServiceImpl implements StandLawsSearchService {
             StringBuilder contentBuilder = new StringBuilder();
             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("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("QCDWName")).append("  ");
-            contentBuilder.append("起草人:").append(attrInfoMap.get("QCRBUSSName")).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("  ");

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

@@ -2605,6 +2605,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             for (int i = 0; i < attidlist.length; i++) {
                 if(StringUtils.isNotEmpty(attidlist[i]) && !"null".equals(attidlist[i])){
                     AttFileEO attFileEO = attFileEOService.getFileInfo(attidlist[i]);
+                    if (null == attFileEO){
+                        continue;
+                    }
                     String readFilePath = filePath + "/" + attFileEO.getFilePath() + attFileEO.getFileName();
                     try {
                         // 判断文件是docx还是PDF