黔云通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
Pu Zhibing
3 天以前 25cf266e99714ac5d428e66b40ce272325c91dd8 
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java


@@ -6,20 +6,20 @@


import com.baomidou.mybatisplus.mapper.EntityWrapper;


import com.baomidou.mybatisplus.plugins.Page;


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.util.SinataUtil;


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


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


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


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.text.SimpleDateFormat;


import java.util.ArrayList;


@@ -156,10 +156,10 @@


            endTime = timeArray[1];


        }


        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();


        if (ShiroKit.getUser().getRoleType() != 1){


        if (ShiroExtUtil.getUser().getRoleType() != 1) {


            page.setRecords(null);


        }else{


            page.setRecords(tLineService.getLineList(page,beginTime,endTime,name,insertUser,modelStr,state));


        } else {


            page.setRecords(tLineService.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state));


        }


        return super.packForBT(page);


    }


@@ -178,7 +178,7 @@


        tLine.setName(name);


        tLine.setState(1);


        tLine.setInsertTime(new Date());


        tLine.setInsertUserId(ShiroKit.getUser().getId());


        tLine.setInsertUserId(ShiroExtUtil.getUser().getId());


        tLineService.insert(tLine);




        //添加线路站点起点+终点


@@ -327,7 +327,7 @@


                lineCompany.setLineId(lineId);


                lineCompany.setCompanyId(jsonObject.getInteger("companyId"));


                lineCompany.setInsertTime(new Date());


                lineCompany.setInsertUserId(ShiroKit.getUser().getId());


                lineCompany.setInsertUserId(ShiroExtUtil.getUser().getId());


                itLineCompanyService.insert(lineCompany);


            }


        }