Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-01 2dc478231fd09a88a4d86d44388ae807aca08bc5

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

@@ -47,8 +47,8 @@
     * @param query
     * @return
     */
    @PostMapping("/hospital/page")
    @ApiOperation(value = "转运记录分页列表")
    @PostMapping("/hospital/page")
    public R<PageDTO<MwCheckoutRecordVO>> pageList(@Valid @RequestBody CheckoutRecordQuery query) {
        return R.ok(mwCheckoutRecordService.pageHospitalTransitList(query));
    }
@@ -59,8 +59,8 @@
     * @param query
     * @param response
     */
    @PostMapping("/hospital/export")
    @ApiOperation("转运记录导出")
    @PostMapping("/hospital/export")
    public void checkoutRecordExport(@RequestBody CheckoutRecordQuery query, HttpServletResponse response) {
        try {
            mwCheckoutRecordService.checkoutRecordExport(query, response);
@@ -74,8 +74,8 @@
     * @param departmentId
     * @return
     */
    @GetMapping("/hospital/detail/{departmentId}")
    @ApiOperation(value = "转运记录详情")
    @GetMapping("/hospital/detail/{departmentId}")
    public R<MwCheckoutRecordVO> hospitalDetail(@ApiParam(name = "id", value = "医院id", required = true) @PathVariable("departmentId") Long departmentId) {
        return R.ok(mwCheckoutRecordService.hospitalDetail(departmentId));
    }
@@ -86,8 +86,8 @@
     * @param query
     * @return
     */
    @PostMapping("/hospital/detailPage")
    @ApiOperation(value = "转运记录医废详情分页列表")
    @PostMapping("/hospital/detailPage")
    public R<PageDTO<MwMedicalWasteBoxVO>> hospitalDetailPage(@Valid @RequestBody MwCheckoutRecordItemQuery query) {
        return R.ok(mwCheckoutRecordService.hospitalDetailPage(query));
    }
@@ -98,8 +98,8 @@
     * @param query
     * @return
     */
    @PostMapping("/transit/page")
    @ApiOperation(value = "运输记录分页列表")
    @PostMapping("/transit/page")
    public R<PageDTO<MwTransitRecordVO>> transitPageList(@Valid @RequestBody MwTransitRecordQuery query) {
        return R.ok(mwCheckoutRecordService.transitPageList(query));
    }
@@ -110,8 +110,8 @@
     * @param id
     * @return
     */
    @GetMapping("/transit/detail/{id}")
    @ApiOperation("运输记录详情")
    @GetMapping("/transit/detail/{id}")
    public R<MwTransitRecordVO> transitDetail(@ApiParam(name = "id", value = "运输记录id", required = true) @PathVariable("id") Long id) {
        return R.ok(mwCheckoutRecordService.transitDetail(id));
    }
@@ -122,8 +122,8 @@
     * @param query
     * @return
     */
    @PostMapping("/transit/detailPage")
    @ApiOperation("运输记录详情分页列表")
    @PostMapping("/transit/detailPage")
    public R<PageDTO<MwMedicalWasteBoxVO>> transitDetailPage(@Valid @RequestBody MwTransitRecordQuery query) {
        return R.ok(mwCheckoutRecordService.transitDetailPageList(query));
    }