调整接口

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/block/BlockController.java

@@ -106,10 +106,7 @@ public class BlockController {
     @GetMapping("/all")
     @Operation(summary = "查询全部地块信息")
     public CommonResult<List<BlockRespVO>> selectAllBlock(@RequestParam("baseId") Integer baseId){
-        BlockPageReqVO pageReqVO = new BlockPageReqVO();
-        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        pageReqVO.setBaseId(baseId);
-        List<BlockDO> list = blockService.getBlockPage(pageReqVO).getList();
+        List<BlockDO> list = blockService.getBlockList(baseId);
         return success(BeanUtils.toBean(list, BlockRespVO.class));
     }
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java

@@ -37,7 +37,10 @@ public interface BlockMapper extends BaseMapperX<BlockDO> {
                 .betweenIfPresent(BlockDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(BlockDO::getId));
     }
-
+    default  List<BlockDO> selectList(Integer baseId){
+        return  selectList(new LambdaQueryWrapperX<BlockDO>()
+                .eqIfPresent(BlockDO::getBaseId, baseId));
+    }
     public IPage<BlockCropDO> selectBlockCropPage(IPage<BlockCropDO> page, @Param("reqVO") BlockCropPageReqVO reqVO);
 
     default  Long selectBlockNumBaseId(Integer baseId){

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockService.java

@@ -6,6 +6,8 @@ import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO
 import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockDO;
 import com.cjy.traceability.framework.common.pojo.PageResult;
 
+import java.util.List;
+
 /**
  * 地块信息 Service 接口
  *
@@ -50,6 +52,7 @@ public interface BlockService {
      * @return 地块信息分页
      */
     PageResult<BlockDO> getBlockPage(BlockPageReqVO pageReqVO);
+    List<BlockDO> getBlockList(Integer baseId);
 
     PageResult<BlockCropDO> getBlockCropPage(BlockCropPageReqVO pageReqVO);
 

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/block/BlockServiceImpl.java

@@ -16,6 +16,8 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
+import java.util.List;
+
 import static com.cjy.traceability.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.cjy.traceability.module.traceability.enums.ErrorCodeConstants.BLOCK_NOT_EXISTS;
 
@@ -75,6 +77,11 @@ public class BlockServiceImpl implements BlockService {
         return blockMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<BlockDO> getBlockList(Integer baseId) {
+        return blockMapper.selectList(baseId);
+    }
+
     @Override
     public PageResult<BlockCropDO> getBlockCropPage(BlockCropPageReqVO pageReqVO) {