1.销售记录添加参数及条件

2.配送记录添加参数及条件

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/deliveryrecord/vo/DeliveryRecordPageReqVO.java

@@ -82,4 +82,14 @@ public class DeliveryRecordPageReqVO extends PageParam {
      * 接收详细地址
      */
     private String endAddress;
+
+
+    /**
+     * 产品来源
+     */
+    private String qualityInspection;
+    /**
+     * 产品种类
+     */
+    private String productVariety;
 }

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

@@ -56,4 +56,12 @@ public class SaleRecordPageReqVO extends PageParam {
      * 认证类型
      */
     private String authenticationType;
+    /**
+     * 产品来源
+     */
+    private String qualityInspection;
+    /**
+     * 产品种类
+     */
+    private String productVariety;
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/deliveryrecord/DeliveryRecordMapper.xml

@@ -53,6 +53,12 @@
         <if test="reqVO.authenticationType != null and reqVO.authenticationType != ''">
             And t1.authentication_type =#{reqVO.authenticationType}
         </if>
+        <if test="reqVO.qualityInspection !=null and reqVO.qualityInspection !=''">
+            And t5.quality_inspection =#{reqVO.qualityInspection}
+        </if>
+        <if test="reqVO.productVariety !=null and reqVO.productVariety !=''">
+            And t2.product_variety =#{reqVO.productVariety}
+        </if>
         GROUP BY
         t1.product_id
     </select>

cjy-module-traceability/cjy-module-traceability-biz/src/main/resources/mapper/salerecord/SaleRecordMapper.xml

@@ -37,6 +37,12 @@
         <if test="reqVO.authenticationType != null and reqVO.authenticationType != ''">
             And t1.authentication_type =#{reqVO.authenticationType}
         </if>
+        <if test="reqVO.qualityInspection !=null and reqVO.qualityInspection !=''">
+            And t5.quality_inspection =#{reqVO.qualityInspection}
+        </if>
+        <if test="reqVO.productVariety !=null and reqVO.productVariety !=''">
+            And t2.product_variety =#{reqVO.productVariety}
+        </if>
         GROUP BY
         t1.product_id
     </select>