fix:查询异常

auc/src/main/java/cn/hobbystocks/auc/web/DiamondPositionController.java

@@ -9,6 +9,7 @@ import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.user.UserInfo;
 import cn.hobbystocks.auc.common.user.UserUtils;
 import cn.hobbystocks.auc.common.utils.DateUtils;
+import cn.hobbystocks.auc.convert.DiamondPositionConvert;
 import cn.hobbystocks.auc.domain.DiamondPosition;
 import cn.hobbystocks.auc.request.DiamondPositionPageRequest;
 import cn.hobbystocks.auc.request.DiamondPositionQueryRequest;
@@ -40,9 +41,9 @@ public class DiamondPositionController extends AdminBaseController {
     IDiamondPositionService diamondPositionService;
 
     /**
-     * 查询金刚位列表
+     * 分页查询金刚位列表
      */
-    @ApiOperation(value = "查询金刚位列表", notes = "分页查询金刚位列表", response = DiamondPositionResponse.class, responseContainer = "List<DiamondPositionResponse>")
+    @ApiOperation(value = "分页查询金刚位列表", notes = "分页查询金刚位列表", response = DiamondPositionResponse.class, responseContainer = "List<DiamondPositionResponse>")
     @PostMapping("/page")
     public AjaxResult page(@RequestBody DiamondPositionPageRequest request) {
 //        UserInfo userInfo = UserUtils.getSimpleUserInfo();
@@ -72,16 +73,14 @@ public class DiamondPositionController extends AdminBaseController {
         if (diamondPosition == null) {
             return AjaxResult.error("金刚位不存在");
         }
-
-        DiamondPositionResponse response = new DiamondPositionResponse();
-        BeanUtils.copyProperties(diamondPosition, response);
-        return AjaxResult.success(response);
+        DiamondPositionResponse diamondPositionResponse = DiamondPositionConvert.INSTANCE.toDiamondPositionResponse(diamondPosition);
+        return AjaxResult.success(diamondPositionResponse);
     }
 
     /**
      * 新增金刚位\修改金刚位
      */
-    @ApiOperation(value = "新增金刚位", notes = "新增金刚位", response = AjaxResult.class)
+    @ApiOperation(value = "新增金刚位/修改金刚位", notes = "新增金刚位", response = AjaxResult.class)
     @PostMapping("/saveOrUpdate")
     public AjaxResult saveOrUpdate(@RequestBody DiamondPositionSaveRequest request) {
 //        UserInfo userInfo = UserUtils.getSimpleUserInfo();

lot/pom.xml

@@ -209,5 +209,20 @@
 			<version>3.3.2</version>
 		</dependency>
 
+		<!-- MapStruct核心依赖 -->
+		<dependency>
+			<groupId>org.mapstruct</groupId>
+			<artifactId>mapstruct</artifactId>
+			<version>1.5.5.Final</version>
+		</dependency>
+		<!-- MapStruct注解处理器 必须加，核心！编译期生成代码 -->
+		<dependency>
+			<groupId>org.mapstruct</groupId>
+			<artifactId>mapstruct-processor</artifactId>
+			<version>1.5.5.Final</version>
+			<scope>provided</scope>
+		</dependency>
+
+
 	</dependencies>
 </project>

lot/src/main/java/cn/hobbystocks/auc/convert/DiamondPositionConvert.java

@@ -0,0 +1,27 @@
+package cn.hobbystocks.auc.convert;
+
+
+import cn.hobbystocks.auc.domain.DiamondPosition;
+import cn.hobbystocks.auc.response.DiamondPositionResponse;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+
+/**
+ * 金刚位转换器
+ *
+ * @author: gengjintao
+ * @date: 2026/01/20
+ */
+@Mapper
+public interface DiamondPositionConvert {
+
+    DiamondPositionConvert INSTANCE = Mappers.getMapper(DiamondPositionConvert.class);
+
+
+
+    DiamondPositionResponse toDiamondPositionResponse(DiamondPosition po);
+
+
+
+}

lot/src/main/java/cn/hobbystocks/auc/service/impl/DiamondPositionServiceImpl.java

@@ -3,6 +3,7 @@ package cn.hobbystocks.auc.service.impl;
 import cn.hobbystocks.auc.common.constant.Constants;
 import cn.hobbystocks.auc.common.core.domain.AjaxResult;
 import cn.hobbystocks.auc.common.utils.DateUtils;
+import cn.hobbystocks.auc.convert.DiamondPositionConvert;
 import cn.hobbystocks.auc.domain.DiamondPosition;
 import cn.hobbystocks.auc.domain.Lot;
 import cn.hobbystocks.auc.mapper.DiamondPositionMapper;
@@ -23,6 +24,7 @@ import org.springframework.stereotype.Service;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -41,8 +43,8 @@ public class DiamondPositionServiceImpl extends ServiceImpl<DiamondPositionMappe
 
         IPage<DiamondPosition> diamondPositionIPage =new Page<>(request.getPageNum(),request.getPageSize());
         List<DiamondPosition> diamondPositions = diamondPositionMapper.selectDiamondPositionList(diamondPositionIPage, request);
-
-        return Lists.newArrayList();
+        List<DiamondPositionResponse> collect = diamondPositions.stream().map(DiamondPositionConvert.INSTANCE::toDiamondPositionResponse).collect(Collectors.toList());
+        return collect;
     }
 
     @Override

lot/src/main/resources/mapper/DiamondPositionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.hobbystocks.auc.mapper.DiamondPositionMapper">
 
-    <resultMap type="cn.hobbystocks.auc.domain.DiamondPosition" id="DiamondPositionResult">
+    <resultMap type="cn.hobbystocks.auc.domain.DiamondPosition" id="BaseResultMap">
         <id     property="id"                   column="id"                   />
         <result property="name"                 column="name"                 />
         <result property="iconUrl"              column="icon_url"             />
@@ -24,43 +24,37 @@
         <result property="sort"                 column="sort"                 />
     </resultMap>
 
-    <sql id="selectDiamondPositionVo">
-        select id, name, icon_url, type, jump_url, jump_params, description, 
-               business_module, version, status, remark, create_user, create_time, 
+    <sql id="baseColumnList">
+        select id, name, icon_url, type, jump_url, jump_params, description,
+               business_module, version, status, remark, create_user, create_time,
                update_user, update_time, del_flag, effective_start_time, effective_end_time, sort
         from t_diamond_position
     </sql>
 
-    <select id="selectDiamondPositionById" parameterType="Long" resultMap="DiamondPositionResult">
-        <include refid="selectDiamondPositionVo"/>
+    <select id="selectDiamondPositionById" parameterType="Long" resultMap="BaseResultMap">
+        <include refid="baseColumnList"/>
         where id = #{id} and del_flag = 0
     </select>
 
-    <select id="selectDiamondPositionList" resultMap="DiamondPositionResult">
-        <include refid="selectDiamondPositionVo"/>
+    <select id="selectDiamondPositionList" parameterType="cn.hobbystocks.auc.domain.DiamondPosition" resultMap="BaseResultMap">
+        <include refid="baseColumnList"/>
         <where>
             del_flag = 0
-            <if test="diamondPosition.name != null and diamondPosition.name != ''">
-                AND name like concat('%', #{diamondPosition.name}, '%')
+            <if test="request.name != null and diamondPosition.request != ''">
+                AND name like concat('%', #{request.name}, '%')
             </if>
-            <if test="diamondPosition.type != null and diamondPosition.type != ''">
-                AND type = #{diamondPosition.type}
+            <if test="request.type != null and request.type != ''">
+                AND type = #{request.type}
             </if>
-            <if test="diamondPosition.businessModule != null and diamondPosition.businessModule != ''">
-                AND business_module = #{diamondPosition.businessModule}
-            </if>
-            <if test="diamondPosition.version != null and diamondPosition.version != ''">
-                AND version = #{diamondPosition.version}
-            </if>
-            <if test="diamondPosition.status != null">
-                AND status = #{diamondPosition.status}
+            <if test="request.status != null">
+                AND status = #{request.status}
             </if>
         </where>
         order by sort asc, create_time desc
     </select>
 
-    <select id="selectActiveDiamondPositions" resultMap="DiamondPositionResult">
-        <include refid="selectDiamondPositionVo"/>
+    <select id="selectActiveDiamondPositions" resultMap="BaseResultMap">
+        <include refid="baseColumnList"/>
         <where>
             del_flag = 0
             AND status = 1
@@ -147,4 +141,4 @@
         where id = #{id}
     </update>
 
-</mapper>
+</mapper>