修改因合并版本造成代码丢失的问题

houruijun

2020-10-22 e50e03e296a2456836afbb7f6bee461ee7bddd05

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

@@ -264,7 +264,42 @@
ORDER BY
   create_time DESC
    </select>

   <select id="getUserdProduct" resultType="int">
        SELECT
        sum(total)
        FROM
        (
        SELECT
        count(*) total
        FROM
        `product_order` order_order
        LEFT JOIN product_order_record record ON order_order.id = record.order_id
        WHERE
        order_order.hospital_id = #{hospitalId}
        AND order_order.department_id = #{departmentId}
        and  record.pro_id!=1000000000000000000
        AND order_order.is_del = 0
   AND order_order.enabled = 1
      AND record.is_del = 0
   AND record.enabled = 1
   AND record.pro_endtime>now()
        UNION ALL
        SELECT
        count(*) total
        FROM
        `product_order` order_order
        LEFT JOIN product_order_record record ON order_order.id = record.order_id
        WHERE
        order_order.hospital_id = #{hospitalId}
        AND record.is_share = 1
        and  record.pro_id!=1000000000000000000
        AND order_order.is_del = 0
   AND order_order.enabled = 1
      AND record.is_del = 0
   AND record.enabled = 1
   AND record.pro_endtime>now()
        ) cc
    </select>
    <select id="productEndList" resultType="com.kidgrow.oprationcenter.vo.ProductEndVo">
        SELECT
        id,