Pu Zhibing
3 天以前 25cf266e99714ac5d428e66b40ce272325c91dd8
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/SpendingDetailPlatformController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
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.DateUtil;
@@ -1091,7 +1092,7 @@
     */
    @RequestMapping(value = "/detail/{driverId}")
    public String detail(@PathVariable Integer driverId, Model model){
        Map<String, Object> map = driverService.selectMap(new EntityWrapper<TDriver>().eq("id",driverId).eq("companyId", ShiroKit.getUser().getObjectId()));
        Map<String, Object> map = driverService.selectMap(new EntityWrapper<TDriver>().eq("id", driverId).eq("companyId", ShiroExtUtil.getUser().getObjectId()));
        double activityIncome;
        Wrapper wrapper1 = new EntityWrapper<Income>().eq("userType",2).eq("objectId",driverId).eq("type",1);
@@ -1195,7 +1196,7 @@
    @ResponseBody
    public Object list(String driverName, String driverPhone, String startTime, String endTime) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        Wrapper wrapper = new EntityWrapper<TDriver>().eq("companyId", ShiroKit.getUser().getObjectId()).orderBy("id", false);
        Wrapper wrapper = new EntityWrapper<TDriver>().eq("companyId", ShiroExtUtil.getUser().getObjectId()).orderBy("id", false);
        if (ToolUtil.isNotEmpty(driverName)) {
            wrapper.like("name", driverName);