From 48bfcb11f48a0be3b7d9e3fe52d220bb17763c3a Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 03 十二月 2025 18:12:08 +0800
Subject: [PATCH] 产品明细优化
---
src/main/java/com/ruoyi/procurementrecord/service/impl/ProductDetailsServiceImpl.java | 10 ++++------
src/main/resources/mapper/procurementrecord/ProductDetailsMapper.xml | 22 ++++++++++++++++++++++
src/main/java/com/ruoyi/procurementrecord/controller/ProductDetailsController.java | 5 ++---
src/main/java/com/ruoyi/procurementrecord/pojo/ProductDetails.java | 5 ++---
4 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProductDetailsController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProductDetailsController.java
index 3560a3e..87a44f4 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProductDetailsController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProductDetailsController.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.procurementrecord.pojo.ProductDetails;
-import com.ruoyi.procurementrecord.pojo.ReturnManagement;
import com.ruoyi.procurementrecord.service.IProductDetailsService;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -35,9 +34,9 @@
}
- @DeleteMapping("/deleteByIds")
+ @DeleteMapping("/deleteByIds/{ids}")
@ApiOperation("浜у搧鍒犻櫎")
- public AjaxResult deleteByIds(@RequestParam List<Long> ids) {
+ public AjaxResult deleteByIds(@PathVariable("ids") List<Long> ids) {
boolean b = productDetailsService.deleteByIds(ids);
return AjaxResult.success(b);
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProductDetails.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProductDetails.java
index 345a65d..0be82ce 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProductDetails.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProductDetails.java
@@ -2,12 +2,11 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProductDetailsServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProductDetailsServiceImpl.java
index 9a9b8b1..8fafc57 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProductDetailsServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProductDetailsServiceImpl.java
@@ -1,6 +1,5 @@
package com.ruoyi.procurementrecord.service.impl;
-import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,12 +8,12 @@
import com.ruoyi.procurementrecord.pojo.ProductDetails;
import com.ruoyi.procurementrecord.service.IProductDetailsService;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
-import java.util.Map;
@Service
@AllArgsConstructor
@@ -26,12 +25,11 @@
@Override
public IPage<ProductDetails> listPage(Page<ProductDetails> page, ProductDetails productDetails) {
QueryWrapper<ProductDetails> queryWrapper = new QueryWrapper<>();
-
if (productDetails != null) {
- Map<String, Object> paramMap = BeanUtil.beanToMap(productDetails, false, true);
- queryWrapper.allEq(paramMap);
+ if (StringUtils.isNotBlank(productDetails.getProductName())) {
+ queryWrapper.like("product_name", productDetails.getProductName());
+ }
}
-
return productDetailsMapper.selectPage(page, queryWrapper);
}
diff --git a/src/main/resources/mapper/procurementrecord/ProductDetailsMapper.xml b/src/main/resources/mapper/procurementrecord/ProductDetailsMapper.xml
new file mode 100644
index 0000000..2f53d92
--- /dev/null
+++ b/src/main/resources/mapper/procurementrecord/ProductDetailsMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.procurementrecord.mapper.ProductDetailsMapper">
+ <!-- TODO: add XML mappings if needed -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.procurementrecord.pojo.ProductDetails">
+ <result column="id" property="id"/>
+ <result column="product_name" property="productName"/>
+ <result column="unit_price" property="unitPrice"/>
+ <result column="product_height_cm" property="productHeightCm"/>
+ <result column="quantity_piece" property="quantityPiece"/>
+ <result column="quantity_box" property="quantityBox"/>
+ <result column="carton_spec_cm" property="cartonSpecCm"/>
+ <result column="create_time" property="createTime"/>
+ <result column="create_user" property="createUser"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="tenant_id" property="tenantId"/>
+
+ </resultMap>
+</mapper>
--
Gitblit v1.9.3