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


@@ -2,21 +2,20 @@




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


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


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


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


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


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 com.stylefeng.guns.modular.system.model.TFeedback;


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


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




import java.util.Date;


import java.util.Map;


@@ -106,7 +105,7 @@


            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(tFeedbackService.getFeedbackList(page,beginTime,endTime,2,driverName,driverPhone,state));


@@ -131,7 +130,7 @@


            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(tFeedbackService.getFeedbackList(page,beginTime,endTime,1,userName,userPhone,state));


@@ -149,7 +148,7 @@


        if (SinataUtil.isNotEmpty(tFeedback)){


            tFeedback.setCldate(new Date());


            tFeedback.setRemark(remark);


            tFeedback.setHandleUserId(ShiroKit.getUser().getId());


            tFeedback.setHandleUserId(ShiroExtUtil.getUser().getId());


            tFeedback.setState(2);


            tFeedbackService.updateById(tFeedback);