Merge remote-tracking branch 'origin/main'

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

@@ -62,7 +62,7 @@ public class BlockCropVO extends PageParam {
      */
     @Schema(description = "种养类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("种养类型")
-    private Integer speciesId;
+    private String speciesId;
     /**
      * 认证图片
      */

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

@@ -35,4 +35,7 @@ public class BlockPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "基地ID", example = "7990")
+    private Integer baseId;
+
 }

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

@@ -45,4 +45,8 @@ public class BlockRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "基地ID", example = "7990")
+    @ExcelProperty("基地ID")
+    private Integer baseId;
+
 }

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

@@ -28,4 +28,7 @@ public class BlockSaveReqVO {
     @Schema(description = "经纬度信息")
     private String positionStr;
 
+    @Schema(description = "基地ID", example = "7990")
+    private Integer baseId;
+
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/dataobject/block/BlockCropDO.java

@@ -44,7 +44,7 @@ public class BlockCropDO extends BaseDO {
     /**
      * 种养类型
      */
-    private Integer speciesId;
+    private String speciesId;
     /**
      * 认证图片
      */

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

@@ -20,14 +20,18 @@
     </resultMap>
 
     <select id="selectBlockCropPage"   resultMap="BlockCropResult">
-        select t2.id,t2.block_area,t2.block_name,t2.block_type,t2.block_color,t2.position_str,t1.species_id
-             ,t1.authentication_pic  from traceability_cropper t1
-                                              left join traceability_block t2 on t1.block_id = t2.id
-        where  t1.deleted  is false  and t1.plant_end = 1
-        <if test="reqVO.blockName !=null and reqVO.blockName !=''"> and t2.block_name like concat('%',#{reqVO.blockName},'%')</if>
-        <if test="reqVO.blockType !=null"> and t2.block_type =#{reqVO.blockType}</if>
+        select t2.id,t2.block_area,t2.block_name,t2.block_type,t2.block_color,t2.position_str,
+        (select GROUP_CONCAT(ifnull(t1.species_id,'')) from traceability_cropper t1 where t1.block_id = t2.id
         <if test="reqVO.speciesId !=null"> and t1.species_id =#{reqVO.speciesId}</if>
-        group by t2.id
-        order by t1.create_time desc
+        and t1.deleted  is false  and t1.plant_end = 1 ) as species_id,
+        (select GROUP_CONCAT(ifnull(t1.authentication_pic,'')) from traceability_cropper t1 where t1.block_id = t2.id
+        <if test="reqVO.speciesId !=null"> and t1.species_id =#{reqVO.speciesId}</if>
+        and  t1.deleted  is false  and t1.plant_end = 1) as authentication_pic
+        from traceability_block t2
+        <where>
+            <if test="reqVO.blockName !=null and reqVO.blockName !=''"> and t2.block_name like concat('%',#{reqVO.blockName},'%')</if>
+            <if test="reqVO.blockType !=null"> and t2.block_type =#{reqVO.blockType}</if>
+        </where>
+        order by t2.create_time desc
     </select>
 </mapper>