采收记录增加品种、地块、质检字典显示

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

@@ -60,4 +60,16 @@ public class RecoveryRecordRespVO {
     @ExcelProperty("备注")
     private String husbandryNotes;
 
+    @Schema(description = "品种名称")
+    private String speciesName;
+
+    @Schema(description = "地块名称")
+    private String blockName;
+
+    @Schema(description = "质检情况")
+    private String qualityInspection;
+
+    @Schema(description = "质检结论")
+    private String qualityResult;
+
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/dal/mysql/recoveryrecord/RecoveryRecordMapper.java

@@ -13,6 +13,7 @@ import com.cjy.traceability.module.traceability.dal.dataobject.block.BlockDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.cropper.CropperDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.product.ProductDO;
 import com.cjy.traceability.module.traceability.dal.dataobject.recoveryrecord.RecoveryRecordDO;
+import com.cjy.traceability.module.traceability.dal.dataobject.species.SpeciesDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.cjy.traceability.module.traceability.controller.admin.recoveryrecord.vo.*;
@@ -28,6 +29,19 @@ public interface RecoveryRecordMapper extends BaseMapperX<RecoveryRecordDO> {
 
     default PageResult<RecoveryRecordRespVO> selectPage(RecoveryRecordPageReqVO reqVO) {
         return selectJoinPage(reqVO, RecoveryRecordRespVO.class,new MPJLambdaWrapper<RecoveryRecordDO>()
+                .select(RecoveryRecordDO::getId)
+                .select(RecoveryRecordDO::getCropperId)
+                .select(RecoveryRecordDO::getProductName)
+                .select(RecoveryRecordDO::getBatch)
+                .select(RecoveryRecordDO::getHusbandryId)
+                .select(RecoveryRecordDO::getProduction)
+                .select(RecoveryRecordDO::getJobTime)
+                .select(RecoveryRecordDO::getOperator)
+                .select(RecoveryRecordDO::getJobWay)
+                .select(SpeciesDO::getSpeciesName)
+                .select(BlockDO::getBlockName)
+                .select(ProductDO::getQualityResult)
+                .select(ProductDO::getQualityInspection)
                 .eq(reqVO.getCropperId() !=null,RecoveryRecordDO::getCropperId, reqVO.getCropperId())
                 .eq(reqVO.getBatch() !=null,RecoveryRecordDO::getBatch, reqVO.getBatch())
                 .like(reqVO.getProductName() !=null,RecoveryRecordDO::getProductName, reqVO.getProductName())
@@ -35,6 +49,9 @@ public interface RecoveryRecordMapper extends BaseMapperX<RecoveryRecordDO> {
                 .between(reqVO.getJobTime() !=null, RecoveryRecordDO:: getJobTime,reqVO.getJobTime() == null? "" :reqVO.getJobTime()[0],reqVO.getJobTime() == null? "" :reqVO.getJobTime()[1])
                 .leftJoin(CropperDO.class,CropperDO::getId, RecoveryRecordDO::getCropperId)
                 .leftJoin(BlockDO.class,BlockDO::getId,CropperDO::getBlockId)
+                .leftJoin(SpeciesDO.class,SpeciesDO::getId,CropperDO::getSpeciesId)
+                .leftJoin(ProductDO.class,on -> on.eq(ProductDO::getCropperId, RecoveryRecordDO::getCropperId)
+                        .eq(ProductDO::getBatch, RecoveryRecordDO::getBatch))
                 .eq(reqVO.getBaseId() !=null,BlockDO::getBaseId, reqVO.getBaseId())
                 .orderByDesc(RecoveryRecordDO::getId));
     }