食堂进销修复

pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenInventoryRecordsMapper.xml

@@ -31,7 +31,8 @@
   </resultMap>
     <select id="selectPageDataByScope"
             resultType="com.bsd.pjcloud.canteen.vo.erp.CanteenProductionRecordPageVO">
-        SELECT r.inventory_code,r.inventory_date, COALESCE(GROUP_CONCAT(m.name ORDER BY m.name SEPARATOR '，'), '') AS product_name,r.remark,r.total_amount,s.supplier_name  FROM `canteen_inventory_records` r
+        SELECT r.inventory_code,r.inventory_date, COALESCE(GROUP_CONCAT(m.name ORDER BY m.name SEPARATOR '，'), '') AS product_name,r.remark,r.total_amount,s.supplier_name
+        FROM `canteen_inventory_records` r
         LEFT JOIN canteen_inventory_records_item i
         on r.id=i.inventory_id
         LEFT JOIN canteen_erp_material m
@@ -43,7 +44,7 @@
                 <if test="canteenInventoryRecords.inventoryCode != null and canteenInventoryRecords.inventoryCode != ''">
                     and r.inventory_code = #{canteenInventoryRecords.inventoryCode}
                 </if>
-            <if test="inventoryDate != null and inventoryDate != ''">
+            <if test="canteenInventoryRecords.inventoryDate != null and canteenInventoryRecords.inventoryDate != ''">
                 and cpr.production_time = #{inventoryDate}
             </if>
         </where>