文件上传修改

无关风月

2025-01-15 a92452291015f36f99a5f1ee00103a1020533e63

文件上传修改

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java

@@ -562,8 +562,12 @@

        R<List<Order>> result = orderClient.excelExport(orderQueryRequest);
        for (Order datum : result.getData()) {
            datum.setServeName(around(datum.getServeName(), 1, datum.getServeName().length()-1));
            datum.setServerPhone(around(datum.getServerPhone(), 3, 4));
            if(StringUtils.hasLength(datum.getServerName())){
                datum.setServerName(datum.getServerName().charAt(0)+"***");
            }
            if(StringUtils.hasLength(datum.getServerPhone())){
                datum.setServerPhone(around(datum.getServerPhone(), 3, 4));
            }
        }
        // 独立orderService
        return orderService.excelExport(result.getData(), response);

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/mapper/OrderMapper.java

@@ -105,7 +105,7 @@
     */
    Page<Order> queryPage(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);
    Page<Order> queryPage1(@Param("data") OrderQueryRequest orderQueryRequest, Page<Order> page);

    List<Order> excelExportList(@Param("data") OrderQueryRequest orderQueryRequest);
    /**
     * 订单管理分页模块，订单数量统计
     *

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -117,14 +117,25 @@

    @Override
    public List<Order> excelExport(OrderQueryRequest orderQueryRequest) {
        List<String> ids = orderQueryRequest.getIds();
        List<Order> list;
        if (null != ids && !ids.isEmpty()) {
            list = baseMapper.exportByIdList(ids);
        } else {
            list = baseMapper.exportList(orderQueryRequest);
//        List<String> ids = orderQueryRequest.getIds();
//        List<Order> list;
//        if (null != ids && !ids.isEmpty()) {
//            list = baseMapper.exportByIdList(ids);
//        } else {
//            list = baseMapper.exportList(orderQueryRequest);
//        }
        List<Order> orders = baseMapper.excelExportList(orderQueryRequest);
        List<ChangeDispatch> list = changeDispatchService.lambdaQuery()
                .eq(ChangeDispatch::getIsDelete, 0)
                .orderByDesc(ChangeDispatch::getCreateTime).list();
        for (Order order : orders) {
            ChangeDispatch changeDispatch = list.stream().filter(e -> e.getOrderId().equals(order.getId()))
                    .findFirst().orElse(null);
            if (null != changeDispatch) {
                order.setApplyReason(changeDispatch.getApplyReason());
            }
        }
        return list;
        return orders;
    }

    @Override

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml

@@ -377,6 +377,79 @@
        order by o.createTime desc
    </select>

    <select id="excelExportList" resultMap="BaseResultMap">
        select *
        from t_order o
        <where>
            o.is_delete = 0
            <if test="data.fake != null ">
                and o.fake = #{data.fake}
            </if>
            <if test="data.address != null and data.address != ''">
                and o.reservation_address like concat('%', #{data.address}, '%')
            </if>
            <if test="data.orderNumber != null and data.orderNumber != ''">
                and o.order_number like concat('%', #{data.orderNumber}, '%')
            </if>
            <if test="data.cityName != null and data.cityName != ''">
                and o.city like concat('%', #{data.cityName}, '%')
            </if>
            <if test="data.cityList != null and data.cityList.size() != 0">
                and o.city_code in
                <foreach collection="data.cityList" item="c" open="(" separator="," close=")">
                    #{c}
                </foreach>
            </if>
            <if test="data.servIds != null and data.servIds.size() != 0">
                and o.serve_id in
                <foreach collection="data.servIds" item="c" open="(" separator="," close=")">
                    #{c}
                </foreach>
            </if>

            <if test="data.reservationName != null and data.reservationName != ''">
                and o.reservation_name like concat('%', #{data.reservationName}, '%')
            </if>
            <if test="data.reservationPhone != null and data.reservationPhone != ''">
                and o.reservation_phone like concat('%', #{data.reservationPhone}, '%')
            </if>
            <if test="data.state != null">
                and o.state = #{data.state}
            </if>
            <if test="data.type != null">
                and o.type = #{data.type}
            </if>
            <if test="data.workerName != null and data.workerName != ''">
                and o.server_name like concat('%', #{data.workerName}, '%')
            </if>
            <if test="data.workerPhone != null and data.workerPhone != ''">
                and o.server_phone like concat('%', #{data.workerPhone}, '%')
            </if>
            <if test="data.serveName != null and data.serveName != ''">
                and o.site_name like concat('%', #{data.serveName}, '%')
            </if>
            <if test="data.orderTimeStart != null and data.orderTimeStart != ''">
                and DATE(o.createTime) <![CDATA[ >= ]]> #{data.orderTimeStart}
            </if>
            <if test="data.orderTimeEnd != null and data.orderTimeEnd != ''">
                and DATE(o.createTime) <![CDATA[ <= ]]> #{data.orderTimeEnd}
            </if>
            <if test="data.startTime != null and data.startTime != ''">
                and STR_TO_DATE(SUBSTRING_INDEX(time, ' - ', 1), '%Y-%m-%d %H:%i') <![CDATA[ >= ]]> #{data.startTime}
            </if>
            <if test="data.endTime != null and data.endTime != ''">
                AND STR_TO_DATE(SUBSTRING_INDEX(time, ' - ', -1), '%Y-%m-%d %H:%i') <![CDATA[ <= ]]> #{data.endTime}
            </if>
            <if test="data.completeTimeStart != null and data.completeTimeStart != ''">
                and DATE(o.complete_time) <![CDATA[ >= ]]> #{data.completeTimeStart}
            </if>
            <if test="data.completeTimeEnd != null and data.completeTimeEnd != ''">
                and DATE(o.complete_time) <![CDATA[ <= ]]> #{data.completeTimeEnd}
            </if>
        </where>
        order by o.createTime desc
    </select>

    <select id="orderPageCount" resultType="com.ruoyi.order.entity.Order">
        select
        sum(case when o.state = 0 then 1 end) as toBeDispatched,