采收记录导出

cjy-dependencies/pom.xml

@@ -432,12 +432,6 @@
                 <groupId>com.alibaba</groupId>
                 <artifactId>easyexcel</artifactId>
                 <version>${easyexcel.verion}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>poi-ooxml-schemas</artifactId>
-                        <groupId>org.apache.poi</groupId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>

cjy-framework/cjy-spring-boot-starter-excel/pom.xml

@@ -51,19 +51,24 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>easyexcel</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>poi-ooxml-schemas</artifactId>
-                    <groupId>org.apache.poi</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.cjy</groupId>
             <artifactId>cjy-spring-boot-starter-biz-ip</artifactId>

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

@@ -86,7 +86,7 @@ public class RecoveryRecordController {
     public void exportRecoveryRecordExcel(@Valid RecoveryRecordPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<RecoveryRecordDO> list = recoveryRecordService.getRecoveryRecordPage(pageReqVO).getList();
+        List<RecoveryRecordRespVO> list = recoveryRecordService.getRecoveryRecordPageByExcel(pageReqVO);
         // 导出 Excel
         ExcelUtils.write(response, "采收记录.xls", "数据", RecoveryRecordRespVO.class,
                         BeanUtils.toBean(list, RecoveryRecordRespVO.class));

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

@@ -15,27 +15,27 @@ import com.alibaba.excel.annotation.*;
 public class RecoveryRecordRespVO {
 
     @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "533")
-    @ExcelProperty("主键ID")
     private Integer id;
 
     @Schema(description = "农作物ID", example = "1064")
-    @ExcelProperty("农作物ID")
     private Integer cropperId;
 
-    @Schema(description = "产品批次", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("产品批次")
-    private Integer batch;
-
     @Schema(description = "产品名称", example = "李四")
     @ExcelProperty("产品名称")
     private String productName;
 
+    @Schema(description = "产品批次", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("产品批次")
+    private Integer batch;
+
     @Schema(description = "农事类型ID", example = "3216")
-    @ExcelProperty("农事类型ID")
     private Integer husbandryId;
 
+    @ExcelProperty("农事类型")
+    private String husbandryName;
+
     @Schema(description = "收获重量")
-    @ExcelProperty("收获重量")
+    @ExcelProperty("收获重量(公斤)")
     private BigDecimal production;
 
     @Schema(description = "操作时间")
@@ -43,7 +43,15 @@ public class RecoveryRecordRespVO {
     private LocalDateTime jobTime;
 
     @Schema(description = "作业方式")
-    @ExcelProperty("作业方式")
     private Integer jobWay;
 
+    @ExcelProperty("作业方式")
+    private String jobWayStr;
+
+    @ExcelProperty("操作人")
+    private String nickname;
+
+    @ExcelProperty("备注")
+    private String husbandryNotes;
+
 }

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

@@ -31,4 +31,6 @@ public interface RecoveryRecordMapper extends BaseMapperX<RecoveryRecordDO> {
     }
 
     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

@@ -53,4 +53,6 @@ public interface RecoveryRecordService {
     PageResult<RecoveryRecordDO> getRecoveryRecordPage(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

@@ -176,5 +176,10 @@ public class RecoveryRecordServiceImpl implements RecoveryRecordService {
         }
     }
 
+    @Override
+    public List<RecoveryRecordRespVO> getRecoveryRecordPageByExcel(RecoveryRecordPageReqVO pageReqVO) {
+        return recoveryRecordMapper.getRecoveryRecordPageByExcel(pageReqVO);
+    }
+
 
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/agriculturalproduct/AgriculturalProductMapper.xml

@@ -31,7 +31,6 @@
             <if test="reqVO.productVariety != null and reqVO.productVariety != ''">AND product_variety = #{reqVO.productVariety}</if>
             <if test="reqVO.productStatus != null and reqVO.productStatus != ''">AND product_status = #{reqVO.productStatus}</if>
             AND t1.deleted = 0
-            <!--AND t1.product_status = 0-->
         </where>
         GROUP BY t1.id
         ORDER BY t1.id DESC

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

@@ -11,4 +11,28 @@
     <select id="selectProduction" resultType="java.util.Map">
         SELECT SUM(production) production,COUNT(*) count FROM traceability_recovery_record WHERE cropper_id = #{cropperId} AND deleted = 0
     </select>
+
+    <select id="getRecoveryRecordPageByExcel"
+            resultType="com.cjy.traceability.module.traceability.controller.admin.recoveryrecord.vo.RecoveryRecordRespVO">
+        SELECT
+            t1.product_name as productName,
+            t2.husbandry_name as husbandryName,
+            t1.batch,
+            t1.production,
+            IF
+            ( t1.job_way = 1, '人工', '机械' ) AS jobWayStr,
+            t1.job_time as jobTime,
+            t1.husbandry_notes as husbandryNotes,
+            t3.nickname
+            FROM
+            traceability_recovery_record t1
+            LEFT JOIN traceability_husbandry t2 ON t1.husbandry_id = t2.id
+            LEFT JOIN system_users t3 ON t1.operator = t3.id
+        WHERE t1.deleted = 0
+            <if test="pageReqVO.productName != null and pageReqVO.productName != ''"> AND t1.product_name LIKE CONCAT('%',#{pageReqVO.productName},'%')</if>
+            <if test="pageReqVO.batch != null and pageReqVO.batch != ''"> AND t1.batch = #{pageReqVO.batch}</if>
+            <if test="pageReqVO.jobTime != null and pageReqVO.jobTime.length == 2">
+                AND t1.job_time BETWEEN #{pageReqVO.jobTime[0]} AND #{pageReqVO.jobTime[1]}
+            </if>
+    </select>
 </mapper>