From 20336ff7eabadab92856f6aeaae565f37416a510 Mon Sep 17 00:00:00 2001
From: masong <ms@cjy.com>
Date: Thu, 18 Apr 2024 10:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=AA=E7=A7=8D=E6=A4=8D=E5=9C=B0=E5=9D=97=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../traceability/dal/mysql/block/BlockMapper.java      |  6 ++----
 .../src/main/resources/mapper/block/BlockMapper.xml    | 10 +++++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java
index 6161c52..26be38e 100644
--- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java
+++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/block/BlockMapper.java
@@ -37,10 +37,8 @@ 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));
-    }
+      List<BlockDO> selectList(@Param("baseId") Integer baseId);
+
     public IPage<BlockCropDO> selectBlockCropPage(IPage<BlockCropDO> page, @Param("reqVO") BlockCropPageReqVO reqVO);
 
     default  Long selectBlockNumBaseId(Integer baseId){
diff --git a/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/block/BlockMapper.xml b/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/block/BlockMapper.xml
index a2c324e..07fd3ba 100644
--- a/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/block/BlockMapper.xml
+++ b/cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/block/BlockMapper.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.cjy.traceability.module.traceability.dal.mysql.block.BlockMapper">
-
+    <resultMap id="BlockResult" type="com.cjy.traceability.module.traceability.dal.dataobject.block.BlockDO">
+        <result column="id" property="id"/>
+        <result column="block_name" property="blockName"/>
+    </resultMap>
     <!--
         一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
         无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
@@ -45,4 +48,9 @@
 
         order by t2.create_time desc
     </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)
+
+    </select>
 </mapper>
\ No newline at end of file