修改bug

Pu Zhibing

3 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java

@@ -2,12 +2,11 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;

import com.stylefeng.guns.modular.system.model.DriverActivity;
import com.stylefeng.guns.modular.system.dao.DriverActivityMapper;
import com.stylefeng.guns.modular.system.model.DriverActivity;
import com.stylefeng.guns.modular.system.model.DriverActivityOnline;
import com.stylefeng.guns.modular.system.model.DriverActivityOrder;
import com.stylefeng.guns.modular.system.model.DriverActivityRegistered;
@@ -15,12 +14,11 @@
import com.stylefeng.guns.modular.system.service.IDriverActivityOrderService;
import com.stylefeng.guns.modular.system.service.IDriverActivityRegisteredService;
import com.stylefeng.guns.modular.system.service.IDriverActivityService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.math.BigDecimal;
import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -46,6 +44,9 @@
    @Autowired
    private IDriverActivityRegisteredService driverActivityRegisteredService;

    @Resource
    private ShiroExtUtil shiroExtUtil;
    
    @Override
    public List<Map<String, Object>> getList(Page<Map<String, Object>> page, String beginTime, String endTime, String name,
                                             Integer companyType,
@@ -60,13 +61,13 @@
            String[] timeArray = startTime.split(" - ");
            Date startTimes = DateUtil.getDate_str3(timeArray[0]);
            Date endTimes = DateUtil.getDate_str3(timeArray[1]);
            ShiroUser user = ShiroExtUtil.getUser();
            ShiroUser user = shiroExtUtil.getUser();
            Date nowDay = new Date();
            //添加活动
            DriverActivity driverActivity = new DriverActivity();
            driverActivity.setInsertTime(nowDay);
            driverActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            driverActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
            driverActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
            driverActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
            driverActivity.setStatus(driverActivity.getCompanyType() == 1 ? 3 : 1);
            driverActivity.setName(num1);
            driverActivity.setStartTime(startTimes);
@@ -141,14 +142,14 @@
            String[] timeArray = startTime.split(" - ");
            Date startTimes = DateUtil.getDate_str3(timeArray[0]);
            Date endTimes = DateUtil.getDate_str3(timeArray[1]);
            ShiroUser user = ShiroExtUtil.getUser();
            ShiroUser user = shiroExtUtil.getUser();
    
            Date nowDay = new Date();
            //添加活动
            DriverActivity driverActivity = new DriverActivity();
            driverActivity.setId(id);
            driverActivity.setCompanyId(ShiroExtUtil.getUser().getObjectId());
            driverActivity.setCompanyType(ShiroExtUtil.getUser().getRoleType());
            driverActivity.setCompanyId(shiroExtUtil.getUser().getObjectId());
            driverActivity.setCompanyType(shiroExtUtil.getUser().getRoleType());
            driverActivity.setStatus(driverActivity.getCompanyType() == 1 ? 3 : 1);
            driverActivity.setName(num1);
            driverActivity.setStartTime(startTimes);