新增农产品图片

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/product/vo/ProductCodePageRespVO.java

@@ -53,4 +53,6 @@ public class ProductCodePageRespVO {
      */
     private Integer sourceType;
     private Integer printNum;
+
+    private String productPic;
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/salerecord/vo/SaleRecordCodePageReqVO.java

@@ -48,5 +48,7 @@ public class SaleRecordCodePageReqVO {
     private String certificateNumber;
 
     private String qualityResult;
+
+    private String productPic;
 }
 

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/product/ProductMapper.java

@@ -168,9 +168,11 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
                  .select(ProductDO :: getSourceType)
                  .select(SpeciesDO :: getSpeciesName)
                  .select(ProductDO :: getPrintNum)
+                 .select(AgriculturalProductDO :: getProductPic)
                  .disableSubLogicDel()
                  .leftJoin(CropperDO.class,CropperDO :: getId,ProductDO :: getCropperId)
                  .leftJoin(SpeciesDO.class,SpeciesDO :: getId,CropperDO ::getSpeciesId)
+                 .leftJoin(AgriculturalProductDO.class, AgriculturalProductDO :: getId, CropperDO :: getProductId)
                  .between(reqVO.getProcessingTime() !=null,ProductDO :: getProcessingTime,reqVO.getProcessingTime() == null? "" :reqVO.getProcessingTime()[0],reqVO.getProcessingTime() == null? "" :reqVO.getProcessingTime()[1])
                  .like(StringUtil.isNotBlank(reqVO.getProcessingName()),ProductDO :: getProcessingName,reqVO.getProcessingName())
                  .orderByDesc(ProductDO :: getCreateTime)

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

@@ -8,6 +8,7 @@ import com.cjy.traceability.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.cjy.traceability.framework.mybatis.core.mapper.BaseMapperX;
 import com.cjy.traceability.module.traceability.controller.admin.loss.vo.LossPageReqVO;
 import com.cjy.traceability.module.traceability.controller.admin.product.vo.ProductCodePageRespVO;
+import com.cjy.traceability.module.traceability.dal.dataobject.agriculturalproduct.AgriculturalProductDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.cropper.CropperDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.custom.CustomDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.product.ProductDO;
@@ -79,11 +80,13 @@ public interface SaleRecordMapper extends BaseMapperX<SaleRecordDO> {
                 .select(ProductDO :: getCertificateNumber)
                 .select(ProductDO :: getCertificateNumber)
                 .select(ProductDO :: getAuthenticationType)
+                .select(AgriculturalProductDO :: getProductPic)
                 .selectAs(SpeciesDO :: getSpeciesName, "speciesName")
                 .disableSubLogicDel()
                 .leftJoin(ProductDO.class,ProductDO :: getId,SaleRecordDO :: getProductId)
                 .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])
                 .like(StringUtil.isNotBlank(pageReqVO.getProcessingName()),ProductDO :: getProcessingName,pageReqVO.getProcessingName())
                 .orderByDesc(SaleRecordDO :: getCreateTime)