Merge branch 'master' of https://gitee.com/boymi/YiFeiNN

mitao

2025-03-27 b22f118eabab8f2f27dbd73e7c6cb1090cd82c82

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

@@ -3,10 +3,12 @@
import com.sinata.common.core.domain.R;
import com.sinata.common.entity.PageDTO;
import com.sinata.system.domain.dto.MwStagingRoomDTO;
import com.sinata.system.domain.query.CheckoutRecordQuery;
import com.sinata.system.domain.query.MwStagingRoomQuery;
import com.sinata.system.domain.query.StorageRecordQuery;
import com.sinata.system.domain.vo.MwCollectRecordVO;
import com.sinata.system.domain.vo.MwCheckoutRecordVO;
import com.sinata.system.domain.vo.MwStagingRoomVO;
import com.sinata.system.domain.vo.MwStorageRecordVO;
import com.sinata.system.service.MwStagingRoomService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +23,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;

/**
 * <p>
@@ -45,8 +49,8 @@
     * @param query
     * @return
     */
    @PostMapping("/page")
    @ApiOperation("暂存间分页列表")
    @PostMapping("/page")
    public R<PageDTO<MwStagingRoomVO>> pageList(@Valid @RequestBody MwStagingRoomQuery query) {
        return R.ok(mwStagingRoomService.pageList(query));
    }
@@ -57,8 +61,8 @@
     * @param dto
     * @return
     */
    @PostMapping("/add")
    @ApiOperation("新增暂存间")
    @PostMapping("/add")
    public R<?> add(@Valid @RequestBody MwStagingRoomDTO dto) {
        mwStagingRoomService.add(dto);
        return R.ok();
@@ -70,8 +74,8 @@
     * @param dto
     * @return
     */
    @PostMapping("/edit")
    @ApiOperation("编辑暂存间")
    @PostMapping("/edit")
    public R<?> edit(@Valid @RequestBody MwStagingRoomDTO dto) {
        mwStagingRoomService.edit(dto);
        return R.ok();
@@ -83,8 +87,8 @@
     * @param id
     * @return
     */
    @DeleteMapping("/{id}")
    @ApiOperation("删除暂存间")
    @DeleteMapping("/{id}")
    public R<?> delete(@ApiParam(name = "id", value = "暂存间id", required = true) @PathVariable("id") Long id) {
        mwStagingRoomService.removeById(id);
        return R.ok();
@@ -96,8 +100,8 @@
     * @param departmentId
     * @return
     */
    @GetMapping("/getByHospitalId/{departmentId}")
    @ApiOperation(value = "根据医院id查询暂存间", notes = "入库、出库记录暂存间筛选级联数据")
    @GetMapping("/getByHospitalId/{departmentId}")
    public R<MwStagingRoomVO> getByHospitalId(@ApiParam(name = "departmentId", value = "医院id", required = true) @PathVariable("departmentId") Long departmentId) {
        return R.ok(mwStagingRoomService.getByHospitalId(departmentId));
    }
@@ -108,9 +112,65 @@
     * @param query
     * @return
     */
    @PostMapping("/storageRecord")
    @ApiOperation("暂存间入库记录")
    public R<PageDTO<MwCollectRecordVO>> storageRecord(@Valid @RequestBody StorageRecordQuery query) {
    @PostMapping("/storageRecord")
    public R<PageDTO<MwStorageRecordVO>> storageRecord(@Valid @RequestBody StorageRecordQuery query) {
        return R.ok(mwStagingRoomService.storageRecord(query));
    }

    /**
     * 暂存间入库记录导出
     *
     * @param query
     * @param response
     */
    @ApiOperation("暂存间入库记录导出")
    @PostMapping("/storageRecord/export")
    public void storageRecordExport(@RequestBody StorageRecordQuery query, HttpServletResponse response) {
        try {
            mwStagingRoomService.storageRecordExport(query, response);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }

    /**
     * 暂存间出库记录
     *
     * @param query
     * @return
     */
    @ApiOperation("暂存间出库记录")
    @PostMapping("/checkoutRecord")
    public R<PageDTO<MwCheckoutRecordVO>> checkoutRecord(@Valid @RequestBody CheckoutRecordQuery query) {
        return R.ok(mwStagingRoomService.checkoutRecord(query));
    }

    /**
     * 暂存间出库记录导出
     *
     * @param query
     * @param response
     */
    @ApiOperation("暂存间出库记录导出")
    @PostMapping("/checkoutRecord/export")
    public void checkoutRecordExport(@RequestBody CheckoutRecordQuery query, HttpServletResponse response) {
        try {
            mwStagingRoomService.checkoutRecordExport(query, response);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
    }

    /**
     * 暂存间待处理医废分页列表
     *
     * @param query
     * @return
     */
    @ApiOperation("暂存间待处理医废分页列表")
    @PostMapping("/temporarilyStoredMedicalWaste")
    public R<PageDTO<MwStorageRecordVO>> temporarilyStoredMedicalWaste(@Valid @RequestBody StorageRecordQuery query) {
        return R.ok(mwStagingRoomService.temporarilyStoredMedicalWaste(query));
    }
}