crm

xuhy

2025-09-05 47b3dc73a5b9274815a3e3fa631ad911453c84ad

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TCrmBranchController.java

@@ -41,13 +41,15 @@
    private final TCrmBranchSalaryService crmBranchSalaryService;
    private final ISysUserService sysUserService;
    private final TCrmChangePointsService crmChangePointsService;
    private final TCrmPositionService crmPositionService;
    @Autowired
    public TCrmBranchController(TCrmBranchService crmBranchService, TCrmBranchAreaService crmBranchAreaService, TCrmBranchSalaryService crmBranchSalaryService, ISysUserService sysUserService, TCrmChangePointsService crmChangePointsService) {
    public TCrmBranchController(TCrmBranchService crmBranchService, TCrmBranchAreaService crmBranchAreaService, TCrmBranchSalaryService crmBranchSalaryService, ISysUserService sysUserService, TCrmChangePointsService crmChangePointsService, TCrmPositionService crmPositionService) {
        this.crmBranchService = crmBranchService;
        this.crmBranchAreaService = crmBranchAreaService;
        this.crmBranchSalaryService = crmBranchSalaryService;
        this.sysUserService = sysUserService;
        this.crmChangePointsService = crmChangePointsService;
        this.crmPositionService = crmPositionService;
    }

    /**
@@ -65,7 +67,9 @@
    @ApiOperation(value = "获取crm分公司管理列表")
    @PostMapping(value = "/list")
    public R<List<TCrmBranch>> list() {
        return R.ok(crmBranchService.list(Wrappers.lambdaQuery(TCrmBranch.class).orderByDesc(TCrmBranch::getCreateTime)));
        return R.ok(crmBranchService.list(Wrappers.lambdaQuery(TCrmBranch.class)
                .eq(TCrmBranch::getStatus,1)
                .orderByDesc(TCrmBranch::getCreateTime)));
    }

    /**
@@ -101,7 +105,11 @@
        List<TCrmBranchArea> crmBranchAreas = crmBranchAreaService.list(Wrappers.lambdaQuery(TCrmBranchArea.class).eq(TCrmBranchArea::getBranchId, id));
        crmBranchVO.setCrmBranchAreas(crmBranchAreas);
        // 职位薪资
        List<TCrmPosition> crmPositions = crmPositionService.list();
        List<TCrmBranchSalary> crmBranchSalaries = crmBranchSalaryService.list(Wrappers.lambdaQuery(TCrmBranchSalary.class).eq(TCrmBranchSalary::getBranchId, id));
        for (TCrmBranchSalary crmBranchSalary : crmBranchSalaries) {
            crmPositions.stream().filter(crmPosition -> Objects.equals(crmPosition.getId(), crmBranchSalary.getPositionId())).findFirst().ifPresent(crmPosition -> crmBranchSalary.setPositionName(crmPosition.getPositionName()));
        }
        crmBranchVO.setCrmBranchSalaries(crmBranchSalaries);
        return R.ok(crmBranchVO);
    }
@@ -144,8 +152,8 @@
    /**
     * 批量删除crm分公司管理
     */
    @Log(title = "crm分公司管理信息-分公司管理解冻冻结", businessType = BusinessType.DELETE)
    @ApiOperation(value = "分公司管理解冻冻结")
    @Log(title = "crm分公司管理信息-分公司管理解冻冻结", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "分公司管理解冻冻结",notes = "状态 1=使用中 2=冻结")
    @PutMapping(value = "/thawOrFreeze")
    public R<Boolean> thawOrFreeze(@RequestParam(value = "id")String id,
                                   @RequestParam(value = "status")Integer status) {