黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
Pu Zhibing
2 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9 
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java


@@ -5,22 +5,21 @@


import com.stylefeng.guns.core.base.controller.BaseController;


import com.stylefeng.guns.core.beetl.ShiroExtUtil;


import com.stylefeng.guns.core.common.constant.factory.PageFactory;


import com.stylefeng.guns.core.shiro.ShiroKit;


import com.stylefeng.guns.core.log.LogObjectHolder;


import com.stylefeng.guns.core.shiro.ShiroUser;


import com.stylefeng.guns.core.util.SinataUtil;


import com.stylefeng.guns.modular.system.model.*;


import com.stylefeng.guns.modular.system.service.*;


import com.stylefeng.guns.modular.system.util.DateUtil;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Controller;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.ResponseBody;


import org.springframework.ui.Model;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.beans.factory.annotation.Autowired;


import com.stylefeng.guns.core.log.LogObjectHolder;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.ResponseBody;




import java.math.BigDecimal;


import javax.annotation.Resource;


import java.text.SimpleDateFormat;


import java.util.Date;


import java.util.HashMap;


@@ -53,6 +52,9 @@




    @Autowired


    private IDriverActivityHistoryService driverActivityHistoryService;


    


    @Resource


    private ShiroExtUtil shiroExtUtil;




    /**


     * 跳转到首页


@@ -230,7 +232,7 @@


    @RequestMapping(value = "/list")


    @ResponseBody


    public Object list(String createTime,String name) {


        ShiroUser user = ShiroExtUtil.getUser();


        ShiroUser user = shiroExtUtil.getUser();


        String beginTime = null;


        String endTime = null;


        if (SinataUtil.isNotEmpty(createTime)){