集成中台及正联功能

Pu Zhibing

7 天以前 f2530067b6cd16a87b76190cf524d2ed75bf9592

 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java

@@ -3,6 +3,7 @@
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.shiro.ShiroUser;
@@ -75,6 +76,9 @@

    @Autowired
    private ITOrderLogisticsService orderLogisticsService;

    @Autowired
    private ShiroExtUtil shiroExtUtil;



@@ -171,7 +175,7 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tReassignService.getPrivateCarReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        page.setRecords(tReassignService.getPrivateCarReassignOrderList(page,shiroExtUtil.getUser().getRoleType(),shiroExtUtil.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        return super.packForBT(page);
    }

@@ -196,7 +200,7 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tReassignService.getCrossReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        page.setRecords(tReassignService.getCrossReassignOrderList(page,shiroExtUtil.getUser().getRoleType(),shiroExtUtil.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        return super.packForBT(page);
    }

@@ -222,7 +226,7 @@
            endTime = timeArray[1];
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tReassignService.getSmallPieceLogisticsList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        page.setRecords(tReassignService.getSmallPieceLogisticsList(page,shiroExtUtil.getUser().getRoleType(),shiroExtUtil.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
        return super.packForBT(page);
    }

@@ -283,7 +287,7 @@
    @RequestMapping(value = "/opt")
    @ResponseBody
    public Object opt(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
        ShiroUser user = ShiroKit.getUser();
        ShiroUser user = shiroExtUtil.getUser();
        TReassign tReassign = tReassignService.selectById(tReassignId);
        if (1 == optType){
            tReassign.setState(5);
@@ -357,7 +361,7 @@
    public Object optCross(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
        try {
            TReassign tReassign = tReassignService.selectById(tReassignId);
            ShiroUser user = ShiroKit.getUser();
            ShiroUser user = shiroExtUtil.getUser();
            if (1 == optType){
                tReassign.setState(5);
                tReassign.setReviewer(user.getId());
@@ -494,7 +498,7 @@
    @ResponseBody
    public Object optSmall(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
        try {
            ShiroUser user = ShiroKit.getUser();
            ShiroUser user = shiroExtUtil.getUser();
            TReassign tReassign = tReassignService.selectById(tReassignId);
            if (1 == optType){
                tReassign.setState(5);