无关风月
5 天以前 f39e7de8be43eda95560f49982b6cd0345e24404
Merge remote-tracking branch 'origin/dev' into dev
2个文件已修改
8 ■■■■■ 已修改文件
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -388,7 +388,15 @@
                and DATE(o.complete_time) <![CDATA[ <= ]]> #{data.completeTimeEnd}
            </if>
        </where>
        <if test="data.completeType != null and data.completeType == 1">
            order by o.complete_time
        </if>
        <if test="data.completeType != null and data.completeType == 2">
            order by o.complete_time desc
        </if>
        <if test="data.completeType == null">
        order by o.createTime desc
        </if>
    </select>
    <select id="excelExportList" resultMap="BaseResultMap">