bug修改

xuhy

2025-09-02 7bf4584c98a18f3027d6be1a919750c539d6e580

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargeOrderController.java

@@ -8,13 +8,20 @@
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.utils.WebUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.dto.GetImportOrderDTO;
import com.ruoyi.order.export.ChargeOrderExport;
import com.ruoyi.order.model.ChargeOrder;
import com.ruoyi.order.service.ChargeOrderService;
import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.system.api.domain.SysConfig;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -32,6 +39,8 @@
public class ChargeOrderController {
    @Resource
    private ChargeOrderService chargeOrderService;
    @Resource
    private SysUserClient sysUserClient;
    @PostMapping(value = "/getBySiteIdAndTime")
    public R<List<ChargingOrderGroup>> getBySiteIdAndTime(@RequestBody ChargingPercentProvinceDto chargingPercentProvinceDto) {

@@ -49,10 +58,11 @@
        if (file.isEmpty()) {
            return R.fail("请选择要上传的文件");
        }

        return chargeOrderService.importExpress(file);
    }

    @Autowired
    private TokenService tokenService;
    /**
     * 获取导入订单列表
     */
@@ -60,7 +70,13 @@
    @PostMapping("/getImportData")
    @ApiOperation(value = "获取导入订单列表", tags = "后台-充电订单")
    public R<PageInfo<ChargeOrder>> getUserPointPageList(@RequestBody GetImportOrderDTO getImportOrderDTO) {

        LoginUser loginUser = tokenService.getLoginUser();
        R<SysUser> sysUser = sysUserClient.getSysUser(loginUser.getUserid());
        SysUser data = sysUser.getData();
        if (data.getRoleType() == 2){
            // 只查询当前站点数据
            getImportOrderDTO.setSiteId(data.getSiteId());
        }
        PageInfo<ChargeOrder> pageInfo=chargeOrderService.getUserPointPageList(getImportOrderDTO);

        return R.ok(pageInfo);