diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
index 973fb7cd..5c239a4b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java
@@ -32,7 +32,7 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
     List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType);
 
     SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception;
-
+    public void attrInfoDetails (SarStandardsInfo row) throws Exception;
     boolean updateStandardsMenu(SarStandardsInfoEOPage standardsInfoEO);
 
     boolean updateStandInfo(SarStandardsInfoEOPage standardsInfoEO);
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
index 6345dc36..b8c0ea03 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
@@ -70,7 +70,7 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author super_liu
@@ -152,7 +152,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     private SysInfoEOService sysInfoEOService;
 
 
-
     /***
      * @Description: 分页查询
      * @Author: super_liu
@@ -162,8 +161,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      */
     public List<SarStandardsInfo> getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception {
         //查询当前登录人角色拥有权限的菜单
-        List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType()+"_STAND",null);
-        if(getMenuIdList != null && !getMenuIdList.isEmpty()){
+        List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
+        if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
             page.setMenuRoleList(getMenuIdList);
         } else {
             page.setMenuRoleList(null);
@@ -186,33 +185,34 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      * @Param: [sarlist]
      * @Return: void
      */
-    public void attrInfo (List<SarStandardsInfo> sarlist) throws Exception {
-        for(SarStandardsInfo row : sarlist){
+    public void attrInfo(List<SarStandardsInfo> sarlist) throws Exception {
+        for (SarStandardsInfo row : sarlist) {
             attrInfoDetails(row);
         }
     }
 
-    public void attrInfoDetails (SarStandardsInfo row) throws Exception {
+
+    public void attrInfoDetails(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());
+            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);
+                    getAttrMap.put(clobField, fieldValue);
                 }
             }
             // 组织机构和人员
-            Map<String,Object> newMap = new HashMap<>();
+            Map<String, Object> newMap = new HashMap<>();
             if (getAttrMap != null) {
-                for (Map.Entry<String,Object> entry : getAttrMap.entrySet()) {
-                    if ("EOPSSRQ".equals(entry.getKey())){
-                        if (entry.getValue() != null && entry.getValue().toString().length()>10){
+                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
+                    if ("EOPSSRQ".equals(entry.getKey())) {
+                        if (entry.getValue() != null && entry.getValue().toString().length() > 10) {
                             String time = DateUtil.formatStrUTCToDateStr(entry.getValue().toString());
                             entry.setValue(time);
                         }
@@ -224,7 +224,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     if ("SVPPS".equals(name)) {
                         Set<String> set = new HashSet();
                         // 查询条款svpps
-                        Set<String> itemSvpps = sarStandItemsEODao.selectSvppsByStandId(row.getId(),null,null);
+                        Set<String> itemSvpps = sarStandItemsEODao.selectSvppsByStandId(row.getId(), null, null);
                         if (itemSvpps != null && !itemSvpps.isEmpty()) {
                             set.addAll(itemSvpps);
                         }
@@ -237,12 +237,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                             entry.setValue(allVal);
                             value = sysInfoEOService.getSvppsNamesByIds(allVal);
                         }
-                        newMap.put(name + "Name",value);
+                        newMap.put(name + "Name", value);
                     } else if ("YQLX".equals(name)) {
                         //要求类型来源于条款
                         SarStandItems sarStandItemsEO = new SarStandItems();
                         sarStandItemsEO.setStandId(row.getId());
-                        Set<String> itemClaimType = sarStandItemsEODao.selectClaimTypesByStandId(row.getId(),null,null);
+                        Set<String> itemClaimType = sarStandItemsEODao.selectClaimTypesByStandId(row.getId(), null, null);
                         if (itemClaimType != null && itemClaimType.size() > 1) {
                             entry.setValue("RENVECPFGT");
                         } else if (itemClaimType != null && itemClaimType.size() == 1) {
@@ -253,13 +253,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         String selVal = InitStandAttrUtil.selectFieldMap.get(name);
                         if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal)) {
                             value = sysInfoEOService.getOrgNamesByIds(value);
-                            newMap.put(name + "Name",value);
+                            newMap.put(name + "Name", value);
                         } else if (SelectionTypeEnum.USERLIST.getValue().equals(selVal)) {
                             value = sysInfoEOService.getUserNamesByIds(value);
-                            newMap.put(name + "Name",value);
+                            newMap.put(name + "Name", value);
                         } else if (SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) {
                             value = sysInfoEOService.getRoleNamesByIds(value);
-                            newMap.put(name + "Name",value);
+                            newMap.put(name + "Name", value);
                         }
                     }
                 }
@@ -269,14 +269,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    public void attrInfoShow (List<SarStandardsInfo> sarlist) throws Exception {
-        for(SarStandardsInfo row : sarlist){
+    public void attrInfoShow(List<SarStandardsInfo> sarlist) throws Exception {
+        for (SarStandardsInfo row : sarlist) {
             attrInfoDetails(row);
             Map<String, Object> getAttrMap = row.getAttrInfoMap();
             Map<String, Object> getNewMap = new LinkedHashMap<>();
             if (getAttrMap != null && getAttrMap.size() > 0) {
                 String svppsTip = "";
-                for (Map.Entry<String,Object> entry : getAttrMap.entrySet()) {
+                for (Map.Entry<String, Object> entry : getAttrMap.entrySet()) {
                     String name = entry.getKey();
                     String value = "";
                     if ("SVPPS".equals(name)) {
@@ -302,7 +302,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         } else {
                             String selVal = InitStandAttrUtil.selectFieldMap.get(name);
                             if (SelectionTypeEnum.ORGLIST.getValue().equals(selVal) || SelectionTypeEnum.USERLIST.getValue().equals(selVal) || SelectionTypeEnum.ROLELIST.getValue().equals(selVal)) {
-                                if(getAttrMap.get(name + "Name") != null){
+                                if (getAttrMap.get(name + "Name") != null) {
                                     value = String.valueOf(getAttrMap.get(name + "Name"));
                                 }
                             } else {
@@ -313,7 +313,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         entry.setValue(value);
                     }
                 }
-                getAttrMap.put("SVPPSTips",svppsTip);
+                getAttrMap.put("SVPPSTips", svppsTip);
             }
         }
     }
@@ -343,16 +343,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             sarStandMenuEODao.insert(sarStandMenuEO);
         }
         // 根据其他字段，生成标准状态
-        updateStandState(sarStandardsInfoEO,null);
+        updateStandState(sarStandardsInfoEO, null);
         int insertResult = dao.insertSelective(sarStandardsInfoEO);
         if (insertResult > 0) {
             // 修改属性表数据
             sarStandAttrInfoEODao.deleteStandAttrByStandId(sarStandardsInfoEO.getId());
             //编写预警信息
 //            writeWarnings(sarStandardsInfoEO);
-            updateCiteStand(sarStandardsInfoEO,null,"DTBJH","BDTBZBH");
-            updateCiteStand(sarStandardsInfoEO,null,"YYBJ","BYYBJ");
-            updateRelateStand(sarStandardsInfoEO,"CBBH");
+            updateCiteStand(sarStandardsInfoEO, null, "DTBJH", "BDTBZBH");
+            updateCiteStand(sarStandardsInfoEO, null, "YYBJ", "BYYBJ");
+            updateRelateStand(sarStandardsInfoEO, "CBBH");
             // 根据代替标准号修改被代替的标准的状态  修改为已修订状态
             replaseStandState(sarStandardsInfoEO);
             // 处理属性表信息
@@ -365,7 +365,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 number += "-" + sarStandardsInfoEO.getStandYear();
             }
             String content = "新增" + number + " 《" + sarStandardsInfoEO.getStandName() + "》";
-            sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(),sarStandardsInfoEO.getStandType()+"_STAND",content);
+            sarUpdLogEOService.createBaseLog(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND", content);
 //            if(elasflag) {
 //                // 消息队列
 //                createStandMQService.sendStandMQ(sarStandardsInfoEO,"add");
@@ -380,19 +380,19 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      * @Param: [sarStandardsInfoEO]
      * @Return: void
      */
-    public void createStandAttrInfo (SarStandardsInfo sarStandardsInfoEO) throws Exception {
+    public void createStandAttrInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception {
         String sarStandAttrEOStr = sarStandardsInfoEO.getSarStandAttrEOStr();
         String mustFields = FieldConvertUtil.mustFields;
         String mustValues = FieldConvertUtil.mustValues(sarStandardsInfoEO.getId());
         // 将字符串转为map进行解析
-        Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
+        Map<String, String> sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr);
         StringBuilder fieldsBuilder = new StringBuilder();
         StringBuilder valuesBuilder = new StringBuilder();
-        Map<String,String> selectionMap = new HashMap<>();
-        Map<String,String> fileMap = new HashMap<>();
-        Map<String,String> multiTimeMap = new HashMap<>();
+        Map<String, String> selectionMap = new HashMap<>();
+        Map<String, String> fileMap = new HashMap<>();
+        Map<String, String> multiTimeMap = new HashMap<>();
         String fileIds = "";
-        for (Map.Entry<String,String> entry : sarStandAttrMap.entrySet()) {
+        for (Map.Entry<String, String> entry : sarStandAttrMap.entrySet()) {
             String attrKey = entry.getKey();
             String attrValue = String.valueOf(entry.getValue());
             if (InitStandAttrUtil.queryFieldList != null && !InitStandAttrUtil.queryFieldList.isEmpty()) {
@@ -407,15 +407,15 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     }
                     // 多选项，文件类型需要单独处理 向子表添加数据
                     if (InitStandAttrUtil.selectionFieldList.contains(attrKey)) {
-                        selectionMap.put(attrKey,attrValue);
+                        selectionMap.put(attrKey, attrValue);
                     } else if (InitStandAttrUtil.fileFieldList.contains(attrKey)) {
-                        fileMap.put(attrKey,attrValue);
+                        fileMap.put(attrKey, attrValue);
                         fileIds += attrValue + ",";
-                        if(attrKey.equals("XXZLXX")){
+                        if (attrKey.equals("XXZLXX")) {
 //                            this.saveMsgDynamicInfo(attrValue,sarStandardsInfoEO.getStandName(),sarStandardsInfoEO.getId(),sarStandardsInfoEO.getStandSort()+" "+sarStandardsInfoEO.getStandNumber()+"-"+sarStandardsInfoEO.getStandYear());
                         }
                     } else if (InitStandAttrUtil.multiTimeFieldList.contains(attrKey)) {
-                        multiTimeMap.put(attrKey,attrValue);
+                        multiTimeMap.put(attrKey, attrValue);
                     }
                     // 不同类型存储数据需单独处理值
                     if (InitStandAttrUtil.numFieldList.contains(attrKey)) {
@@ -434,14 +434,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         String insertField = mustFields + fieldsBuilder.toString();
         String insertValue = mustValues + valuesBuilder.toString();
-        int insertRes = sarStandAttrInfoEODao.insertStandAttr(insertField,insertValue);
+        int insertRes = sarStandAttrInfoEODao.insertStandAttr(insertField, insertValue);
         if (insertRes > 0) {
             // 多选项处理
-            createStandVal(sarStandardsInfoEO.getId(),selectionMap);
+            createStandVal(sarStandardsInfoEO.getId(), selectionMap);
             // 文件处理
-            createStandFile(sarStandardsInfoEO.getId(),fileMap);
+            createStandFile(sarStandardsInfoEO.getId(), fileMap);
             // 多时间处理
-            createStandPutTime(sarStandardsInfoEO.getId(),multiTimeMap);
+            createStandPutTime(sarStandardsInfoEO.getId(), multiTimeMap);
         }
     }
 
@@ -452,10 +452,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      * @Param: [sarStandardsInfoEO, selectionMap]
      * @Return: void
      */
-    public void createStandVal (String standId,Map<String,String> selectionMap) {
+    public void createStandVal(String standId, Map<String, String> selectionMap) {
         if (selectionMap != null && selectionMap.size() > 0) {
             List<SarStandVal> standValList = new ArrayList<>();
-            for (Map.Entry<String,String> entry : selectionMap.entrySet()) {
+            for (Map.Entry<String, String> entry : selectionMap.entrySet()) {
                 String value = entry.getValue();
                 String field = entry.getKey();
                 if (StringUtils.isNotBlank(value)) {
@@ -486,16 +486,16 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      * @Param: [standId, fileMap]
      * @Return: void
      */
-    public void createStandFile (String standId,Map<String,String> fileMap) throws Exception {
+    public void createStandFile(String standId, Map<String, String> fileMap) throws Exception {
         if (fileMap != null && fileMap.size() > 0) {
             List<SarStandFile> standFileList = new ArrayList<>();
-            for (Map.Entry<String,String> entry : fileMap.entrySet()) {
+            for (Map.Entry<String, String> entry : fileMap.entrySet()) {
                 String value = entry.getValue();
                 String field = entry.getKey();
                 if (StringUtils.isNotBlank(value)) {
                     List<AttFileEO> fileList = attFileEOService.getMultiFileInfos(value);
                     if (fileList != null && !fileList.isEmpty()) {
-                        createStandFileAppend(standId,field,fileList,standFileList);
+                        createStandFileAppend(standId, field, fileList, standFileList);
                     }
                 }
             }
@@ -505,7 +505,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    public void createStandFileAppend (String standId,String field,List<AttFileEO> fileList,List<SarStandFile> standFileList) throws Exception {
+    public void createStandFileAppend(String standId, String field, List<AttFileEO> fileList, List<SarStandFile> standFileList) throws Exception {
         for (AttFileEO fileInfo : fileList) {
             SarStandFile sarStandFileEO = new SarStandFile();
             sarStandFileEO.setCreationUser(LoginUserUtil.getUserId());
@@ -553,7 +553,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    public void createStandPutTime(String standId,Map<String,String> multiTimeMap) throws Exception{
+    public void createStandPutTime(String standId, Map<String, String> multiTimeMap) throws Exception {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         if (multiTimeMap != null && multiTimeMap.size() > 0) {
             List<SarStandPutTime> standTimeList = new ArrayList<>();
@@ -562,7 +562,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 String field = entry.getKey();
                 if (StringUtils.isNotBlank(value)) {
                     String[] valArr = value.trim().split(",");
-                    int i=0;
+                    int i = 0;
                     for (String val : valArr) {
                         if ("N/A".equals(val) && "TBD".equals(val) && "已实施".equals(val)) {
                             i++;
@@ -588,18 +588,18 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     }
 
     // 新增修改标准过程中，根据代替标准号，修改被代替标准号对应的标准
-    public void updateCiteStand(SarStandardsInfo sarStandardsInfoEO,SarStandardsInfo beforeSarStandardsInfo,String upField,String beUpedField) throws Exception {
+    public void updateCiteStand(SarStandardsInfo sarStandardsInfoEO, SarStandardsInfo beforeSarStandardsInfo, String upField, String beUpedField) throws Exception {
         // 记录要被代替标准号的数据
 //        SarStandardsInfoEO chageEO= new SarStandardsInfoEO();
         SarStandardsInfo sarStandardsSelectEO = new SarStandardsInfo();
         String addStrandNumber = "";
         String beforeStrandNumber = "";
-        if(StringUtils.isNotEmpty(sarStandardsInfoEO.getStandYear())){
-            addStrandNumber = sarStandardsInfoEO.getStandSort()+" " +sarStandardsInfoEO.getStandNumber()+"-"+sarStandardsInfoEO.getStandYear();
+        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getStandYear())) {
+            addStrandNumber = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear();
         } else {
-            addStrandNumber = sarStandardsInfoEO.getStandSort()+" " +sarStandardsInfoEO.getStandNumber();
+            addStrandNumber = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber();
         }
-        if(beforeSarStandardsInfo!= null ) {
+        if (beforeSarStandardsInfo != null) {
             if (StringUtils.isNotEmpty(beforeSarStandardsInfo.getStandYear())) {
                 beforeStrandNumber = beforeSarStandardsInfo.getStandSort() + " " + beforeSarStandardsInfo.getStandNumber() + "-" + beforeSarStandardsInfo.getStandYear();
             } else {
@@ -615,66 +615,66 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         } else if ("DTBJH".equals(upField)) {
             newCiteStand = sarStandardsInfoEO.getReplaceStandNum();
         }
-        if(StringUtils.isNotEmpty(newCiteStand) && newCiteStand.split(",").length>0){
+        if (StringUtils.isNotEmpty(newCiteStand) && newCiteStand.split(",").length > 0) {
             // 主要逻辑处理新增的
             String nowEOrepNums[] = newCiteStand.split(",");
-            for (String citeStand: nowEOrepNums){
+            for (String citeStand : nowEOrepNums) {
                 sarStandardsSelectEO.setStandNumber(citeStand);
-                if (StringUtils.isNotBlank(sarStandardsSelectEO.getStandNumber())){
+                if (StringUtils.isNotBlank(sarStandardsSelectEO.getStandNumber())) {
                     String sort = "";
-                    if (sarStandardsSelectEO.getStandNumber().length()>3) {
+                    if (sarStandardsSelectEO.getStandNumber().length() > 3) {
                         sort = sarStandardsSelectEO.getStandNumber().substring(0, 3);
                     }
                     if ("ECE".equals(sort)) {
                         int length = sarStandardsSelectEO.getStandNumber().length();
-                        String number = sarStandardsSelectEO.getStandNumber().substring(3,length);
+                        String number = sarStandardsSelectEO.getStandNumber().substring(3, length);
                         sarStandardsSelectEO.setStandNumber("UN(ECE)" + number);
                     }
                 }
                 List<SarStandardsInfo> result = dao.selectStandardsByStandnumber(sarStandardsSelectEO);
-                if (result != null && result.size()>0){
+                if (result != null && result.size() > 0) {
                     String standId = result.get(0).getId();
                     String field = beUpedField;
-                    String citedStand = sarStandAttrInfoEODao.selectFieldValByStandId(field,result.get(0).getId());
+                    String citedStand = sarStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId());
                     String changeCitedStand = "";
-                    if(StringUtils.isNotBlank(citedStand)){
-                        String[]  beforeReplacedStandNumStr = citedStand.split(",");
-                        if (Arrays.asList(beforeReplacedStandNumStr).contains(addStrandNumber)){
+                    if (StringUtils.isNotBlank(citedStand)) {
+                        String[] beforeReplacedStandNumStr = citedStand.split(",");
+                        if (Arrays.asList(beforeReplacedStandNumStr).contains(addStrandNumber)) {
                             continue;
                         } else {
-                            changeCitedStand = citedStand+","+ addStrandNumber;
+                            changeCitedStand = citedStand + "," + addStrandNumber;
                         }
                     } else {
                         changeCitedStand = addStrandNumber;
                     }
-                    sarStandAttrInfoEODao.updateStandInfo(standId,field,changeCitedStand);
+                    sarStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand);
                 }
             }
             // 如果id不为空，说明是修改，有逻辑删除的执行以下语句,存在之前是三项，现在修改成两项的情况
-            if (null != beforeSarStandardsInfo){
+            if (null != beforeSarStandardsInfo) {
                 String oldCiteStand = String.valueOf(beforeSarStandardsInfo.getAttrInfoMap().get(upField));
-                if(StringUtils.isNotEmpty(oldCiteStand)) {
-                    String [] beforeEOrepNums = oldCiteStand.split(",");
-                    for (String beforeStr:beforeEOrepNums){
+                if (StringUtils.isNotEmpty(oldCiteStand)) {
+                    String[] beforeEOrepNums = oldCiteStand.split(",");
+                    for (String beforeStr : beforeEOrepNums) {
                         // 如果再旧的中包含，在新的中没有，需要删除
-                        if (!Arrays.asList(nowEOrepNums).contains(beforeStr)){
+                        if (!Arrays.asList(nowEOrepNums).contains(beforeStr)) {
                             sarStandardsSelectEO.setStandNumber(beforeStr);
                             List<SarStandardsInfo> result = dao.selectStandardsByStandnumber(sarStandardsSelectEO);
-                            if (result != null && result.size()>0){
+                            if (result != null && result.size() > 0) {
                                 String standId = result.get(0).getId();
                                 String field = beUpedField;
-                                String citedStand = sarStandAttrInfoEODao.selectFieldValByStandId(field,result.get(0).getId());
+                                String citedStand = sarStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId());
                                 String changeCitedStand = "";
-                                if(StringUtils.isNotBlank(citedStand)){
-                                    String[]  beforerepalced = citedStand.split(",");
+                                if (StringUtils.isNotBlank(citedStand)) {
+                                    String[] beforerepalced = citedStand.split(",");
                                     ArrayList beforlist = new ArrayList<>(Arrays.asList(beforerepalced));
-                                    if (beforlist.contains(beforeStrandNumber)){
+                                    if (beforlist.contains(beforeStrandNumber)) {
                                         beforlist.remove(beforeStrandNumber);
                                         changeCitedStand = StringUtils.join(beforlist.toArray(), ",");
                                     } else {
                                         continue;
                                     }
-                                    sarStandAttrInfoEODao.updateStandInfo(standId,field,changeCitedStand);
+                                    sarStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand);
                                 }
                             }
                         }
@@ -684,29 +684,29 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
         } else {
             // 如果为空，判断是否为修改
-            if (null != beforeSarStandardsInfo){
+            if (null != beforeSarStandardsInfo) {
                 String oldCiteStand = String.valueOf(beforeSarStandardsInfo.getAttrInfoMap().get("YYBJ"));
-                if(StringUtils.isNotEmpty(oldCiteStand)) {
-                    String [] beforeEOrepNums = oldCiteStand.split(",");
-                    for (String beforeStr:beforeEOrepNums){
+                if (StringUtils.isNotEmpty(oldCiteStand)) {
+                    String[] beforeEOrepNums = oldCiteStand.split(",");
+                    for (String beforeStr : beforeEOrepNums) {
                         // 如果再旧的中包含，在新的中没有，需要删除,相关数据取第一条是因为标准号是唯一的
                         sarStandardsSelectEO.setStandNumber(beforeStr);
                         List<SarStandardsInfo> result = dao.selectStandardsByStandnumber(sarStandardsSelectEO);
-                        if (result != null && result.size()>0){
+                        if (result != null && result.size() > 0) {
                             String standId = result.get(0).getId();
                             String field = "BYYBJ";
-                            String citedStand = sarStandAttrInfoEODao.selectFieldValByStandId(field,result.get(0).getId());
+                            String citedStand = sarStandAttrInfoEODao.selectFieldValByStandId(field, result.get(0).getId());
                             String changeCitedStand = "";
-                            if(StringUtils.isNotBlank(citedStand)){
-                                String[]  beforerepalced = citedStand.split(",");
+                            if (StringUtils.isNotBlank(citedStand)) {
+                                String[] beforerepalced = citedStand.split(",");
                                 ArrayList beforlist = new ArrayList<>(Arrays.asList(beforerepalced));
-                                if (beforlist.contains(beforeStrandNumber)){
+                                if (beforlist.contains(beforeStrandNumber)) {
                                     beforlist.remove(beforeStrandNumber);
                                     changeCitedStand = StringUtils.join(beforlist.toArray(), ",");
                                 } else {
                                     continue;
                                 }
-                                sarStandAttrInfoEODao.updateStandInfo(standId,field,changeCitedStand);
+                                sarStandAttrInfoEODao.updateStandInfo(standId, field, changeCitedStand);
                             }
                         }
                     }
@@ -715,12 +715,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
-    public void updateRelateStand(SarStandardsInfo sarStandardsInfoEO,String upField){
+    public void updateRelateStand(SarStandardsInfo sarStandardsInfoEO, String upField) {
         String addStandNumber = "";
-        if(StringUtils.isNotEmpty(sarStandardsInfoEO.getStandYear())){
-            addStandNumber = sarStandardsInfoEO.getStandSort()+" " +sarStandardsInfoEO.getStandNumber()+"-"+sarStandardsInfoEO.getStandYear();
+        if (StringUtils.isNotEmpty(sarStandardsInfoEO.getStandYear())) {
+            addStandNumber = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear();
         } else {
-            addStandNumber = sarStandardsInfoEO.getStandSort()+" " +sarStandardsInfoEO.getStandNumber();
+            addStandNumber = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber();
         }
         if (StringUtils.isNotBlank(addStandNumber)) {
             String relateStand = "";
@@ -735,22 +735,22 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     selectEO.setStandNumber(newRelate);
                     List<SarStandardsInfo> result = dao.selectStandardsByStandnumber(selectEO);
                     // 新增关联
-                    if (result != null && result.size()>0) {
+                    if (result != null && result.size() > 0) {
                         String standId = result.get(0).getId();
                         newStandIdList.add(standId);
-                        String relatedStand = sarStandAttrInfoEODao.selectFieldValByStandId(upField,standId);
+                        String relatedStand = sarStandAttrInfoEODao.selectFieldValByStandId(upField, standId);
                         String changeStand = "";
-                        if(StringUtils.isNotBlank(relatedStand)){
+                        if (StringUtils.isNotBlank(relatedStand)) {
                             List beforelist = new ArrayList<>(Arrays.asList(relatedStand.split(",")));
-                            if (!beforelist.contains(addStandNumber)){
+                            if (!beforelist.contains(addStandNumber)) {
                                 beforelist.add(addStandNumber);
                                 changeStand = StringUtils.join(beforelist.toArray(), ",");
-                                sarStandAttrInfoEODao.updateStandInfo(standId,upField,changeStand);
+                                sarStandAttrInfoEODao.updateStandInfo(standId, upField, changeStand);
                             } else {
                                 continue;
                             }
                         } else {
-                            sarStandAttrInfoEODao.updateStandInfo(standId,upField,addStandNumber);
+                            sarStandAttrInfoEODao.updateStandInfo(standId, upField, addStandNumber);
                         }
                     }
                 }
@@ -759,7 +759,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             if (newStandIdList == null || newStandIdList.size() < 1) {
                 newStandIdList = null;
             }
-            List<SelectionResult> resultList = sarStandAttrInfoEODao.selectFieldValByContainsVal(upField,addStandNumber,newStandIdList);
+            List<SelectionResult> resultList = sarStandAttrInfoEODao.selectFieldValByContainsVal(upField, addStandNumber, newStandIdList);
             if (resultList != null && !resultList.isEmpty()) {
                 for (SelectionResult result : resultList) {
                     String relatedStand = result.getLabel();
@@ -770,7 +770,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     } else {
                         relatedStand = "";
                     }
-                    sarStandAttrInfoEODao.updateStandInfo(result.getValue(),upField,relatedStand);
+                    sarStandAttrInfoEODao.updateStandInfo(result.getValue(), upField, relatedStand);
                 }
             }
         }
@@ -778,33 +778,34 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
     /**
      * 代替标准号修改状态
+     *
      * @param sarStandardsInfoEO
      */
     public void replaseStandState(SarStandardsInfo sarStandardsInfoEO) throws Exception {
         String newCiteStand = sarStandardsInfoEO.getReplaceStandNum();
-        if(StringUtils.isNotBlank(newCiteStand)){
+        if (StringUtils.isNotBlank(newCiteStand)) {
             String nowEOrepNums[] = newCiteStand.split(",");
-            for (String citeStand: nowEOrepNums){
-                SarStandardsInfo sarStandardsSelectEO =new SarStandardsInfo();
+            for (String citeStand : nowEOrepNums) {
+                SarStandardsInfo sarStandardsSelectEO = new SarStandardsInfo();
                 sarStandardsSelectEO.setStandNumber(citeStand);
                 List<SarStandardsInfo> result = dao.selectStandardsByStandnumber(sarStandardsSelectEO);
-                if (result != null && !result.isEmpty()){
+                if (result != null && !result.isEmpty()) {
                     SarStandardsInfo replaseStand = result.get(0);
                     String standState = replaseStand.getStandState();
                     String oldStandState = standState;
                     String oldStandStateShow = SarStandStateEnum.getLableByVal(oldStandState);
-                    if(!SarStandStateEnum.N5KLTFLNRC.getValue().equals(standState)|| !SarStandStateEnum.TOVOID.getValue().equals(standState)){
+                    if (!SarStandStateEnum.N5KLTFLNRC.getValue().equals(standState) || !SarStandStateEnum.TOVOID.getValue().equals(standState)) {
                         replaseStand.setStandState(SarStandStateEnum.N5KLTFLNRC.getValue());
                         dao.updateById(replaseStand);
                         //更新log日志
-                        sarUpdLogEOService.createBaseLog(replaseStand.getId(),replaseStand.getStandType()+"_STAND","入库流程当前标准因被新标准代替修改标准状态的值从《"+oldStandStateShow+"》为《\"已修订\"》");
+                        sarUpdLogEOService.createBaseLog(replaseStand.getId(), replaseStand.getStandType() + "_STAND", "入库流程当前标准因被新标准代替修改标准状态的值从《" + oldStandStateShow + "》为《\"已修订\"》");
                     }
                 }
             }
         }
     }
 
-    public void updateStandState (SarStandardsInfo sarStandardsInfoEO,String oldState) {
+    public void updateStandState(SarStandardsInfo sarStandardsInfoEO, String oldState) {
         String resultState = "";
         String newState = sarStandardsInfoEO.getStandState();
         String standNum = "";
@@ -823,10 +824,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             if (countRep != null && !countRep.isEmpty()) {
                 for (String state : countRep) {
                     if (SarStandStateEnum.FJNVYX9Q7J.getValue().equals(state)) {
-                        countFB ++;
+                        countFB++;
                         break;
                     } else if (selectList.indexOf(state) < selectList.indexOf(SarStandStateEnum.FJNVYX9Q7J.getValue())) {
-                        countQT ++;
+                        countQT++;
                     }
                 }
             }
@@ -836,7 +837,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 newState = SarStandStateEnum.ZTJJSS.getValue();
             } else {
                 // 查询各个文件稿状态
-                Map<String,String> sarStandAttrMap = JSONObject.fromObject(sarStandardsInfoEO.getSarStandAttrEOStr());
+                Map<String, String> sarStandAttrMap = JSONObject.fromObject(sarStandardsInfoEO.getSarStandAttrEOStr());
                 if (sarStandAttrMap != null && !sarStandAttrMap.isEmpty()) {
                     if (StringUtils.isNotBlank(sarStandAttrMap.get("FBGBJBD"))) {
                         newState = SarStandStateEnum.FJNVYX9Q7J.getValue();
@@ -911,14 +912,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         //修改标准过程中，重新修改代替标准号对应的标准的被代替标准号
 //        updateReplacedNumber(sarStandardsInfoEO,beforeSarStandardsInfo);
         // 根据引用标准修改其他被引用标准
-        updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"DTBJH","BDTBZBH");
-        updateCiteStand(sarStandardsInfoEO,beforeSarStandardsInfo,"YYBJ","BYYBJ");
+        updateCiteStand(sarStandardsInfoEO, beforeSarStandardsInfo, "DTBJH", "BDTBZBH");
+        updateCiteStand(sarStandardsInfoEO, beforeSarStandardsInfo, "YYBJ", "BYYBJ");
         // 根据对应其他标准修改其他对应其他标准
-        updateRelateStand(sarStandardsInfoEO,"CBBH");
+        updateRelateStand(sarStandardsInfoEO, "CBBH");
         // 根据代替标准号修改被代替的标准的状态  修改为已修订状态
         replaseStandState(sarStandardsInfoEO);
         // 记录修改日志
-        saveUpdateLog(sarStandardsInfoEO,beforeSarStandardsInfo);
+        saveUpdateLog(sarStandardsInfoEO, beforeSarStandardsInfo);
 //        if(elasflag) {
 //            createStandMQService.sendStandMQ(sarStandardsInfoEO,"update");
 //            List<String> bhs = new ArrayList<>(Arrays.asList(String.valueOf(map.get("DTBJH")).split(",")));
@@ -955,41 +956,41 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return result;
     }
 
-    public void saveUpdateLog(SarStandardsInfo sarStandardsInfoEO,SarStandardsInfo beforeSarStandardsInfo) throws Exception{
-        Map<String,Object> newMap = new HashMap<>();
-        Map<String,Object> oldMap = beforeSarStandardsInfo.getAttrInfoMap();
+    public void saveUpdateLog(SarStandardsInfo sarStandardsInfoEO, SarStandardsInfo beforeSarStandardsInfo) throws Exception {
+        Map<String, Object> newMap = new HashMap<>();
+        Map<String, Object> oldMap = beforeSarStandardsInfo.getAttrInfoMap();
         String attrStr = sarStandardsInfoEO.getSarStandAttrEOStr();
         if (StringUtils.isNotBlank(attrStr)) {
             newMap = JSONObject.fromObject(attrStr);
         }
-        newMap = changeMap(sarStandardsInfoEO,newMap);
-        oldMap = changeMap(beforeSarStandardsInfo,oldMap);
+        newMap = changeMap(sarStandardsInfoEO, newMap);
+        oldMap = changeMap(beforeSarStandardsInfo, oldMap);
         // 增加关联事件
         String number = sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber();
         if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
             number += "-" + sarStandardsInfoEO.getStandYear();
         }
         String content = number + " 《" + sarStandardsInfoEO.getStandName() + "》";
-        sarUpdLogEOService.createUpdateLog(sarStandardsInfoEO.getStandType()+"_STAND",sarStandardsInfoEO.getId(),oldMap,newMap,content);
+        sarUpdLogEOService.createUpdateLog(sarStandardsInfoEO.getStandType() + "_STAND", sarStandardsInfoEO.getId(), oldMap, newMap, content);
     }
 
-    public Map<String,Object> changeMap (SarStandardsInfo sarStandardsInfoEO,Map<String,Object> map) {
-        map.put("country",sarStandardsInfoEO.getCountry());
-        map.put("isRelateAccess",sarStandardsInfoEO.getIsRelateAccess());
-        map.put("standSort",sarStandardsInfoEO.getStandSort());
-        map.put("standNumber",sarStandardsInfoEO.getStandNumber());
-        map.put("standYear",sarStandardsInfoEO.getStandYear());
-        map.put("standName",sarStandardsInfoEO.getStandName());
-        map.put("standEnName",sarStandardsInfoEO.getStandEnName());
-        map.put("standNature",sarStandardsInfoEO.getStandNature());
-        map.put("standState",sarStandardsInfoEO.getStandState());
+    public Map<String, Object> changeMap(SarStandardsInfo sarStandardsInfoEO, Map<String, Object> map) {
+        map.put("country", sarStandardsInfoEO.getCountry());
+        map.put("isRelateAccess", sarStandardsInfoEO.getIsRelateAccess());
+        map.put("standSort", sarStandardsInfoEO.getStandSort());
+        map.put("standNumber", sarStandardsInfoEO.getStandNumber());
+        map.put("standYear", sarStandardsInfoEO.getStandYear());
+        map.put("standName", sarStandardsInfoEO.getStandName());
+        map.put("standEnName", sarStandardsInfoEO.getStandEnName());
+        map.put("standNature", sarStandardsInfoEO.getStandNature());
+        map.put("standState", sarStandardsInfoEO.getStandState());
 //        if (sarStandardsInfoEO.getIssueTime() != null) {
 //            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
 //            String issueStr = format.format(sarStandardsInfoEO.getIssueTime());
 //
 //        }
-        map.put("issueTime",sarStandardsInfoEO.getIssueTime());
-        map.put("synopsis",sarStandardsInfoEO.getSynopsis());
+        map.put("issueTime", sarStandardsInfoEO.getIssueTime());
+        map.put("synopsis", sarStandardsInfoEO.getSynopsis());
         return map;
     }
 
@@ -1012,7 +1013,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             // 删除标准属性表
             sarStandAttrInfoEODao.deleteStandAttrByStandId(id);
             // 删除标准下条款
-            sarStandItemsEODao.deleteByStandIdAndFileType(id,null);
+            sarStandItemsEODao.deleteByStandIdAndFileType(id, null);
             //删除标准关联的value表
             sarStandValEODao.deleteDataByStandid(id);
             sarStandPutTimeEODao.deleteByStandId(id);
@@ -1048,37 +1049,38 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
     /**
      * 删除标准同时删除代替关系
+     *
      * @param getDelStandInfo
      */
-    public void updateStandReplaceConnect(SarStandardsInfo getDelStandInfo){
-        if(getDelStandInfo != null){
+    public void updateStandReplaceConnect(SarStandardsInfo getDelStandInfo) {
+        if (getDelStandInfo != null) {
             //查询该条标准代替过的标准
             SarStandardsInfoEOPage sarStandardsInfoEOPage = new SarStandardsInfoEOPage();
             String standNum = "";
-            if(StringUtils.isNotEmpty(getDelStandInfo.getStandYear())){
-                standNum = getDelStandInfo.getStandSort()+" "+getDelStandInfo.getStandNumber()+"-"+getDelStandInfo.getStandYear();
-            }else{
-                standNum = getDelStandInfo.getStandSort()+" "+getDelStandInfo.getStandNumber();
+            if (StringUtils.isNotEmpty(getDelStandInfo.getStandYear())) {
+                standNum = getDelStandInfo.getStandSort() + " " + getDelStandInfo.getStandNumber() + "-" + getDelStandInfo.getStandYear();
+            } else {
+                standNum = getDelStandInfo.getStandSort() + " " + getDelStandInfo.getStandNumber();
             }
             sarStandardsInfoEOPage.setReplacedStandNum(standNum);
             List<SarStandardsInfo> getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage);
-            if(getReplacedStands != null && !getReplacedStands.isEmpty()){
-                for(SarStandardsInfo stand : getReplacedStands){
+            if (getReplacedStands != null && !getReplacedStands.isEmpty()) {
+                for (SarStandardsInfo stand : getReplacedStands) {
                     SarStandardsInfo newStand = new SarStandardsInfo();
                     newStand.setId(stand.getId());
                     String replacedNum = stand.getReplacedStandNum();
                     List<String> numList = Arrays.asList(replacedNum.split(","));
-                    if(numList.contains(standNum)){
+                    if (numList.contains(standNum)) {
                         //被代替标准号都已逗号分隔存在一个字段里，如果存在字符串中间，后面会有一个逗号，
                         // 存在字符串末尾则没有逗号
-                        if(numList.contains(standNum+",")){
-                            newStand.setReplacedStandNum(stand.getReplacedStandNum().replaceAll(standNum+",",""));
+                        if (numList.contains(standNum + ",")) {
+                            newStand.setReplacedStandNum(stand.getReplacedStandNum().replaceAll(standNum + ",", ""));
                             dao.updateById(newStand);
                         } else {
-                            if (numList.contains(","+standNum)) {
-                                newStand.setReplacedStandNum(stand.getReplacedStandNum().replace(","+standNum,""));
+                            if (numList.contains("," + standNum)) {
+                                newStand.setReplacedStandNum(stand.getReplacedStandNum().replace("," + standNum, ""));
                             } else {
-                                newStand.setReplacedStandNum(stand.getReplacedStandNum().replace(standNum,""));
+                                newStand.setReplacedStandNum(stand.getReplacedStandNum().replace(standNum, ""));
                             }
                             dao.updateById(newStand);
                         }
@@ -1095,18 +1097,18 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
      * @Param: [exportType, exportContent]
      * @Return: java.util.List<com.adc.da.lawss.dto.SarStandExportDto>
      */
-    public List<SarStandardsInfo> getExportDatas (StandardsInfoExcelVO standardsInfoExcelVO) throws Exception {
+    public List<SarStandardsInfo> getExportDatas(StandardsInfoExcelVO standardsInfoExcelVO) throws Exception {
         SarStandardsInfoEOPage page = new SarStandardsInfoEOPage();
-        BeanUtils.copyProperties(standardsInfoExcelVO,page);
+        BeanUtils.copyProperties(standardsInfoExcelVO, page);
         if ("apart".equals(standardsInfoExcelVO.getExportType())) {
             page.setIdlist(standardsInfoExcelVO.getExportContent().split(","));
         } else {
             JSONObject jsonObject = JSONObject.fromObject(standardsInfoExcelVO.getExportContent());
-            page = (SarStandardsInfoEOPage)JSONObject.toBean(jsonObject, SarStandardsInfoEOPage.class);
+            page = (SarStandardsInfoEOPage) JSONObject.toBean(jsonObject, SarStandardsInfoEOPage.class);
             page.setStandType(standardsInfoExcelVO.getStandType());
             //查询当前登录人角色拥有权限的菜单
-            List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType()+"_STAND",null);
-            if(getMenuIdList != null && !getMenuIdList.isEmpty()){
+            List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
+            if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
                 page.setMenuRoleList(getMenuIdList);
             } else {
                 page.setMenuRoleList(null);
@@ -1116,7 +1118,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 page.setMenuAllChildrenIdList(ids);
             }
             if (org.apache.commons.lang.StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
-                List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
+                List<SarAdvanceSearchVO> searchList = com.alibaba.fastjson.JSONObject.parseArray(page.getAdvanceSearchVOStr(), SarAdvanceSearchVO.class);
                 String advanceStr = SarAdvanceSearchUtil.createSql(searchList);
                 if (StringUtils.isNotBlank(advanceStr)) {
                     page.setAdvanceSearchStr(advanceStr);
@@ -1132,7 +1134,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return getList;
     }
 
-    public ResponseMessage<SarStandardsInfo> importSarStandardsInfoData(List<Map<String,String>> dataList, String standType, String menuId, String filepath){
+    public ResponseMessage<SarStandardsInfo> importSarStandardsInfoData(List<Map<String, String>> dataList, String standType, String menuId, String filepath) {
 //此处需要做各种验证，数据库操作
         try {
             //验证导入数据是否符合规则
@@ -1156,19 +1158,19 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             String msg = "成功导入" + countSuccess + "条";
             return Result.success("0", msg, null);
         } catch (Exception e) {
-            logger.error(e.getMessage(),e);
+            logger.error(e.getMessage(), e);
             return Result.error("导入失败");
         }
     }
 
-    public Map validateImportDatas(List<Map<String,String>> dataList, String standType, String filepath) throws Exception{
+    public Map validateImportDatas(List<Map<String, String>> dataList, String standType, String filepath) throws Exception {
         //存放数据验证结果信息
         List<String> stringMessage = new ArrayList<>();
         int i = 1;    //记录行号
         List<String> standnumberlist = new ArrayList<>(); // 记录验证过后的编码，用来判断是否有重复
         //循环验证数据
         List<SarStandardsInfo> standList = new ArrayList<>();
-        for (Map<String,String> dataMap : dataList) {
+        for (Map<String, String> dataMap : dataList) {
             i++;
             int countError = 0;   //记录失败数据数量
             String errorMsg = "<p>第" + i + "行：<p>";
@@ -1182,17 +1184,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
             List<SarStandAttrDetails> attrList = new ArrayList<>();
             String zrbmOrgNames = "";
-            for (Map.Entry<String,String> entry : dataMap.entrySet()) {
+            for (Map.Entry<String, String> entry : dataMap.entrySet()) {
                 String name = entry.getKey();
                 String value = entry.getValue();
                 if ("责任部门".equals(name)) {
                     zrbmOrgNames = value;
                 }
                 if (baseFieldsList.contains(name)) {
-                    SarStandImportDto.compareFieldAndName(name,value,sarStandardsInfoEO);
-                } else if (attrFieldsList.contains(name)){
+                    SarStandImportDto.compareFieldAndName(name, value, sarStandardsInfoEO);
+                } else if (attrFieldsList.contains(name)) {
                     // 根据name查字段
-                    SarStandAttrDetails fieldEO = sarStandAttrDetailsEODao.selectFieldByName(name,standType+"_STAND");
+                    SarStandAttrDetails fieldEO = sarStandAttrDetailsEODao.selectFieldByName(name, standType + "_STAND");
                     if (fieldEO != null) {
                         fieldEO.setAttrValue(value);
                         attrList.add(fieldEO);
@@ -1201,10 +1203,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             }
             sarStandardsInfoEO.setAttrInfoList(attrList);
             // 验证基础表数据信息
-            Map<String,String> beseResultMap = validateBaseDatas(sarStandardsInfoEO,standType,errorMsg,countError,standnumberlist);
+            Map<String, String> beseResultMap = validateBaseDatas(sarStandardsInfoEO, standType, errorMsg, countError, standnumberlist);
             errorMsg = beseResultMap.get("errorMsg");
             countError = Integer.parseInt(beseResultMap.get("countError"));
-            Map<String,String> attrResultMap = validateAttrDatas(sarStandardsInfoEO,standType,filepath,errorMsg,countError,zrbmOrgNames);
+            Map<String, String> attrResultMap = validateAttrDatas(sarStandardsInfoEO, standType, filepath, errorMsg, countError, zrbmOrgNames);
             errorMsg = attrResultMap.get("errorMsg");
             countError = Integer.parseInt(attrResultMap.get("countError"));
             if (countError > 0) {
@@ -1228,8 +1230,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return map;
     }
 
-    public Map validateBaseDatas(SarStandardsInfo dto, String standType,String errorMsg,int countError,List<String> standnumberlist) throws Exception {
-        Map<String,String> map = new HashMap();
+    public Map validateBaseDatas(SarStandardsInfo dto, String standType, String errorMsg, int countError, List<String> standnumberlist) throws Exception {
+        Map<String, String> map = new HashMap();
         // 验证国家及关联标准类别
         DicTypeEO dic = new DicTypeEO();
         List<DicTypeEO> getDic = new ArrayList<>();
@@ -1258,7 +1260,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 errorMsg += "<p>标准编号不能超过100个字符;<p>";
                 countError++;
             }
-            String regEx="^[A-z0-9-.]*$";
+            String regEx = "^[A-z0-9-.]*$";
             Pattern p = Pattern.compile(regEx);
             Matcher m = p.matcher(str);
             if (!m.matches()) {
@@ -1290,7 +1292,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         //年份必填
         if (StringUtils.isNotEmpty(dto.getStandYear())) {
-            String regEx="^[0-9a-zA-Z]+$";
+            String regEx = "^[0-9a-zA-Z]+$";
             Pattern p = Pattern.compile(regEx);
             Matcher m = p.matcher(dto.getStandYear());
             if (!m.matches() || dto.getStandYear().length() > 20) {
@@ -1340,7 +1342,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     countError++;
                 }
             }
-            if (dto.getCountry().length() > 100){
+            if (dto.getCountry().length() > 100) {
                 errorMsg += "<p>适用区域不能超过100个字符;<p>";
                 countError++;
             } else {
@@ -1362,7 +1364,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
 
 
-
         if (StringUtils.isNotEmpty(dto.getStandState())) {
             dic.setDicTypeName(dto.getStandState());
             dic.setDicTypeCode("STANDSTATE");
@@ -1396,7 +1397,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 countError++;
             }
         } else if ("1".equals(dto.getIsRelateAccess()) && StringUtils.isBlank(dto.getIssueTime())) {
-            if(aorb) {
+            if (aorb) {
                 errorMsg += "<p>发布日期不能为空;<p>";
                 countError++;
             }
@@ -1412,8 +1413,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         // 标准号唯一性验证
         if (StringUtils.isNotEmpty(dto.getStandNumber()) && StringUtils.isNotEmpty(dto.getStandYear()) && StringUtils.isNotEmpty(dto.getStandSort())) {
             String standnumber = dto.getStandSort() + " " + dto.getStandNumber() + "-" + dto.getStandYear();
-            String numberLen = standnumber+"-"+dto.getStandYear();
-            if(numberLen.length()<=1000){
+            String numberLen = standnumber + "-" + dto.getStandYear();
+            if (numberLen.length() <= 1000) {
                 SarStandardsInfo sarStandardsInfoEO = new SarStandardsInfo();
                 sarStandardsInfoEO.setStandNumber(standnumber);
                 sarStandardsInfoEO.setStandType(standType);
@@ -1429,13 +1430,13 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 }
             }
         }
-        map.put("errorMsg",errorMsg);
-        map.put("countError",String.valueOf(countError));
+        map.put("errorMsg", errorMsg);
+        map.put("countError", String.valueOf(countError));
         return map;
     }
 
-    public Map validateAttrDatas(SarStandardsInfo dto, String standType,String filepath,String errorMsg,int countError,String zrbmOrgNames) throws Exception {
-        Map<String,String> map = new HashMap();
+    public Map validateAttrDatas(SarStandardsInfo dto, String standType, String filepath, String errorMsg, int countError, String zrbmOrgNames) throws Exception {
+        Map<String, String> map = new HashMap();
         //根据重要度判断字段必填
         String isMustStr = "no";
         List<String> isMustList = new ArrayList<>();
@@ -1445,7 +1446,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             } else if ("FOREIGN".equals(standType)) {
                 isMustStr = "CLLX,YQLX,XCXSSRQ,ZCCSSRQ,EOPSSRQ,ZRBM,FGWHR,DTBJH,DXBZ,YYBJ,CBBH";
             }
-        }else{
+        } else {
             if ("INLAND".equals(standType)) {
                 isMustStr = "FGWHR";//,DTBJH,YYBJ
             }
@@ -1457,9 +1458,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         List<SarStandAttrDetails> attrList = dto.getAttrInfoList();
         if (attrList != null && !attrList.isEmpty()) {
             if (StringUtils.isNotBlank(zrbmOrgNames)) {
-                zrbmOrgNames = sysInfoEOService.getOrgIdByName(zrbmOrgNames,null);
+                zrbmOrgNames = sysInfoEOService.getOrgIdByName(zrbmOrgNames, null);
             }
-            Map<String,Object> attrInfoMap = new HashMap<>();
+            Map<String, Object> attrInfoMap = new HashMap<>();
             for (SarStandAttrDetails detailsEO : attrList) {
                 // 根据不同字段类型进行不同验证
                 String attrType = detailsEO.getAttrType();
@@ -1470,7 +1471,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 Long attrLen = detailsEO.getAttrLen();
                 // 判断是否为必填项
                 if (isMustList.contains(attrField) && StringUtils.isEmpty(attrValue)) {
-                    errorMsg += "<p>"+attrName + "不能为空;<p>";
+                    errorMsg += "<p>" + attrName + "不能为空;<p>";
                     countError++;
                 }
                 if (StandAttrTypeEnum.INPUT_STR.getValue().equals(attrType)) {
@@ -1478,7 +1479,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         String str = getRightDate(attrValue);
                         attrValue = str;
                         if (attrValue.length() > attrLen) {
-                            errorMsg += "<p>"+attrName + "不能超过"+ attrLen +"个字符;<p>";
+                            errorMsg += "<p>" + attrName + "不能超过" + attrLen + "个字符;<p>";
                             countError++;
                         }
                     }
@@ -1488,7 +1489,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         Matcher m = p.matcher(attrValue);
                         if (!m.matches()) {
                             String name = "";
-                            switch (attrField){
+                            switch (attrField) {
                                 case "DTBJH":
                                     name = "代替标准编号";
                                     break;
@@ -1508,31 +1509,31 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                             countError++;
                         }
                     }
-                    attrInfoMap.put(attrField,attrValue);
+                    attrInfoMap.put(attrField, attrValue);
                 } else if (StandAttrTypeEnum.INPUT_NUM.getValue().equals(attrType)) {
                     if (StringUtils.isNotEmpty(attrValue)) {
                         String str = getRightDate(attrValue);
                         attrValue = str;
                         if (attrValue.length() > attrLen) {
-                            errorMsg += "<p>"+attrName + "不能超过"+ attrLen +"个字符;<p>";
+                            errorMsg += "<p>" + attrName + "不能超过" + attrLen + "个字符;<p>";
                             countError++;
                         }
                     }
                     int value = Integer.parseInt(attrValue);
-                    attrInfoMap.put(attrField,value);
+                    attrInfoMap.put(attrField, value);
                 } else if (StandAttrTypeEnum.SELECT_OPTION.getValue().equals(attrType) || StandAttrTypeEnum.SEL_OPTS.getValue().equals(attrType)) {
                     String saveCode = "";
                     if (StringUtils.isNotEmpty(attrValue)) {
                         attrValue = attrValue.replace("，", ",");
                         String[] valueArr = attrValue.split(",");
                         if (StandAttrTypeEnum.SELECT_OPTION.getValue().equals(attrType) && valueArr.length > 1) {
-                            errorMsg += "<p>"+attrName + "单选字段只能输入一个选项;<p>";
+                            errorMsg += "<p>" + attrName + "单选字段只能输入一个选项;<p>";
                             countError++;
-                        } else if(valueArr.length>20){
-                            errorMsg += "<p>"+attrName + "选项不能超过20个;<p>";
+                        } else if (valueArr.length > 20) {
+                            errorMsg += "<p>" + attrName + "选项不能超过20个;<p>";
                             countError++;
                         } else if (attrValue.length() > attrLen) {
-                            errorMsg += "<p>"+attrName + "不能超过500个字符;<p>";
+                            errorMsg += "<p>" + attrName + "不能超过500个字符;<p>";
                             countError++;
                         } else {
                             Set set = new HashSet();
@@ -1543,18 +1544,18 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                     if (StringUtils.isNotBlank(svppsId)) {
                                         saveCode += svppsId + ',';
                                     } else {
-                                        errorMsg += "<p>"+attrName + valueArr[e] + "不存在;<p>";
+                                        errorMsg += "<p>" + attrName + valueArr[e] + "不存在;<p>";
                                         countError++;
                                     }
                                 }
-                            }else if (SelectionTypeEnum.GZZXX.getValue().equals(selVal)) {
+                            } else if (SelectionTypeEnum.GZZXX.getValue().equals(selVal)) {
                                 for (int e = 0; e < valueArr.length; e++) {
                                     set.add(valueArr[e]);
                                     String id = sysInfoEOService.getGroupIdByNames(valueArr[e]);
                                     if (StringUtils.isNotBlank(id)) {
                                         saveCode += id + ',';
                                     } else {
-                                        errorMsg += "<p>"+attrName + valueArr[e] + "不存在;<p>";
+                                        errorMsg += "<p>" + attrName + valueArr[e] + "不存在;<p>";
                                         countError++;
                                     }
                                 }
@@ -1569,11 +1570,11 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                         if (!"FO".equals(attrField)) {
                                             zrbmOrgNames = "";
                                         }
-                                        String userId = sysInfoEOService.getUserIdByName(valueArr[e],zrbmOrgNames);
+                                        String userId = sysInfoEOService.getUserIdByName(valueArr[e], zrbmOrgNames);
                                         if (StringUtils.isNotBlank(userId)) {
                                             saveCode += userId + ',';
                                         } else {
-                                            errorMsg += "<p>"+attrName + valueArr[e] + "不存在;<p>";
+                                            errorMsg += "<p>" + attrName + valueArr[e] + "不存在;<p>";
                                             countError++;
                                         }
                                     }
@@ -1582,15 +1583,15 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 for (int e = 0; e < valueArr.length; e++) {
                                     set.add(valueArr[e]);
                                     String id = null;
-                                    if (attrName.equals("责任部门") || attrName.equals("相关部门")){
-                                        id = sysInfoEOService.getOrgIdByName(valueArr[e],"DEPART");
-                                    }else {
-                                        id = sysInfoEOService.getOrgIdByName(valueArr[e],null);
+                                    if (attrName.equals("责任部门") || attrName.equals("相关部门")) {
+                                        id = sysInfoEOService.getOrgIdByName(valueArr[e], "DEPART");
+                                    } else {
+                                        id = sysInfoEOService.getOrgIdByName(valueArr[e], null);
                                     }
                                     if (StringUtils.isNotBlank(id)) {
                                         saveCode += id + ',';
                                     } else {
-                                        errorMsg +="<p>"+ attrName + valueArr[e] + "不存在;<p>";
+                                        errorMsg += "<p>" + attrName + valueArr[e] + "不存在;<p>";
                                         countError++;
                                     }
                                 }
@@ -1601,7 +1602,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                     if (StringUtils.isNotBlank(id)) {
                                         saveCode += id + ',';
                                     } else {
-                                        errorMsg +="<p>"+ attrName + valueArr[e] + "不存在;<p>";
+                                        errorMsg += "<p>" + attrName + valueArr[e] + "不存在;<p>";
                                         countError++;
                                     }
                                 }
@@ -1616,33 +1617,33 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                     if (getDic != null && getDic.size() > 0) {
                                         saveCode += getDic.get(0).getDicTypeCode() + ',';
                                     } else {
-                                        errorMsg += "<p>"+attrName + valueArr[e] + "不存在;<p>";
+                                        errorMsg += "<p>" + attrName + valueArr[e] + "不存在;<p>";
                                         countError++;
                                     }
                                 }
                             }
-                            if (valueArr.length > set.size()){
-                                errorMsg +="<p>"+ attrName + "存在重复数据;<p>";
+                            if (valueArr.length > set.size()) {
+                                errorMsg += "<p>" + attrName + "存在重复数据;<p>";
                                 countError++;
                             }
-                            if (!saveCode.equals("")){
-                                saveCode = saveCode.substring(0,saveCode.length()-1);
+                            if (!saveCode.equals("")) {
+                                saveCode = saveCode.substring(0, saveCode.length() - 1);
                             }
                         }
                     }
-                    attrInfoMap.put(attrField,saveCode);
+                    attrInfoMap.put(attrField, saveCode);
                 } else if (StandAttrTypeEnum.DATE_PICKER.getValue().equals(attrType)) {
                     if (StringUtils.isNotBlank(attrValue)) {
                         String[] timeArr = attrValue.split(",");
                         if (timeArr.length > 1) {
-                            errorMsg += "<p>"+attrName + "只能输入一个日期;<p>";
+                            errorMsg += "<p>" + attrName + "只能输入一个日期;<p>";
                             countError++;
                         } else {
                             if (!DateUtil.isValidDate(attrValue)) {
-                                errorMsg += "<p>"+attrName + "格式不正确;<p>";
+                                errorMsg += "<p>" + attrName + "格式不正确;<p>";
                                 countError++;
                             } else {
-                                attrInfoMap.put(attrField,attrValue);
+                                attrInfoMap.put(attrField, attrValue);
                             }
                         }
                     }
@@ -1650,17 +1651,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                     if (StringUtils.isNotBlank(attrValue)) {
                         String[] timeArr = attrValue.split(",");
                         if (timeArr.length > 8) {
-                            errorMsg += "<p>"+attrName + "不能超过8个日期;<p>";
+                            errorMsg += "<p>" + attrName + "不能超过8个日期;<p>";
                             countError++;
                         } else {
                             if (putTimeFieldList.contains(attrField) && DateUtil.isValidDate(attrValue)) {
                                 putTimeState = true;
                             }
                             if (!DateUtil.isValidDate(attrValue) && !"N/A".equals(attrValue) && !"TBD".equals(attrValue) && !"已实施".equals(attrValue)) {
-                                errorMsg += "<p>"+attrName + "格式不正确;<p>";
+                                errorMsg += "<p>" + attrName + "格式不正确;<p>";
                                 countError++;
                             } else {
-                                attrInfoMap.put(attrField,attrValue);
+                                attrInfoMap.put(attrField, attrValue);
                             }
                         }
                     } else {
@@ -1674,14 +1675,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                         attrValue = attrValue.replace("，", ",");
                         String[] filelist = attrValue.split(",");
                         if (filelist != null && filelist.length > 8) {
-                            errorMsg += "<p>"+attrName + "不能超过8个<p>";
+                            errorMsg += "<p>" + attrName + "不能超过8个<p>";
                             countError++;
                         } else {
                             for (int ind = 0; ind < filelist.length; ind++) {
                                 String filename = filelist[ind];
                                 String resultMes = ExcelUtil.validatePattern(filename);
-                                if(StringUtils.isNotEmpty(resultMes)){
-                                    errorMsg +="<p>"+ attrName + resultMes +"<p>";
+                                if (StringUtils.isNotEmpty(resultMes)) {
+                                    errorMsg += "<p>" + attrName + resultMes + "<p>";
                                     countError++;
                                     continue;
                                 }
@@ -1692,7 +1693,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                                 } else {
                                     // 判断文件大小是否超过200M
                                     if (nowfilelist.get(0).length() > 200 * 1024 * 1024) {
-                                        errorMsg +="<p>"+ filename + "文件大小超过200M;<p>";
+                                        errorMsg += "<p>" + filename + "文件大小超过200M;<p>";
                                         countError++;
                                         continue;
                                     }
@@ -1705,17 +1706,17 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                             }
                         }
                     }
-                    attrInfoMap.put(attrField,saveFiles);
+                    attrInfoMap.put(attrField, saveFiles);
                 } else if (StandAttrTypeEnum.TEXTAREA.getValue().equals(attrType)) {
                     if (StringUtils.isNotEmpty(attrValue)) {
                         String str = getRightDate(attrValue);
                         attrValue = str;
                         if (attrValue.length() > attrLen) {
-                            errorMsg += "<p>"+attrName + "不能超过"+ attrLen +"个字符;<p>";
+                            errorMsg += "<p>" + attrName + "不能超过" + attrLen + "个字符;<p>";
                             countError++;
                         }
                     }
-                    attrInfoMap.put(attrField,attrValue);
+                    attrInfoMap.put(attrField, attrValue);
                 }
             }
             //三个实施日期至少有一个日期格式
@@ -1726,8 +1727,8 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             String attrStr = JSON.toJSONString(attrInfoMap, SerializerFeature.WriteMapNullValue);
             dto.setSarStandAttrEOStr(attrStr);
         }
-        map.put("errorMsg",errorMsg);
-        map.put("countError",String.valueOf(countError));
+        map.put("errorMsg", errorMsg);
+        map.put("countError", String.valueOf(countError));
         return map;
     }
 
@@ -1770,7 +1771,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         // 查询纳入清单的国家地区
         if (sarStandardsInfoEO != null) {
-            String accessCountry = sarSarAccessEOService.getCountryByRes(sarStandardsInfoEO.getId(),sarStandardsInfoEO.getStandType()+"_STAND");
+            String accessCountry = sarSarAccessEOService.getCountryByRes(sarStandardsInfoEO.getId(), sarStandardsInfoEO.getStandType() + "_STAND");
             sarStandardsInfoEO.setAccessCountry(accessCountry);
         }
         return sarStandardsInfoEO;
@@ -1789,7 +1790,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
             List<String> getMenuPIds = sarMenuEOService.getParentMenuId(nowMenuId);
             if (getMenuPIds != null && getMenuPIds.size() > 1) {
                 int idSize = getMenuPIds.size();
-                secondLevelId = getMenuPIds.get(idSize-1);
+                secondLevelId = getMenuPIds.get(idSize - 1);
             } else {
                 secondLevelId = nowMenuId;
             }
@@ -1825,34 +1826,35 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         return true;
     }
 
-    public boolean updateStandInfo(SarStandardsInfoEOPage standardsInfoEO){
-        String item = sarStandAttrInfoEODao.selectFieldValByStandId("GXHBQ",standardsInfoEO.getIdlist()[0]);
+    public boolean updateStandInfo(SarStandardsInfoEOPage standardsInfoEO) {
+        String item = sarStandAttrInfoEODao.selectFieldValByStandId("GXHBQ", standardsInfoEO.getIdlist()[0]);
         List<String> list = new ArrayList<>();
-        if (StringUtils.isNotBlank(item)){
+        if (StringUtils.isNotBlank(item)) {
             list = new ArrayList<>(Arrays.asList(item.split(",")));
         }
         list.add(standardsInfoEO.getMenuId());
         list = list.stream().distinct().collect(Collectors.toList());
-        int size = sarStandAttrInfoEODao.updateStandInfo(standardsInfoEO.getIdlist()[0],"GXHBQ", org.apache.commons.lang.StringUtils.join(list,","));
-        return size>0? true:false;
+        int size = sarStandAttrInfoEODao.updateStandInfo(standardsInfoEO.getIdlist()[0], "GXHBQ", org.apache.commons.lang.StringUtils.join(list, ","));
+        return size > 0 ? true : false;
     }
 
     public List<RecommendVO> selectRecommendStand(SarStandardsInfoEOPage pagenew) {
         return dao.selectRecommendStand(pagenew);
     }
 
-    public List<ActSarItemsEO> getStandAndItemsForAct (SarStandardsInfoEOPage page) throws Exception{
+    public List<ActSarItemsEO> getStandAndItemsForAct(SarStandardsInfoEOPage page) throws Exception {
         String queryList = page.getIds();
-        List<StandProVO> getQueryList = com.alibaba.fastjson.JSONObject.parseArray(queryList,StandProVO.class);
+        List<StandProVO> getQueryList = com.alibaba.fastjson.JSONObject.parseArray(queryList, StandProVO.class);
         List<ActSarItemsEO> standList = new ArrayList<>();
         if (getQueryList != null && !getQueryList.isEmpty()) {
             for (StandProVO standProVO : getQueryList) {
                 String[] idArr = standProVO.getId().split(",");
-                getStandDetailsForAct(page,idArr,standProVO.getStandState(),standList);
+                getStandDetailsForAct(page, idArr, standProVO.getStandState(), standList);
             }
         }
         return standList;
     }
+
     @Override
     public void insertIntoIndexForMap(Map<String, Object> attrInfoMap) {
 
@@ -1985,7 +1987,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 //    }
 
 
-    public void getStandDetailsForAct (SarStandardsInfoEOPage page,String[] idArr,String standState,List<ActSarItemsEO> standList) throws Exception{
+    public void getStandDetailsForAct(SarStandardsInfoEOPage page, String[] idArr, String standState, List<ActSarItemsEO> standList) throws Exception {
         page.setPageSize(100);
         page.setIdlist(idArr);
         List<SarStandardsInfo> rows = getSarStandForAct(page);
@@ -1999,12 +2001,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 actSarItemsEO.setResId(sarStandardsInfoEO.getId());
                 actSarItemsEO.setAttrInfoMap(sarStandardsInfoEO.getAttrInfoMap());
                 if (StringUtils.isNotBlank(sarStandardsInfoEO.getStandYear())) {
-                    actSarItemsEO.setResNum(sarStandardsInfoEO.getStandSort() + " " +sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear());
+                    actSarItemsEO.setResNum(sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber() + "-" + sarStandardsInfoEO.getStandYear());
                 } else {
                     actSarItemsEO.setResNum(sarStandardsInfoEO.getStandSort() + " " + sarStandardsInfoEO.getStandNumber());
                 }
                 actSarItemsEO.setResName(sarStandardsInfoEO.getStandName());
-                String resType = sarStandardsInfoEO.getStandType()+"_STAND";
+                String resType = sarStandardsInfoEO.getStandType() + "_STAND";
                 actSarItemsEO.setResType(resType);
                 SarStandItemsEOPage standItemsEOPage = new SarStandItemsEOPage();
                 standItemsEOPage.setStandId(sarStandardsInfoEO.getId());
@@ -2013,35 +2015,35 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 standItemsEOPage.setProType(page.getProType());
                 standItemsEOPage.setFileType(standState);
                 standItemsEOPage.setOrderBy("SAR_STAND_ITEMS.modify_time desc");
-                List<ActSarItemsEO> getItems = sarStandItemsEOService.queryItemsByList(standItemsEOPage,resType);
-                Map<String,Object> map = sarProductStandEODao.queryStandSarState(sarStandardsInfoEO.getId());
-                if(Integer.valueOf(map.get("SAR_ID").toString())>0){
+                List<ActSarItemsEO> getItems = sarStandItemsEOService.queryItemsByList(standItemsEOPage, resType);
+                Map<String, Object> map = sarProductStandEODao.queryStandSarState(sarStandardsInfoEO.getId());
+                if (Integer.valueOf(map.get("SAR_ID").toString()) > 0) {
                     actSarItemsEO.setSarState("1");
-                    if(getItems!=null && getItems.size()>0){
-                        for(ActSarItemsEO actSarItemsEO1:getItems){
+                    if (getItems != null && getItems.size() > 0) {
+                        for (ActSarItemsEO actSarItemsEO1 : getItems) {
                             actSarItemsEO1.setSarState("1");
                         }
                     }
-                }else{
+                } else {
                     actSarItemsEO.setSarState("0");
-                    if(getItems!=null && getItems.size()>0){
-                        for(ActSarItemsEO actSarItemsEO1:getItems){
+                    if (getItems != null && getItems.size() > 0) {
+                        for (ActSarItemsEO actSarItemsEO1 : getItems) {
                             actSarItemsEO1.setSarState("0");
                         }
                     }
                 }
                 actSarItemsEO.setItemsList(getItems);
-                if(StringUtils.isNotEmpty(page.getProductId())){
-                    List<Map<String,Object>> sarProductStandEOS = sarProductStandEODao.queryStandSarStateNew(sarStandardsInfoEO.getId(), page.getProductId());
-                    if(sarProductStandEOS.size()>0){
-                        if(sarProductStandEOS.get(0).get("RELATE_ACCESS_ID")!=null){
+                if (StringUtils.isNotEmpty(page.getProductId())) {
+                    List<Map<String, Object>> sarProductStandEOS = sarProductStandEODao.queryStandSarStateNew(sarStandardsInfoEO.getId(), page.getProductId());
+                    if (sarProductStandEOS.size() > 0) {
+                        if (sarProductStandEOS.get(0).get("RELATE_ACCESS_ID") != null) {
                             Map map1 = sarSarAccessInfoEODao.selectProTimeInfoByStandIdAndAccId(sarStandardsInfoEO.getId(), sarProductStandEOS.get(0).get("RELATE_ACCESS_ID").toString());
-                            if(map1!=null){
-                                actSarItemsEO.setNewPutText(map1.get("NEW_PUT_TEXT_TIME")!=null?map1.get("NEW_PUT_TEXT_TIME").toString().substring(0,10):"");
-                                actSarItemsEO.setProdPutText(map1.get("PROD_PUT_TEXT_TIME")!=null?map1.get("PROD_PUT_TEXT_TIME").toString().substring(0,10):"");
-                                actSarItemsEO.setAuthObj(map1.get("AUTH_OBJ_ID")!=null?map1.get("AUTH_OBJ_ID").toString():"");
-                                actSarItemsEO.setAuthDelive(map1.get("AUTH_DELIVE")!=null?map1.get("AUTH_DELIVE").toString():"");
-                                actSarItemsEO.setPerformInfo(map1.get("PERFORM_INFO")!=null?map1.get("PERFORM_INFO").toString():"");
+                            if (map1 != null) {
+                                actSarItemsEO.setNewPutText(map1.get("NEW_PUT_TEXT_TIME") != null ? map1.get("NEW_PUT_TEXT_TIME").toString().substring(0, 10) : "");
+                                actSarItemsEO.setProdPutText(map1.get("PROD_PUT_TEXT_TIME") != null ? map1.get("PROD_PUT_TEXT_TIME").toString().substring(0, 10) : "");
+                                actSarItemsEO.setAuthObj(map1.get("AUTH_OBJ_ID") != null ? map1.get("AUTH_OBJ_ID").toString() : "");
+                                actSarItemsEO.setAuthDelive(map1.get("AUTH_DELIVE") != null ? map1.get("AUTH_DELIVE").toString() : "");
+                                actSarItemsEO.setPerformInfo(map1.get("PERFORM_INFO") != null ? map1.get("PERFORM_INFO").toString() : "");
                             }
                         }
                     }
@@ -2056,7 +2058,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 actSarItemsEO.setAttrInfoMap(sarStandardsInfoEO.getAttrInfoMap());
                 actSarItemsEO.setResNum(sarStandardsInfoEO.getLawsNumber());
                 actSarItemsEO.setResName(sarStandardsInfoEO.getLawsName());
-                String resType = sarStandardsInfoEO.getLawsType()+"_LAWS";
+                String resType = sarStandardsInfoEO.getLawsType() + "_LAWS";
                 actSarItemsEO.setResType(resType);
                 SarLawsItemsEOPage lawsItemsEOPage = new SarLawsItemsEOPage();
                 lawsItemsEOPage.setLawsId(sarStandardsInfoEO.getId());
@@ -2065,35 +2067,35 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
                 lawsItemsEOPage.setProType(page.getProType());
                 lawsItemsEOPage.setFileType(standState);
                 lawsItemsEOPage.setOrderBy("SAR_LAWS_ITEMS.modify_time desc");
-                List<ActSarItemsEO> getItems = sarLawsItemsEOService.queryItemsByList(lawsItemsEOPage,resType);
+                List<ActSarItemsEO> getItems = sarLawsItemsEOService.queryItemsByList(lawsItemsEOPage, resType);
                 actSarItemsEO.setItemsList(getItems);
-                Map<String,Object> map = sarProductStandEODao.queryStandSarState(sarStandardsInfoEO.getId());
-                if(Integer.valueOf(map.get("SAR_ID").toString())>0){
+                Map<String, Object> map = sarProductStandEODao.queryStandSarState(sarStandardsInfoEO.getId());
+                if (Integer.valueOf(map.get("SAR_ID").toString()) > 0) {
                     actSarItemsEO.setSarState("1");
-                    if(getItems!=null && getItems.size()>0){
-                        for(ActSarItemsEO actSarItemsEO1:getItems){
+                    if (getItems != null && getItems.size() > 0) {
+                        for (ActSarItemsEO actSarItemsEO1 : getItems) {
                             actSarItemsEO1.setSarState("1");
                         }
                     }
-                }else{
+                } else {
                     actSarItemsEO.setSarState("0");
-                    if(getItems!=null && getItems.size()>0){
-                        for(ActSarItemsEO actSarItemsEO1:getItems){
+                    if (getItems != null && getItems.size() > 0) {
+                        for (ActSarItemsEO actSarItemsEO1 : getItems) {
                             actSarItemsEO1.setSarState("0");
                         }
                     }
                 }
-                if(StringUtils.isNotEmpty(page.getProductId())){
-                    List<Map<String,Object>> sarProductStandEOS = sarProductStandEODao.queryStandSarStateNew(sarStandardsInfoEO.getId(), page.getProductId());
-                    if(sarProductStandEOS.size()>0){
-                        if(sarProductStandEOS.get(0).get("RELATE_ACCESS_ID")!=null){
+                if (StringUtils.isNotEmpty(page.getProductId())) {
+                    List<Map<String, Object>> sarProductStandEOS = sarProductStandEODao.queryStandSarStateNew(sarStandardsInfoEO.getId(), page.getProductId());
+                    if (sarProductStandEOS.size() > 0) {
+                        if (sarProductStandEOS.get(0).get("RELATE_ACCESS_ID") != null) {
                             Map map1 = sarSarAccessInfoEODao.selectProTimeInfoByStandIdAndAccId(sarStandardsInfoEO.getId(), sarProductStandEOS.get(0).get("RELATE_ACCESS_ID").toString());
-                            if(map1!=null){
-                                actSarItemsEO.setNewPutText(map1.get("NEW_PUT_TEXT_TIME")!=null?map1.get("NEW_PUT_TEXT_TIME").toString().substring(0,10):"");
-                                actSarItemsEO.setProdPutText(map1.get("PROD_PUT_TEXT_TIME")!=null?map1.get("PROD_PUT_TEXT_TIME").toString().substring(0,10):"");
-                                actSarItemsEO.setAuthObj(map1.get("AUTH_OBJ_ID")!=null?map1.get("AUTH_OBJ_ID").toString():"");
-                                actSarItemsEO.setAuthDelive(map1.get("AUTH_DELIVE")!=null?map1.get("AUTH_DELIVE").toString():"");
-                                actSarItemsEO.setPerformInfo(map1.get("PERFORM_INFO")!=null?map1.get("PERFORM_INFO").toString():"");
+                            if (map1 != null) {
+                                actSarItemsEO.setNewPutText(map1.get("NEW_PUT_TEXT_TIME") != null ? map1.get("NEW_PUT_TEXT_TIME").toString().substring(0, 10) : "");
+                                actSarItemsEO.setProdPutText(map1.get("PROD_PUT_TEXT_TIME") != null ? map1.get("PROD_PUT_TEXT_TIME").toString().substring(0, 10) : "");
+                                actSarItemsEO.setAuthObj(map1.get("AUTH_OBJ_ID") != null ? map1.get("AUTH_OBJ_ID").toString() : "");
+                                actSarItemsEO.setAuthDelive(map1.get("AUTH_DELIVE") != null ? map1.get("AUTH_DELIVE").toString() : "");
+                                actSarItemsEO.setPerformInfo(map1.get("PERFORM_INFO") != null ? map1.get("PERFORM_INFO").toString() : "");
                             }
                         }
                     }
@@ -2119,5 +2121,4 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     }
 
 
-
 }