地块列表增加农作物名称

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

@@ -70,4 +70,5 @@ public class BlockCropVO extends PageParam {
     @ExcelProperty("认证图片")
     private String authenticationPic;
 
+    private String productName;
 }

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

@@ -49,4 +49,6 @@ public class BlockCropDO extends BaseDO {
      * 认证图片
      */
     private String authenticationPic;
+
+    private String productName;
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/salerecord/SaleRecordMapper.java

@@ -87,7 +87,7 @@ public interface SaleRecordMapper extends BaseMapperX<SaleRecordDO> {
                 .leftJoin(CropperDO.class,CropperDO :: getId,ProductDO :: getCropperId )
                 .leftJoin(SpeciesDO.class,SpeciesDO :: getId,CropperDO ::getSpeciesId)
                 .leftJoin(AgriculturalProductDO.class,AgriculturalProductDO :: getId,CropperDO :: getProductId)
-                .between(pageReqVO.getCreateTime() !=null,ProductDO :: getCreateTime,pageReqVO.getCreateTime() == null? "" :pageReqVO.getCreateTime()[0],pageReqVO.getCreateTime() == null? "" :pageReqVO.getCreateTime()[1])
+                .between(pageReqVO.getCreateTime() !=null,SaleRecordDO :: getCreateTime,pageReqVO.getCreateTime() == null? "" :pageReqVO.getCreateTime()[0],pageReqVO.getCreateTime() == null? "" :pageReqVO.getCreateTime()[1])
                 .like(StringUtil.isNotBlank(pageReqVO.getProcessingName()),ProductDO :: getProcessingName,pageReqVO.getProcessingName())
                 .orderByDesc(SaleRecordDO :: getCreateTime)
         );

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

@@ -17,6 +17,7 @@
         <result column="species_id" property="speciesId"/>
         <result column="authentication_pic" property="authenticationPic"/>
         <result column="position_str" property="positionStr"/>
+        <result column="product_name" property="productName"/>
     </resultMap>
 
     <select id="selectBlockCropPage"   resultMap="BlockCropResult">
@@ -24,9 +25,16 @@
         (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>
         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
+        (select GROUP_CONCAT(ifnull(t4.product_pic,'')) from traceability_cropper t1
+        left join traceability_agricultural_product t4 on t1.product_id = t4.id
+        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
+        and  t1.deleted  is false  and t1.plant_end = 1) as authentication_pic,
+        (select GROUP_CONCAT(ifnull(t4.product_name,'')) from traceability_cropper t1
+        left join traceability_agricultural_product t4 on t1.product_id = t4.id
+        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 product_name
         from traceability_block t2
         <where>
             <if test="reqVO.blockName !=null and reqVO.blockName !=''"> and t2.block_name like concat('%',#{reqVO.blockName},'%')</if>