1.正式库导出优化 2.销售导出 3.设备使用状态优化 4.定时任务优化

liding

2 天以前 4c33acfe648e9b008f91c5e2cf446550e6b0174d

 main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java

@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.dto.OfficialInventoryDto;
import com.ruoyi.business.dto.SalesRecordDto;
import com.ruoyi.business.entity.OfficialInventory;
import com.ruoyi.business.service.OfficialInventoryService;
import com.ruoyi.business.vo.OfficialInventoryVo;
import com.ruoyi.common.core.domain.R;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import java.util.List;
@@ -23,6 +26,7 @@

@RestController
@AllArgsConstructor
@Slf4j
@RequestMapping("/officialInventory")
public class OfficialInventoryController {

@@ -32,7 +36,7 @@
     * 正式库库表查询
     */
    @GetMapping("/list")
    public R<IPage<OfficialInventoryDto>> list(Page page, OfficialInventoryDto officialInventoryDto) {
    public R<IPage<OfficialInventoryDto>> list(Page<OfficialInventory> page, OfficialInventoryDto officialInventoryDto) {
        IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page, officialInventoryDto);
        return R.ok(list);
    }
@@ -61,6 +65,7 @@
        return R.ok(officialInventoryService.editOfficial(officialInventoryDto));
    }


    /**
     * 合并
     */
@@ -69,4 +74,19 @@
        return R.ok(officialInventoryService.mergeAll(officialInventoryDto));
    }

    /**
     * 配煤计算器选择list
     */
    @GetMapping("/coalBlendingList")
    public R<List<OfficialInventoryDto>> coalBlendingList() {
        return R.ok(officialInventoryService.coalBlendingList());
    }

    /**
     * 正式库记录表导出
     */
    @PostMapping("/export")
    public void officialInventoryExport(HttpServletResponse response, OfficialInventoryDto officialInventoryDto) {
        officialInventoryService.officialInventoryExport(response, officialInventoryDto);
    }
}