修改bug

Pu Zhibing

3 天以前 b219589d73f46bd98995bceb4caf16dadb56b869

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TLineController.java

@@ -21,6 +21,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -53,16 +54,19 @@

    @Autowired
    private ITLinePriceService itLinePriceService;

    
    @Autowired
    private ITLineShiftService itLineShiftService;

    
    @Autowired
    private ITCompanyService itCompanyService;

    
    @Autowired
    private ITLineCompanyService itLineCompanyService;

    
    @Autowired
    private ShiroExtUtil shiroExtUtil;
    
    /**
     * 跳转到跨城站点管理首页
     */
@@ -70,14 +74,19 @@
    public String index() {
        return PREFIX + "tLine.html";
    }

    
    /**
     * 跳转到添加跨城站点管理
     */
    @RequestMapping("/tLine_add")
    public String tLineAdd(Model model) {
        //站点
        List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
        Integer companyId = null;
        if(shiroExtUtil.getUser().getRoleType() != 1){
            companyId = shiroExtUtil.getUser().getObjectId();
        }
        List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1)
                .eq(null != companyId, "companyId", companyId));
        model.addAttribute("siteList",siteList);
        //跨城车型
        List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
@@ -128,7 +137,12 @@
        TLineSite end = itLineSiteService.selectOne(new EntityWrapper<TLineSite>().eq("lineId", tLineId).eq("type", 2));
        model.addAttribute("end",end);
        //站点
        List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1));
        Integer companyId = null;
        if(shiroExtUtil.getUser().getRoleType() != 1){
            companyId = shiroExtUtil.getUser().getObjectId();
        }
        List<TSite> siteList = itSiteService.selectList(new EntityWrapper<TSite>().eq("state", 1)
                .eq(null != companyId, "companyId", companyId));
        model.addAttribute("siteList",siteList);
        //跨城车型
        List<TServerCarmodel> carmodelList = itServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 2).eq("state", 1));
@@ -150,17 +164,17 @@
    public Object list(String insertTime,String name,String insertUser,String modelStr,Integer state) {
        String beginTime = null;
        String endTime = null;
        if (SinataUtil.isNotEmpty(insertTime)){
        if (SinataUtil.isNotEmpty(insertTime)) {
            String[] timeArray = insertTime.split(" - ");
            beginTime = timeArray[0];
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        if (ShiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
        } else {
            page.setRecords(tLineService.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state));
        Integer companyId = null;
        if(shiroExtUtil.getUser().getRoleType() != 1){
            companyId = shiroExtUtil.getUser().getObjectId();
        }
        page.setRecords(tLineService.getLineList(page, beginTime, endTime, name, insertUser, modelStr, state, companyId));
        return super.packForBT(page);
    }

@@ -170,6 +184,7 @@
    @RequestMapping(value = "/add")
    @ResponseBody
    public ResultUtil add(TLine tLine,Integer startSiteId,Integer endSiteId,@RequestParam String subArr,@RequestParam String shuArr) {

        String name = tLine.getName();
        name = name.replaceAll("& lt;", "<");
        name = name.replaceAll("& gt;", ">");
@@ -178,9 +193,10 @@
        tLine.setName(name);
        tLine.setState(1);
        tLine.setInsertTime(new Date());
        tLine.setInsertUserId(ShiroExtUtil.getUser().getId());
        tLine.setInsertUserId(shiroExtUtil.getUser().getId());
        tLine.setCompanyId(shiroExtUtil.getUser().getObjectId());
        tLineService.insert(tLine);

    
        //添加线路站点起点+终点
        TLineSite start = new TLineSite();
        start.setLineId(tLine.getId());
@@ -327,7 +343,7 @@
                lineCompany.setLineId(lineId);
                lineCompany.setCompanyId(jsonObject.getInteger("companyId"));
                lineCompany.setInsertTime(new Date());
                lineCompany.setInsertUserId(ShiroExtUtil.getUser().getId());
                lineCompany.setInsertUserId(shiroExtUtil.getUser().getId());
                itLineCompanyService.insert(lineCompany);
            }
        }