feat 合并分支

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);

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

@@ -152,7 +152,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     private SysInfoEOService sysInfoEOService;
 
 
-
     /***
      * @Description: 分页查询
      * @Author: super_liu
@@ -192,6 +191,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
     }
 
+
     public void attrInfoDetails(SarStandardsInfo row) throws Exception {
         String fieldInfo = InitStandAttrUtil.queryField;
         String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
@@ -778,6 +778,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
     /**
      * 代替标准号修改状态
+     *
      * @param sarStandardsInfoEO
      */
     public void replaseStandState(SarStandardsInfo sarStandardsInfoEO) throws Exception {
@@ -1048,6 +1049,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
 
     /**
      * 删除标准同时删除代替关系
+     *
      * @param getDelStandInfo
      */
     public void updateStandReplaceConnect(SarStandardsInfo getDelStandInfo) {
@@ -1362,7 +1364,6 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
 
 
-
         if (StringUtils.isNotEmpty(dto.getStandState())) {
             dic.setDicTypeName(dto.getStandState());
             dic.setDicTypeCode("STANDSTATE");
@@ -1853,6 +1854,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
         }
         return standList;
     }
+
     @Override
     public void insertIntoIndexForMap(Map<String, Object> attrInfoMap) {
 
@@ -2119,5 +2121,4 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
     }
 
 
-
 }