人员组织树问题修改

zhuo

2025-03-13 657fc596ddabb0aa9cf1fd81d3dfc85c377d0884

人员组织树问题修改

 cnas-personnel/src/main/java/com/ruoyi/personnel/controller/PersonBasicInfoController.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.DepartmentDto;
import com.ruoyi.common.core.domain.entity.DepartmentLims;
import com.ruoyi.common.utils.FileSaveUtil;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.personnel.dto.PersonBasicInfoDetailsDto;
@@ -226,4 +227,17 @@
    public Result updateBasicInfoWorkList(@RequestBody PersonBasicInfoWork basicInfoWork){
        return Result.success(personBasicInfoWorkService.updateById(basicInfoWork));
    }


    @ApiOperation(value = "添加组织架构")
    @PostMapping("/addDepartmentLims")
    public Result addDepartmentLims(@RequestBody DepartmentLims department) {
        return Result.success(personBasicInfoService.addDepartment(department));
    }

    @ApiOperation(value = "删除组织架构")
    @DeleteMapping("/delDepartmentLims")
    public Result delDepartmentLims(Integer id) {
        return Result.success(personBasicInfoService.delDepartment(id));
    }
}

 cnas-personnel/src/main/java/com/ruoyi/personnel/service/PersonBasicInfoService.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.DepartmentDto;
import com.ruoyi.common.core.domain.entity.DepartmentLims;
import com.ruoyi.personnel.dto.PersonBasicInfoDto;
import com.ruoyi.personnel.dto.UserPageDto;
import com.ruoyi.personnel.pojo.PersonBasicInfo;
@@ -42,4 +43,18 @@
     * @return
     */
    boolean uploadBasicInfoFile(Integer basicInfoId, MultipartFile file);

    /**
     * 添加组织架构
     * @param department
     * @return
     */
    int addDepartment(DepartmentLims department);

    /**
     * 删除组织架构
     * @param id
     * @return
     */
    boolean delDepartment(Integer id);
}

 cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonBasicInfoServiceImpl.java

@@ -70,6 +70,7 @@

    @Autowired
    private DepartmentLimsMapper departmentMapper;

    @Value("${file.path}")
    private String imgUrl;
    @Value("${wordUrl}")
@@ -301,6 +302,47 @@
    }

    /**
     * 新增组织树
     * @param department
     * @return
     */
    @Override
    public int addDepartment(DepartmentLims department) {
        departmentMapper.insert(department);
        return department.getId();
    }

    /**
     * 删除组织树
     * @param id
     * @return
     */
    @Override
    public boolean delDepartment(Integer id) {
        //判断是否有子类,直到没有为止
        List<DepartmentLims> department = getDepartment(id);
        List<Integer> ids = department.stream().map(DepartmentLims::getId).collect(Collectors.toList());
        departmentMapper.delete(Wrappers.<DepartmentLims>lambdaQuery()
                .in(DepartmentLims::getId, ids));
        return true;
    }

    //判断是否有子类,直到没有为止
    public List<DepartmentLims> getDepartment(Integer id) {
        List<DepartmentLims> list = new ArrayList<>();
        DepartmentLims depart = departmentMapper.selectById(id);
        list.add(depart);
        List<DepartmentLims> departments = departmentMapper.selectList(Wrappers.<DepartmentLims>lambdaQuery().eq(DepartmentLims::getFatherId, id));
        if (ObjectUtils.isNotEmpty(departments)) {
            list.addAll(departments);
            for (DepartmentLims department : departments) {
                list.addAll(getDepartment(department.getId()));
            }
        }
        return list;
    }

    /**
     * 递归查询子节点
     * @param root  根节点
     * @param all   所有节点

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InformationNotificationController.java

@@ -37,4 +37,18 @@
    public Result<?> msgRoll(Page page) {
        return Result.success(informationNotificationService.msgRoll(page));
    }

    @ApiOperation(value = "消息通知-点击详情触发修改状态为已读")
    @PostMapping("triggerModificationStatusToRead/{id}")
    public Result<?> triggerModificationStatusToRead(@PathVariable("id") Integer id) {
        informationNotificationService.triggerModificationStatusToRead(id);
        return Result.success();
    }

    @ApiOperation(value = "消息通知-标记所有信息为已读/删除所有已读消息")
    @PostMapping("informationReadOrDelete/{isMarkAllInformationRead}")
    public Result<?> markAllInformationReadOrDeleteAllReadMessages(@PathVariable("isMarkAllInformationRead") Boolean isMarkAllInformationRead) {
        informationNotificationService.markAllInformationReadOrDeleteAllReadMessages(isMarkAllInformationRead);
        return Result.success();
    }
}

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderRatesController.java

@@ -50,8 +50,8 @@
     */
    @ApiOperation(value = "查询订单费用详情")
    @GetMapping("/selectRatesDetail")
    public Result selectRatesDetail(Integer insOrderId) {
        return Result.success(insOrderRatesService.list(Wrappers.<InsOrderRates>lambdaQuery()
    public Result selectRatesDetail(Page page, Integer insOrderId) {
        return Result.success(insOrderRatesService.page(page, Wrappers.<InsOrderRates>lambdaQuery()
                .eq(InsOrderRates::getInsOrderId, insOrderId)));
    }