采收记录增加地块id查询，农产品列表增加多品种返回

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/recoveryrecord/vo/RecoveryRecordPageReqVO.java

@@ -22,6 +22,9 @@ public class RecoveryRecordPageReqVO extends PageParam {
     @Schema(description = "基地id")
     private Integer baseId;
 
+    @Schema(description = "地块id")
+    private Integer blockId;
+
     @Schema(description = "产品批次")
     private Integer batch;
 

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/agriculturalproduct/AgriculturalProductMapper.xml

@@ -41,14 +41,18 @@
             t1.id,
             t1.product_name AS productName,
             t1.product_pic as productPic,
-            t2.species_name as speciesName,
+            GROUP_CONCAT(t2.species_name) AS speciesName,
             t3.variety_name as varietyName
         FROM
             traceability_agricultural_product t1
-                LEFT JOIN traceability_species t2 on t1.product_breed=t2.id
+                LEFT JOIN traceability_species t2 ON FIND_IN_SET(t2.id, t1.product_breed)
                 LEFT JOIN traceability_variety t3 on t1.product_variety=t3.id
         WHERE
             t1.deleted = 0
           AND t1.product_status = 1
+        GROUP BY
+            t1.id,
+            t1.product_name,
+            t1.product_pic;
     </select>
 </mapper>

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/recoveryrecord/RecoveryRecordMapper.xml

@@ -87,6 +87,7 @@
                 AND t.job_time BETWEEN #{reqVO.jobTime[0]} AND #{reqVO.jobTime[1]}
             </if>
             <if test="reqVO.baseId != null and reqVO.baseId != ''"> AND t2.base_id = #{reqVO.baseId}</if>
+            <if test="reqVO.blockId != null and reqVO.blockId != ''"> AND t2.id = #{reqVO.blockId}</if>
             AND t.deleted = 0
         </where>
         ORDER BY