Merge remote-tracking branch 'origin/main'

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

@@ -72,4 +72,10 @@ public class RecoveryRecordRespVO {
     @Schema(description = "质检结论")
     private String qualityResult;
 
+    @Schema(description = "认证类型")
+    private String authenticationType;
+
+    @Schema(description = "产品图片")
+    private String productPic;
+
 }

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

@@ -70,13 +70,16 @@
             t3.species_name,
             t2.block_name,
             t4.quality_result,
-            t4.quality_inspection
+            t4.quality_inspection,
+            t4.authentication_type,
+            t5.product_pic
         FROM
             traceability_recovery_record t
                 LEFT JOIN traceability_cropper t1 ON t1.id = t.cropper_id
                 LEFT JOIN traceability_block t2 ON t2.id = t1.block_id
                 LEFT JOIN traceability_species t3 ON t3.id = t1.species_id
-                LEFT JOIN traceability_product t4 ON t4.cropper_id = t.cropper_id AND t4.batch = t.batch
+                LEFT JOIN traceability_product t4 ON t4.cropper_id = t.cropper_id AND t4.batch = t.batch AND t4.deleted = 0
+                LEFT JOIN traceability_agricultural_product t5 ON t5.id = t1.product_id
         <where>
             <if test="reqVO.productName != null and reqVO.productName != ''"> AND t.product_name LIKE CONCAT( '%', #{reqVO.productName}, '%' )</if>
             <if test="reqVO.batch != null and reqVO.batch != ''"> AND t.batch = #{reqVO.batch}</if>