Merge remote-tracking branch 'origin/main'

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

@@ -84,7 +84,7 @@ public class RecoveryRecordController {
     @Operation(summary = "获得采收记录分页")
     @PreAuthorize("@ss.hasPermission('traceability:recovery-record:query')")
     public CommonResult<PageResult<RecoveryRecordRespVO>> getRecoveryRecordPage(@Valid RecoveryRecordPageReqVO pageReqVO) {
-        PageResult<RecoveryRecordRespVO> pageResult = recoveryRecordService.getRecoveryRecordPage(pageReqVO);
+        PageResult<RecoveryRecordRespVO> pageResult = recoveryRecordService.selectRecoveryRecordPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, RecoveryRecordRespVO.class));
     }
 

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

@@ -27,6 +27,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface RecoveryRecordMapper extends BaseMapperX<RecoveryRecordDO> {
 
+
     default PageResult<RecoveryRecordRespVO> selectPage(RecoveryRecordPageReqVO reqVO) {
         return selectJoinPage(reqVO, RecoveryRecordRespVO.class,new MPJLambdaWrapper<RecoveryRecordDO>()
                 .select(RecoveryRecordDO::getId)
@@ -56,6 +57,9 @@ public interface RecoveryRecordMapper extends BaseMapperX<RecoveryRecordDO> {
                 .orderByDesc(RecoveryRecordDO::getId));
     }
 
+    IPage<RecoveryRecordRespVO> selectRecoveryRecordPage(IPage<RecoveryRecordRespVO> page, @Param("reqVO")RecoveryRecordPageReqVO pageReqVO);
+
+
     Map<String,Object> selectProduction(Integer cropperId);
 
     List<RecoveryRecordRespVO> getRecoveryRecordPageByExcel(@Param("pageReqVO") RecoveryRecordPageReqVO pageReqVO);

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/recoveryrecord/RecoveryRecordService.java

@@ -52,6 +52,9 @@ public interface RecoveryRecordService {
      */
     PageResult<RecoveryRecordRespVO> getRecoveryRecordPage(RecoveryRecordPageReqVO pageReqVO);
 
+    PageResult<RecoveryRecordRespVO> selectRecoveryRecordPage(RecoveryRecordPageReqVO pageReqVO);
+
+
     void createRecovery(Recovery recovery);
 
     List<RecoveryRecordRespVO> getRecoveryRecordPageByExcel(RecoveryRecordPageReqVO pageReqVO);

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/recoveryrecord/RecoveryRecordServiceImpl.java

@@ -122,6 +122,13 @@ public class RecoveryRecordServiceImpl implements RecoveryRecordService {
         return recoveryRecordMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public PageResult<RecoveryRecordRespVO> selectRecoveryRecordPage(RecoveryRecordPageReqVO pageReqVO) {
+        IPage<RecoveryRecordRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        recoveryRecordMapper.selectRecoveryRecordPage(page, pageReqVO);
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
     @Override
     public void createRecovery(Recovery recovery) {
         //添加农事记录

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

@@ -55,4 +55,38 @@
     <select id="getFarmingRecordsCount" resultType="java.lang.Integer">
         select count(*) from traceability_husbandry_record where cropper_id=#{cropperId} and batch=#{batch} and deleted=0
     </select>
+    <select id="selectRecoveryRecordPage"
+            resultType="com.cjy.traceability.module.traceability.controller.admin.recoveryrecord.vo.RecoveryRecordRespVO">
+        SELECT
+            t.id,
+            t.cropper_id,
+            t.product_name,
+            t.batch,
+            t.husbandry_id,
+            t.production,
+            t.job_time,
+            t.operator,
+            t.job_way,
+            t3.species_name,
+            t2.block_name,
+            t4.quality_result,
+            t4.quality_inspection
+        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
+        <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>
+            <if test="reqVO.jobTime != null and reqVO.jobTime.length == 2">
+                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>
+            AND t.deleted = 0
+        </where>
+        ORDER BY
+            t.job_time DESC
+    </select>
 </mapper>