代码提交

liusheng

2024-02-29 90c52bfb0f6f1092917277c6aeb0b00e428d0c47

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java

@@ -44,7 +44,7 @@
    //@PreAuthorize("@ss.hasPermi('project:organization:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseOrganization baseOrganization) {
        log.info("获取机构列表{}：" , baseOrganization);
        log.info("获取机构列表{}：", baseOrganization);
        startPage();
        List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
        return getDataTable(list);
@@ -58,7 +58,7 @@
    @Log(title = "机构管理", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseOrganization baseOrganization) {
        log.info("导出机构信息{}：" , baseOrganization);
        log.info("导出机构信息{}：", baseOrganization);
        List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
        ExcelUtil<BaseOrganization> util = new ExcelUtil<BaseOrganization>(BaseOrganization.class);
        return util.exportExcel(list, "机构管理数据");
@@ -71,7 +71,7 @@
    //@PreAuthorize("@ss.hasPermi('project:organization:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取机构管理详细信息{}：" , id);
        log.info("获取机构管理详细信息{}：", id);
        return AjaxResult.success(baseOrganizationService.getById(id));
    }

@@ -81,14 +81,17 @@
    @ApiOperation("新增机构信息")
    //@PreAuthorize("@ss.hasPermi('project:organization:add')")
    @Log(title = "机构管理", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
        log.info("新增机构信息{}：" , baseOrganization);
        log.info("新增机构信息{}：", baseOrganization);
        String organization = onlyValueCommon.addOnlyValue("organization");
        //"0"+地市编码+医院类型+序号
        baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
        return toAjax(baseOrganizationService.save(baseOrganization));

        boolean save = baseOrganizationService.save(baseOrganization);
        log.info("新增机构信息baseOrganization的ID{}：", baseOrganization.getId());
        return AjaxResult.success(baseOrganization);
    }

    /**
@@ -100,7 +103,7 @@
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody BaseOrganization baseOrganization) {
        log.info("修改机构信息{}：" , baseOrganization);
        log.info("修改机构信息{}：", baseOrganization);
        return toAjax(baseOrganizationService.updateById(baseOrganization));
    }

@@ -112,7 +115,7 @@
    @Log(title = "机构管理", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        log.info("删除机构信息{}：" , ids);
        log.info("删除机构信息{}：", ids);
        return toAjax(baseOrganizationService.removeByIds(Arrays.asList(ids)));
    }