Merge branch 'develop_master' into develop_3

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java

@@ -140,6 +140,7 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
             }
         }
         page.setUserId(LoginUserUtil.getUserId());
+        System.out.println(page);
         List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
         return Result.success(getPageInfo(page.getPager(), rows));
     }

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

@@ -4,8 +4,6 @@ import com.adc.da.slrs.sarStandardsInfo.entity.*;
 import com.adc.da.http.ResponseMessage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.io.IOException;
-import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 
@@ -33,10 +31,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
 
     List<SarStandardsInfo> selectStandardsByStandnumber(String replaceStandNum, String standType);
 
-    void attrInfoDetails(SarStandardsInfo row) throws IOException, SQLException;
-
     SarStandardsInfo selectStandardsInfoByKey(String id) throws Exception;
-
+    public void attrInfoDetails (SarStandardsInfo row) throws Exception;
     boolean updateStandardsMenu(SarStandardsInfoEOPage standardsInfoEO);
 
     boolean updateStandInfo(SarStandardsInfoEOPage standardsInfoEO);
@@ -44,4 +40,8 @@ public interface ISarStandardsInfoService extends IService<SarStandardsInfo> {
     List<RecommendVO> selectRecommendStand(SarStandardsInfoEOPage pagenew);
 
     List<ActSarItemsEO> getStandAndItemsForAct (SarStandardsInfoEOPage page) throws Exception;
-}
+
+    void insertIntoIndexForMap(Map<String,Object> attrInfoMap);
+
+    void updateIntoIndexForMap(Map<String,Object> attrInfoMap);
+}