Merge remote-tracking branch 'origin/main'

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

@@ -46,5 +46,7 @@ public class SaleRecordCodePageReqVO {
     private String speciesName;
     @Schema(description = "合格证号")
     private String certificateNumber;
+
+    private String qualityResult;
 }
 

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

@@ -79,6 +79,7 @@ public interface SaleRecordMapper extends BaseMapperX<SaleRecordDO> {
                 .select(ProductDO :: getCertificateNumber)
                 .select(ProductDO :: getCertificateNumber)
                 .select(ProductDO :: getAuthenticationType)
+                .selectAs(SpeciesDO :: getSpeciesName, "speciesName")
                 .leftJoin(ProductDO.class,ProductDO :: getId,SaleRecordDO :: getProductId)
                 .leftJoin(CropperDO.class,CropperDO :: getId,ProductDO :: getCropperId )
                 .leftJoin(SpeciesDO.class,SpeciesDO :: getId,CropperDO ::getSpeciesId)

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/growrecord/GrowRecordMapper.xml

@@ -20,6 +20,8 @@
         t1.plant_time as plantTime,
         t1.end_time as endTime,
         t1.harvest_num as harvestNum,
+        t2.create_time as create_time,
+        t3.species_name as speciesName,
         t1.production
         FROM
         traceability_grow_record t1
@@ -34,10 +36,10 @@
         </if>
 
         <if test="reqVO.plantTime !=null and reqVO.plantTime!=''">
-            and DATE(t1.plant_time) =#{reqVO.plantTime}
+            and t1.plant_time  between #{reqVO.plantTime[0]} and #{reqVO.plantTime[1]}
         </if>
         <if test="reqVO.endTime !=null and reqVO.endTime!=''">
-            and DATE(t1.end_time) =#{reqVO.endTime}
+            and t1.end_time between #{reqVO.endTime[0]} and #{reqVO.endTime[1]}
         </if>
         order by t1.create_time desc
     </select>

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/husbandryrecord/HusbandryRecordMapper.xml

@@ -82,18 +82,18 @@
             <if test="json.quantity != null">agricultural_used,</if>
             deleted,
             tenant_id,
-            <if test="json.quantity != null">creator,</if>
+            <if test="json.creator != null">creator,</if>
             create_time,
-            <if test="json.quantity != null">updater,</if>
+            <if test="json.updater != null">updater,</if>
             update_time,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
-            <if test="json.id != null">#{json.agricultural_type},</if>
-            <if test="json.agriculturalName != null">#{json.agricultural_name},</if>
+            <if test="json.id != null">#{json.agriculturalType},</if>
+            <if test="json.agriculturalName != null">#{json.agriculturalName},</if>
             <if test="json.manufacturer != null">#{json.manufacturer},</if>
-            <if test="json.agriculturalUnit != null">#{json.agricultural_unit},</if>
-            <if test="json.quantity != null">#{json.agricultural_used},</if>
+            <if test="json.agriculturalUnit != null">#{json.agriculturalUnit},</if>
+            <if test="json.quantity != null">#{json.quantity},</if>
             0,
             1,
             <if test="json.creator != null">#{json.creator},</if>