修改接口

xuhy

2024-09-21 88e1ae77be3fd4bb803fe68b3d04b2478edac550

 ruoyi-system/src/main/resources/mapper/system/TOrderSaleMapper.xml

@@ -19,14 +19,15 @@
        <result column="shopId" property="shopId" />
        <result column="generatorId" property="generatorId" />
        <result column="payType" property="payType" />
        <result column="isCover" property="isCover" />
    </resultMap>

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, orderTime, remark, createTime, updateTime, disabled, createBy, updateBy, orderNum, status,orderMoney,payMoney,shopId,generatorId,payType
        id, orderTime, remark, createTime, updateTime, disabled, createBy, updateBy, orderNum, status,orderMoney,payMoney,shopId,generatorId,payType,isCover
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TOrderSaleVO">
        select id, orderTime, remark, createTime, updateTime, disabled, createBy, updateBy, orderNum, status,orderMoney,payMoney,shopId,generatorId,payType
        select id, orderTime, remark, createTime, updateTime, disabled, createBy, updateBy, orderNum, status,orderMoney,payMoney,shopId,generatorId,payType,isCover
        from t_order_sale
        <where>
            <if test="query.orderNum != null and query.orderNum != ''">
@@ -40,6 +41,9 @@
            </if>
            <if test="query.shopId != null">
                and shopId = #{query.shopId}
            </if>
            <if test="query.isCover != null">
                and isCover = #{query.isCover}
            </if>
            <if test="query.generatorId != null">
                and generatorId = #{query.generatorId}
@@ -75,6 +79,7 @@
                AND (createTime BETWEEN #{query.startTime} AND #{query.endTime})
            </if>
            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
            AND isCover = 1
        </where>
    </select>
    <select id="salesVolume" resultType="com.ruoyi.system.vo.SalesVolumeVO">
@@ -93,6 +98,7 @@
                AND (orderTime BETWEEN #{query.startTime} AND #{query.endTime})
            </if>
            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
            AND isCover = 1
        </where>
    </select>
    <select id="exportOrderSale" resultType="com.ruoyi.system.vo.TOrderSaleVO">
@@ -115,6 +121,7 @@
                AND (createTime BETWEEN #{query.startTime} AND #{query.endTime})
            </if>
            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
            AND isCover = 1
        </where>
        ORDER BY orderTime DESC
    </select>
@@ -131,6 +138,7 @@
                AND (createTime BETWEEN #{query.startTime} AND #{query.endTime})
            </if>
            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
            AND isCover = 1
        </where>
    </select>
    <select id="getDataGeneratorSaleDetail" resultType="java.util.Map">