Merge remote-tracking branch 'origin/main'

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/cropper/CropperMapper.xml

@@ -37,19 +37,11 @@
         </where>
     </select>
     <select id="getRemainingArea" resultType="java.math.BigDecimal">
-        SELECT
-            (ifnull(block_area,0) - ifnull(planting_area,0))
-        FROM
-            (SELECT block_id, SUM(planting_area) AS planting_area
-             FROM traceability_cropper
-             WHERE deleted = 0 AND plant_end = 1
-             GROUP BY block_id) AS t1
-                right JOIN
-            (SELECT id, block_area
-             FROM traceability_block
-             WHERE deleted = 0) AS t2 ON t1.block_id = t2.id
-        WHERE
-            t1.block_id = #{blockId}
+        select (t1.block_area -(SELECT  ifnull(SUM(planting_area),0) AS planting_area
+        FROM traceability_cropper
+        WHERE deleted = 0 AND plant_end = 1 and block_id = #{blockId}) )
+        as useArea
+        from traceability_block t1 where  t1.id = #{blockId}
 
     </select>
 </mapper>