#

LSH

2023-11-10 2a08b97f0aad3af5d981a722efb218fb201f821f

 src/main/java/com/zy/crm/manager/controller/BusinessTripController.java

@@ -56,7 +56,7 @@
        EntityWrapper<BusinessTrip> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
//        wrapper.or().eq("member_id",getUserId());
        wrapper.or().eq("member_id",getUserId());
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(businessTripService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -92,7 +92,13 @@
            }
        }
        if (!signUserId && !signDeptId){
            wrapper.eq("user_id", getUserId());
            if (getRole().getId()==1){
                wrapper.or().eq("host_id",1);
            }else if (getRole().getId()==2){
                wrapper.eq("dept_id",getDeptId());
            }else {
                wrapper.eq("user_id", getUserId());
            }
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
@@ -100,7 +106,7 @@
    }

    @RequestMapping(value = "/businessTrip/add/auth")
    @ManagerAuth
    @ManagerAuth(memo = "添加出差申请")
    public R add(BusinessTrip businessTrip) {
        if (Cools.isEmpty(businessTrip)){
            return R.error();
@@ -142,16 +148,23 @@
        businessTrip.setStatus(0);
        businessTrip.setSettle(1);

        User manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        User manager = new User();
        try{
            manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
        }catch (Exception e){
            manager = getUser();
        }

        businessTrip.setSettleMsg(JSON.toJSONString(SettleDto.initBusiness(manager,getUser())));

        businessTrip.setMemberId(manager.getId());

        businessTripService.insert(businessTrip);
        return R.ok();
    }

   @RequestMapping(value = "/businessTrip/update/auth")
   @ManagerAuth
   @ManagerAuth(memo = "更新出差申请")
    public R update(BusinessTrip businessTrip){
        if (Cools.isEmpty(businessTrip) || null==businessTrip.getId()){
            return R.error();
@@ -189,7 +202,7 @@
    }

    @RequestMapping(value = "/businessTrip/delete/auth")
    @ManagerAuth
    @ManagerAuth(memo = "删除出差申请")
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            businessTripService.deleteById(id);
@@ -245,7 +258,12 @@
            case 1:
                // 本部门经理审核
                User user = userService.selectById(businessTrip.getUserId());
                User manager = userService.getDeptManager(getHostId(), user.getDeptId());
                User manager = new User();
                try{
                    manager = userService.getDeptManager(getHostId(), getUser().getDeptId());        // 获取部门领导
                }catch (Exception e){
                    manager = user;
                }
                if (manager.getId().equals(getUserId())) {

                    // 修改 settle 步骤数据
@@ -268,8 +286,10 @@

                    // 修改规划单状态
                    businessTrip.setSettle(2);  // 申请通过
                    businessTrip.setStatus(1);
                    businessTrip.setUpdateId(getUserId());
                    businessTrip.setUpdateTime(now);
                    businessTrip.setMemberId(businessTrip.getUserId());
                    if (!businessTripService.updateById(businessTrip)) {
                        throw new CoolException("审核失败，请联系管理员");
                    }