修改流程代码提交

liusheng

2024-02-22 d5c2c0762ccbb2bb33635f99480d404f1fb10d5a

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

@@ -12,6 +12,7 @@
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 +26,7 @@
 * @author ruoyi
 * @date 2021-11-05
 */
@Slf4j
@Api("机构信息管理")
@RestController
@RequestMapping("/project/organization")
@@ -42,6 +44,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 +58,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 +71,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 +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);
        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);
    }

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

@@ -105,6 +115,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)));
    }