Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-01 2dc478231fd09a88a4d86d44388ae807aca08bc5

 medicalWaste-admin/src/main/java/com/sinata/web/controller/backend/system/SysDictDataController.java

@@ -6,12 +6,12 @@
import com.sinata.common.core.domain.R;
import com.sinata.common.core.domain.entity.SysDictData;
import com.sinata.common.core.page.TableDataInfo;
import com.sinata.common.entity.BasePage;
import com.sinata.common.entity.PageDTO;
import com.sinata.common.enums.BusinessType;
import com.sinata.common.utils.StringUtils;
import com.sinata.common.utils.poi.ExcelUtil;
import com.sinata.system.domain.dto.SysDictDataDTO;
import com.sinata.system.domain.query.KeyWordQuery;
import com.sinata.system.domain.vo.SysDictDataVO;
import com.sinata.system.service.ISysDictDataService;
import com.sinata.system.service.ISysDictTypeService;
@@ -60,8 +60,8 @@
     */
    @ApiOperation("数据字典分页列表")
    @PostMapping("/page")
    public R<PageDTO<SysDictDataVO>> page(@Valid @RequestBody BasePage page) {
        return R.ok(dictDataService.pageList(page));
    public R<PageDTO<SysDictDataVO>> page(@Valid @RequestBody KeyWordQuery query) {
        return R.ok(dictDataService.pageList(query));
    }

    /**
@@ -88,6 +88,74 @@
        dictDataService.removeById(dictCode);
        return R.ok();
    }

    /**
     * 医废类型列表
     *
     * @return
     */
    @ApiOperation("医废类型列表")
    @GetMapping("/medicalWasteTypeList")
    public R<List<SysDictDataVO>> medicalWasteTypeList() {
        return R.ok(dictDataService.medicalWasteTypeList());
    }

    /**
     * 器具类型列表
     *
     * @return
     */
    @ApiOperation("器具类型列表")
    @GetMapping("/equipmentTypeList")
    public R<List<SysDictDataVO>> equipmentTypeList() {
        return R.ok(dictDataService.equipmentTypeList());
    }

    /**
     * 规章制度类型列表
     *
     * @return
     */
    @ApiOperation("规章制度类型列表")
    @GetMapping("/regulationsTypeList")
    public R<List<SysDictDataVO>> regulationsTypeList() {
        return R.ok(dictDataService.regulationsTypeList());
    }

    /**
     * 作业类型
     *
     * @return
     */
    @ApiOperation("作业类型")
    @GetMapping("/workTypeList")
    public R<List<SysDictDataVO>> workTypeList() {
        return R.ok(dictDataService.workTypeList());
    }

    /**
     * 医疗机构级别
     *
     * @return
     */
    @ApiOperation("医疗机构级别")
    @GetMapping("/institutionLevelList")
    public R<List<SysDictDataVO>> institutionLevelList() {
        return R.ok(dictDataService.institutionLevelList());
    }

    /**
     * 医疗机构性质
     *
     * @return
     */
    @ApiOperation("医疗机构性质")
    @GetMapping("/institutionTypeList")
    public R<List<SysDictDataVO>> institutionTypeList() {
        return R.ok(dictDataService.institutionTypeList());
    }


    @PreAuthorize("@ss.hasPermi('system:dict:list')")
    @GetMapping("/list")
    public TableDataInfo list(SysDictData dictData)