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

# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java

@@ -2826,7 +2826,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 
         SarBussionessStand sarBussionessStand  = new SarBussionessStand();
         //拼接企标编号
-        String standCode = standSort + " " + standNumber + "-" + standYear;
+        String standCode = standSort + standNumber + "-" + standYear;
         sarBussionessStand.setStandCode(standCode);
         // 根据标准号判断数据是否已存在
         //2021年4月9日 此处检查当前是否存在standId

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

@@ -96,16 +96,6 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
         return Result.success(pageInfo);
     }
 
-    @ApiOperation(value = "分解单查询")
-    @GetMapping("/selectSarItemAndInterpretation")
-    public ResponseMessage selectSarItemAndInterpretation(String standId)throws Exception{
-        FindSarItemsPageReqDTO page = new FindSarItemsPageReqDTO();
-        page.setStandId(standId);
-        Map<String,Object> map = ServiceImpl.selectSarItemAndInterpretation(page.getStandId());
-        page.getPager().setRowCount((Integer) map.get("count"));
-        return Result.success(getPageInfo(page.getPager(), (List<SarStandItems>) map.get("list")));
-    }
-
     @ApiOperation(value = "分解单更新")
     @PutMapping("/updateSarItemAndInterpretation")
     public ResponseMessage updateSarItemAndInterpretation(@RequestBody SarStandItems resolveListForm){

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

@@ -377,13 +377,15 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
      * @return
      */
     public Map<String,Object> selectSarItemAndInterpretation(String standId)throws Exception {
-        List<SarFileSplitInfoEO> sarFileSplitInfoEO = sarFileSplitInfoEODao.selectByStandId(standId);
+        QueryWrapper<SarFileSplitInfoEO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("STAND_ID",standId);
+        List<SarFileSplitInfoEO> sarFileSplitInfoEO = sarFileSplitInfoEODao.selectList(queryWrapper);
 
         for (SarFileSplitInfoEO data : sarFileSplitInfoEO){
             String idInfo = data.getId();
             SarFileSplitItemsEOPage page = new SarFileSplitItemsEOPage();
             String id = sarFileSplitMenuEOService.selectByInfoId(idInfo);
-            page.setInfoId(id);
+            page.setId(id);
             //ValidFlag为0的意思是有效，设置这个文件分解清单的有效性为有效
             page.setValidFlag("0");
             //把SAR_FILE_SPLIT_MENU表里的数据按照display_seq的从小到大的正序进行排列
@@ -440,5 +442,4 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
         }
         return null;
     }
-
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitMenuEOService.java

@@ -33,5 +33,4 @@ public interface SarFileSplitMenuEOService {
 
     List<String>  getChildData(String id);
 
-    String selectByInfoId(String infoId);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitMenuEOServiceImpl.java

@@ -459,11 +459,7 @@ public class SarFileSplitMenuEOServiceImpl implements SarFileSplitMenuEOService
         return dealData(id,res);
     }
 
-    @Override
+
-    public String selectByInfoId(String infoId) {
-        String info = sarFileSplitItemsEODao.selectByInfoId(infoId);
-        return info;
-    }
 
     private List<String> dealData(String id ,List<String> res){
         List<String> strings = SarFileSplitMenuEODao.getChildData(id);