1.数据优化 2.配煤计算器入库优化

liding

2 天以前 6733a32d4bcd7ad3ec3f109da0f3d2524766f7bb

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

@@ -3,6 +3,7 @@
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.entity.OfficialInventory;
import com.ruoyi.business.service.OfficialInventoryService;
import com.ruoyi.business.vo.OfficialInventoryVo;
import com.ruoyi.common.core.domain.R;
@@ -31,7 +32,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);
    }
@@ -39,9 +40,17 @@
    /**
     * 正式库煤种部分信息list
     */
    @GetMapping("/OfficialList")
    @GetMapping("/officialList")
    public R<List<OfficialInventoryVo>> officialList(OfficialInventoryVo officialInventoryVo) {
        return R.ok(officialInventoryService.selectOfficialList(officialInventoryVo));
    }

    /**
     * 正式库煤种生产加工选择list
     */
    @GetMapping("/officialAll")
    public R<List<OfficialInventory>> officialAll() {
        return R.ok(officialInventoryService.selectOfficialAll());
    }

    /**
@@ -60,4 +69,11 @@
        return R.ok(officialInventoryService.mergeAll(officialInventoryDto));
    }

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