代码提交

liusheng

2024-03-20 4c95b4e5fee50a03c8ba964264ea3ef163e7805b

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

@@ -6,12 +6,14 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.BaseOrganization;
import com.ruoyi.project.service.IBaseOrganizationService;
import com.ruoyi.web.controller.common.OnlyValueCommon;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +27,7 @@
 * @author ruoyi
 * @date 2021-11-05
 */
@Slf4j
@Api("机构信息管理")
@RestController
@RequestMapping("/project/organization")
@@ -42,6 +45,7 @@
    //@PreAuthorize("@ss.hasPermi('project:organization:list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseOrganization baseOrganization) {
        log.info("获取机构列表{}：", baseOrganization);
        startPage();
        List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
        return getDataTable(list);
@@ -55,6 +59,7 @@
    @Log(title = "机构管理", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseOrganization baseOrganization) {
        log.info("导出机构信息{}：", baseOrganization);
        List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
        ExcelUtil<BaseOrganization> util = new ExcelUtil<BaseOrganization>(BaseOrganization.class);
        return util.exportExcel(list, "机构管理数据");
@@ -67,6 +72,7 @@
    //@PreAuthorize("@ss.hasPermi('project:organization:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取机构管理详细信息{}：", id);
        return AjaxResult.success(baseOrganizationService.getById(id));
    }

@@ -76,13 +82,28 @@
    @ApiOperation("新增机构信息")
    //@PreAuthorize("@ss.hasPermi('project:organization:add')")
    @Log(title = "机构管理", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
        String organization = onlyValueCommon.addOnlyValue("organization");
        //"0"+地市编码+医院类型+序号
        baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
        return toAjax(baseOrganizationService.save(baseOrganization));
        log.info("新增机构信息{}：", baseOrganization);
        //"0"+地市编码+医院类型
        String str = "0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature();
        String maxOrganizationID = baseOrganizationService.getMaxOrganizationID(str + "__");
        if (StringUtils.isNotBlank(maxOrganizationID)) {
            String result = maxOrganizationID.substring(str.length());
            //获取序号，+1，生成新的序号
            int xh = Integer.valueOf(result) + 1;
            if (String.valueOf(xh).length() > 1) {
                baseOrganization.setOrganizationid(str + xh);
            } else {
                baseOrganization.setOrganizationid(str + "0" + xh);
            }
        } else {
            baseOrganization.setOrganizationid(str + str + "01");
        }
        boolean save = baseOrganizationService.save(baseOrganization);
        log.info("新增机构信息baseOrganization的ID{}：", baseOrganization.getId());
        return AjaxResult.success(baseOrganization);
    }

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

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