Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

14 小时以前 63328dd80adc6331db581dda6418308e6fd4da12

 src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml

@@ -340,5 +340,17 @@
        select *
        from  procurement_record_storage t1
        left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
          <where>
              1=1
              <if test="req.productCategory != null and req.productCategory != ''">
                  and t2.product_category like  concat('%',#{req.productCategory},'%')
              </if>
              <if test="req.timeStr != null and req.timeStr != ''">
                  and t1.create_time like  concat('%',#{req.timeStr},'%')
              </if>
              <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
                  and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
              </if>
          </where>
    </select>
</mapper>