BUG修改

xuhy

2023-05-15 17a21eb623864ad92ca41087dfcd8814641a9587

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java

@@ -2,6 +2,7 @@

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.base.tips.SuccessTip;
import com.stylefeng.guns.core.log.LogObjectHolder;
@@ -19,6 +20,7 @@
import com.stylefeng.guns.modular.system.model.TRechargeRecord;
import com.stylefeng.guns.modular.system.model.TRegion;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.RedisUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -47,6 +49,8 @@
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Period;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -308,10 +312,33 @@
    @ResponseBody
    public Object list(String createTime,String phone,Integer status) {
        EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
        wrapper.ne("isException",2);
        wrapper.orderBy("createTime",false);
        List<TDriver> tDrivers = tDriverService.selectList(wrapper);
        return tDriverService.getTDriverResp(tDrivers);
        List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
        for (TDriverResp driverResp : tDriverResp) {
            TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
                    .eq("driverId", driverResp.getId())
                    .orderBy("workTime", false)
                    .last("LIMIT 1"));
            if(Objects.nonNull(tDriverWork)){
                // 如果是下班状态，计算未上线天数，，如果为上班状态，则设置为0
                if(tDriverWork.getStatus() == 1){
                    driverResp.setNotOnlineCount(0);
                }else {
                    Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
                    driverResp.setNotOnlineCount(Math.abs(period.getDays()));
                }
            }else {
                if(Objects.nonNull(driverResp.getApprovalTime())){
                    // 没有上班记录，计算审核时间
                    Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
                    driverResp.setNotOnlineCount(Math.abs(period.getDays()));
                }else {
                    driverResp.setNotOnlineCount(0);
                }
            }
        }
        return tDriverResp;
    }
    /**
     * 获取佣金列表
@@ -357,6 +384,18 @@
            if(Objects.nonNull(tDriver)){
                tDriverCommissionResp.setInviterName(tDriver.getName());
                tDriverCommissionResp.setInviterPhone(tDriver.getPhone());

                if(Objects.nonNull(tDriver.getInviterId())){
                    TDriver driver = tDriverService.selectById(tDriver.getInviterId());
                    if(Objects.nonNull(driver.getInviterId())){
                        tDriverCommissionResp.setLevel("三级");
                    }else {
                        tDriverCommissionResp.setLevel("二级");
                    }
                }else {
                    tDriverCommissionResp.setLevel("一级");
                }

            }
        }
        return commissionResp;
@@ -577,12 +616,11 @@
            String time1 = format.format(date);
            String fileName = "DriverInfo"+time1+".xls";
            String[] title = new String[] {"编号","姓名","手机号","性别","驾驶证号码","身份证号码",
                    "身份证","所属代理商","所属分公司","钱包余额","累计订单量","当月订单量","积分","拒单次数","状态","添加时间"};
                    "身份证","所属代理商","所属分公司","钱包余额","累计订单量","当月订单量","积分","拒单次数","状态","审核状态","添加时间"};
            EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
            // 是否异常
            List<TDriver> list = tDriverService.selectList(wrapper);

            List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(list);
            wrapper.orderBy("createTime",false);
            List<TDriver> tDrivers = tDriverService.selectList(wrapper);
            List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);

            String[][] values = new String[tDriverResp.size()][];
            for (int i = 0; i < tDriverResp.size(); i++) {
@@ -621,7 +659,15 @@
                }else {
                    values[i][14] = "删除";
                }
                values[i][15] = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(d.getCreateTime());
                Integer approvalStatus = d.getApprovalStatus();
                if(1 == approvalStatus){
                    values[i][15] = "待审核";
                }else if(2 == approvalStatus){
                    values[i][15] = "已同意";
                }else {
                    values[i][15] = "已拒绝";
                }
                values[i][16] = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(d.getCreateTime());
            }
            HSSFWorkbook wb = ExcelUtil.getHSSFWorkbook("Variance"+time1, title, values, null);
            ExcelUtil.setResponseHeader(response, fileName);
@@ -650,10 +696,28 @@
                    "身份证","累计订单量","当月订单量","积分","连续未上线（天）","状态","添加时间"};
            EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
            wrapper.eq("isException",2);
            // 是否异常
            List<TDriver> list = tDriverService.selectList(wrapper);

            List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(list);
            wrapper.orderBy("createTime",false);
            List<TDriver> tDrivers = tDriverService.selectList(wrapper);
            List<TDriverResp> tDriverResp = tDriverService.getTDriverResp(tDrivers);
            for (TDriverResp driverResp : tDriverResp) {
                TDriverWork tDriverWork = tDriverWorkService.selectOne(new EntityWrapper<TDriverWork>()
                        .eq("driverId", driverResp.getId())
                        .orderBy("workTime", false)
                        .last("LIMIT 1"));
                if(Objects.nonNull(tDriverWork)){
                    // 如果是下班状态，计算未上线天数，，如果为上班状态，则设置为0
                    if(tDriverWork.getStatus() == 1){
                        driverResp.setNotOnlineCount(0);
                    }else {
                        Period period = Period.between(DateUtil.dateToLocalDate(tDriverWork.getOffWorkTime()), LocalDate.now());
                        driverResp.setNotOnlineCount(Math.abs(period.getDays()));
                    }
                }else {
                    // 没有上班记录，计算审核时间
                    Period period = Period.between(DateUtil.dateToLocalDate(driverResp.getApprovalTime()), LocalDate.now());
                    driverResp.setNotOnlineCount(Math.abs(period.getDays()));
                }
            }

            String[][] values = new String[tDriverResp.size()][];
            for (int i = 0; i < tDriverResp.size(); i++) {
@@ -694,7 +758,7 @@
            e.printStackTrace();
        }
    }
    @ApiOperation(value = "导出司机异常列表",notes="导出司机异常列表")
    @ApiOperation(value = "导出司机佣金列表",notes="导出司机佣金列表")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
    })