修改bug

Pu Zhibing

2 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TFeedbackController.java

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

import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;

@@ -29,15 +30,17 @@
@Controller
@RequestMapping("/tFeedback")
public class TFeedbackController extends BaseController {

    
    private String PREFIX = "/system/tFeedback/";

    
    @Autowired
    private ITFeedbackService tFeedbackService;

    
    @Autowired
    private ITSystemNoticeService tSystemNoticeService;

    @Resource
    private ShiroExtUtil shiroExtUtil;
    
    /**
     * 跳转到司机反馈管理首页
     */
@@ -45,7 +48,7 @@
    public String index() {
        return PREFIX + "tFeedback.html";
    }

    
    /**
     * 跳转到用户反馈管理首页
     */
@@ -99,13 +102,13 @@
                       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) {
        if (shiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
        } else {
            page.setRecords(tFeedbackService.getFeedbackList(page, beginTime, endTime, 2, driverName, driverPhone, state));
@@ -124,13 +127,13 @@
                           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) {
        if (shiroExtUtil.getUser().getRoleType() != 1) {
            page.setRecords(null);
        } else {
            page.setRecords(tFeedbackService.getFeedbackList(page, beginTime, endTime, 1, userName, userPhone, state));
@@ -145,18 +148,18 @@
    @ResponseBody
    public Object immediately(@RequestParam Integer id,@RequestParam String remark) {
        TFeedback tFeedback = tFeedbackService.selectById(id);
        if (SinataUtil.isNotEmpty(tFeedback)){
        if (SinataUtil.isNotEmpty(tFeedback)) {
            tFeedback.setCldate(new Date());
            tFeedback.setRemark(remark);
            tFeedback.setHandleUserId(ShiroExtUtil.getUser().getId());
            tFeedback.setHandleUserId(shiroExtUtil.getUser().getId());
            tFeedback.setState(2);
            tFeedbackService.updateById(tFeedback);

    
            //增加系统消息
            TSystemNotice notice = new TSystemNotice();
            notice.setType(2);
            notice.setUserType(tFeedback.getType());
            notice.setContent("反馈处理结果:【"+remark+"】。");
            notice.setContent("反馈处理结果:【" + remark + "】。");
            notice.setUserId(tFeedback.getUserId());
            notice.setInsertTime(new Date());
            notice.setRead(1);