From 388bd216d4eb70b367ada95118d1087b45f07ae3 Mon Sep 17 00:00:00 2001 From: liding <756868258@qq.com> Date: 星期一, 09 六月 2025 17:53:48 +0800 Subject: [PATCH] 1.煤质部分 2.代入库部分 --- main-business/src/main/java/com/ruoyi/business/service/impl/PendingInventoryServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/PendingInventoryServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/PendingInventoryServiceImpl.java index 820e71a..ac74173 100644 --- a/main-business/src/main/java/com/ruoyi/business/service/impl/PendingInventoryServiceImpl.java +++ b/main-business/src/main/java/com/ruoyi/business/service/impl/PendingInventoryServiceImpl.java @@ -1,11 +1,21 @@ package com.ruoyi.business.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.basic.mapper.CoalFieldMapper; +import com.ruoyi.basic.mapper.CoalValueMapper; +import com.ruoyi.business.dto.PendingInventoryDto; import com.ruoyi.business.entity.PendingInventory; import com.ruoyi.business.mapper.PendingInventoryMapper; import com.ruoyi.business.service.PendingInventoryService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; +import com.ruoyi.common.utils.bean.BeanUtils; import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Objects; /** * <p> @@ -19,4 +29,41 @@ @RequiredArgsConstructor public class PendingInventoryServiceImpl extends ServiceImpl<PendingInventoryMapper, PendingInventory> implements PendingInventoryService { + private final PendingInventoryMapper pendingInventoryMapper; + + private final CoalValueMapper coalValueMapper; + + private final CoalFieldMapper coalFieldMapper; + + @Override + public IPage<PendingInventory> selectPendingInventoryList(Page page, PendingInventoryDto pendingInventoryDto) { + LambdaQueryWrapper<PendingInventory> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.orderByDesc(PendingInventory::getCreateTime); + return pendingInventoryMapper.selectPage(page, queryWrapper); + } + + @Override + public int addOrEditPending(PendingInventoryDto pendingInventoryDto) { + PendingInventory pendingInventory = new PendingInventory(); + BeanUtils.copyProperties(pendingInventoryDto, pendingInventory); + if (Objects.isNull(pendingInventoryDto.getId())) { + return pendingInventoryMapper.insert(pendingInventory); + } else { + return pendingInventoryMapper.updateById(pendingInventory); + } + } + + @Override + public int delByIds(Long[] ids) { + // 妫�鏌ュ弬鏁� + if (ids == null || ids.length == 0) { + return 0; + } + // 鏋勯�犳洿鏂版潯浠� + UpdateWrapper<PendingInventory> updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", ids) + .set("deleted", 1); // 璁剧疆 deleted 涓� 1 琛ㄧず宸插垹闄� + // 鎵ц鎵归噺閫昏緫鍒犻櫎 + return pendingInventoryMapper.update(null, updateWrapper); + } } -- Gitblit v1.9.3