liyong
2026-01-26 8d258e0b07b94dc7c4b1cc9cadfbf132d6f05b8e
feat(purchase): 添加采购登记日期范围查询功能
已修改3个文件
14 ■■■■■ 文件已修改
main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
main-business/src/main/java/com/ruoyi/business/dto/PurchaseRegistrationDto.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java
@@ -93,7 +93,7 @@
    /**
     * 正式库存记录删除
     */
    @DeleteMapping("/delete/")
    @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/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);