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

@@ -89,4 +89,12 @@
    public void officialInventoryExport(HttpServletResponse response, OfficialInventoryDto officialInventoryDto) {
        officialInventoryService.officialInventoryExport(response, officialInventoryDto);
    }

    /**
     * 正式库存记录删除
     */
    @DeleteMapping("/delete")
    public R delete(@RequestBody Long[] ids) {
        return R.ok(officialInventoryService.delete(ids));
    }
}

 main-business/src/main/java/com/ruoyi/business/dto/PurchaseRegistrationDto.java

@@ -7,4 +7,8 @@
public class PurchaseRegistrationDto extends PurchaseRegistration {

    private String searchAll;

    private String startDateStr;

    private String endDateStr;
}

 main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java

@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.business.vo.OfficialInventoryVo;
import jakarta.servlet.http.HttpServletResponse;
import org.apache.ibatis.executor.BatchResult;

import java.math.BigDecimal;
import java.util.List;
@@ -37,4 +38,6 @@
    List<OfficialInventoryDto> coalBlendingList();

    void officialInventoryExport(HttpServletResponse response, OfficialInventoryDto officialInventoryDto);

    Boolean delete(Long[] ids);
}

 main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java

@@ -15,30 +15,26 @@
import com.ruoyi.basic.mapper.CoalValueMapper;
import com.ruoyi.basic.mapper.SupplyMapper;
import com.ruoyi.business.dto.OfficialInventoryDto;
import com.ruoyi.business.dto.SalesRecordDto;
import com.ruoyi.business.entity.OfficialInventory;
import com.ruoyi.business.entity.SalesRecord;
import com.ruoyi.business.mapper.OfficialInventoryMapper;
import com.ruoyi.business.service.OfficialInventoryService;
import com.ruoyi.business.utils.DynamicExcelUtil;
import com.ruoyi.business.vo.OfficialInventoryExportVo;
import com.ruoyi.business.vo.OfficialInventoryVo;
import com.ruoyi.business.vo.SalesRecordExportVo;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.mapper.SysUserMapper;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.executor.BatchResult;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.math.BigDecimal;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.stream.Collectors;

@@ -394,6 +390,15 @@
        }
    }

    @Override
    public Boolean delete(Long[] ids) {
       for (Long id : ids) {
           OfficialInventory officialInventory = officialInventoryMapper.selectById(id);
           officialInventoryMapper.deleteById(officialInventory);
       }
        return true;
    }

    private List<OfficialInventoryExportVo> convertToExportVo(List<OfficialInventory> list, List<CoalField> coalFields) {
        if (CollectionUtils.isEmpty(list)) {
            return Collections.emptyList();

 main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java

@@ -15,6 +15,7 @@
import com.ruoyi.business.mapper.PurchaseRegistrationMapper;
import com.ruoyi.business.service.PurchaseRegistrationService;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import lombok.RequiredArgsConstructor;
@@ -69,6 +70,13 @@
                }
                w.like(PurchaseRegistration::getSupplierName, keyword);
            });
            queryWrapper.and(wapper -> {
                        if (StringUtils.isEmpty(dto.getStartDateStr()) && StringUtils.isEmpty(dto.getEndDateStr())) {
                            wapper.ge(PurchaseRegistration::getRegistrationDate, DateUtils.dateTime("yyyy-MM-dd", dto.getStartDateStr()))
                            .le(PurchaseRegistration::getRegistrationDate, DateUtils.dateTime("yyyy-MM-dd", dto.getEndDateStr()));
                        }
                    }
            );
        }

        queryWrapper.orderByDesc(PurchaseRegistration::getCreateTime);