Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-06-16 bdc56ebc9534620766d787a1dacb4c962ea10797

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml

@@ -146,33 +146,21 @@
        <where>
            <!--查询条件自行添加-->
            DE.is_del=0 and DE.ailight_count>0 and DE.pro_begintime &lt;=now() and DE.pro_endtime >=now() and DE.enabled=1
            <if test="p.recordCount != null and p.recordCount !=''">
                and DE.record_count > #{p.recordCount}
            </if>
            <if test="p.hospitalId != null and p.hospitalId !=''">
                and DE.hospital_id = #{p.hospitalId}
                and PRO.hospital_id = #{p.hospitalId}
            </if>
        </where>
    </sql>
    <!--查询产品的购买记录-->
    <select id="findAllList" resultType="com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail">
        SELECT
        DE.id,
        DE.ailight_count,
        DE.order_id,
        DE.pro_name,
        DE.record_count,
        DE.is_share,
        DE.pro_begintime,
        DE.pro_endtime,
        DE.pro_id,
        DE.create_time,
        DE.is_del,
        DE.enabled,
        PRO.hospital_Id,
        PRO.hospital_name,
        PRO.department_id,
        PRO.department_name,
        DE.pro_type
        FROM
        product_order_detail DE