调整，查询全部\未种植地块列表

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

@@ -1,6 +1,7 @@
 package com.cjy.traceability.module.traceability.controller.admin.block;
 
 import cn.hutool.core.util.StrUtil;
+import com.cjy.traceability.framework.operatelog.core.enums.OperateTypeEnum;
 import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockCropDO;
 import org.aspectj.apache.bcel.generic.RET;
 import org.springframework.web.bind.annotation.*;
@@ -109,8 +110,8 @@ public class BlockController {
 
     @GetMapping("/all")
     @Operation(summary = "查询全部地块信息")
-    public CommonResult<List<BlockRespVO>> selectAllBlock(@RequestParam(value = "baseId", required = false) Integer baseId){
-        List<BlockDO> list = blockService.getBlockList(baseId);
+    public CommonResult<List<BlockRespVO>> selectAllBlock(@RequestParam(value = "baseId") Integer baseId,@RequestParam(value="status") Integer status){
+        List<BlockDO> list = blockService.getBlockList(baseId,status);
         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,7 @@ public interface BlockMapper extends BaseMapperX<BlockDO> {
                 .betweenIfPresent(BlockDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(BlockDO::getId));
     }
-      List<BlockDO> selectList(@Param("baseId") Integer baseId);
+      List<BlockDO> selectList(@Param("baseId") Integer baseId,@Param("status") Integer status);
 
     public IPage<BlockCropDO> selectBlockCropPage(IPage<BlockCropDO> page, @Param("reqVO") BlockCropPageReqVO reqVO);
 

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

@@ -52,7 +52,7 @@ public interface BlockService {
      * @return 地块信息分页
      */
     PageResult<BlockDO> getBlockPage(BlockPageReqVO pageReqVO);
-    List<BlockDO> getBlockList(Integer baseId);
+    List<BlockDO> getBlockList(Integer baseId,Integer status);
 
     PageResult<BlockCropDO> getBlockCropPage(BlockCropPageReqVO pageReqVO);
 

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

@@ -78,8 +78,8 @@ public class BlockServiceImpl implements BlockService {
     }
 
     @Override
-    public List<BlockDO> getBlockList(Integer baseId) {
-        return blockMapper.selectList(baseId);
+    public List<BlockDO> getBlockList(Integer baseId,Integer status) {
+        return blockMapper.selectList(baseId,status);
     }
 
     @Override

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/block/BlockMapper.xml

@@ -50,7 +50,11 @@
     </select>
     <select id="selectList"  resultMap="BlockResult">
         select t1.id,t1.block_name from traceability_block t1 where t1.deleted = false and t1.base_id =#{baseId}
-        and t1.id not in (select t2.block_id from traceability_cropper t2 where t2.deleted = false and t2.plant_end = 1)
+        <where>
+            <if test="status == 2">
+                and t1.id not in (select t2.block_id from traceability_cropper t2 where t2.deleted = false and t2.plant_end = 1)
+            </if>
+        </where>
 
     </select>
 </mapper>