整理码库查询详情的返回数据

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrPackageBatchVO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author Eurus
  * @date 2021/5/19 20:39
@@ -11,7 +13,7 @@ import lombok.Data;
  */
 @Data
 @ApiModel
-public class QrPackageBatchVO {
+public class QrPackageBatchVO implements Serializable {
 
     @ApiModelProperty(value = "码包批次id")
     private Long id;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrRepertoryColumnVO.java

@@ -24,7 +24,10 @@ public class QrRepertoryColumnVO {
 	@ApiModelProperty("码格式id")
 	private Long qrFormatId;
 
-	/** 码格式 */
+	@ApiModelProperty("码格式名称")
+	private String qrFormatName;
+
+	@ApiModelProperty("码格式")
 	private QrFormatVO qrFormatVO;
 
 	@ApiModelProperty("克隆列 -1:未克隆 >=0:克隆了哪列，下标从0开始")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/vo/result/QrRepertoryVO.java

@@ -1,6 +1,5 @@
 package com.abi.qms.platform.dao.vo.result;
 
-import com.abi.qms.platform.dto.req.SaveQrRepertoryColumnReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetQrRepertoryColumnDetailRes.java

@@ -25,6 +25,9 @@ public class GetQrRepertoryColumnDetailRes implements Serializable {
 	@ApiModelProperty("码格式id")
 	private Long qrFormatId;
 
+	@ApiModelProperty("码格式名称")
+	private String qrFormatName;
+
 	@ApiModelProperty("克隆列 -1:未克隆 >=0:克隆了哪列，下标从0开始")
 	private Integer cloneColumn;
 

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/QrRepertoryMapper.xml

@@ -24,11 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id" column="qr_repertory_column_id"/>
         <result property="qrRepertoryId" column="qr_repertory_id"/>
         <result property="qrFormatId" column="qr_format_id"/>
-        <result property="qrFormatVO.id" column="qr_format_id"/>
-        <result property="qrFormatVO.codeVariableBuildClass" column="code_variable_build_class"/>
+        <result property="qrFormatName" column="qr_format_name"/>
         <result property="cloneColumn" column="clone_column"/>
         <result property="sortNumber" column="sort_number"/>
         <result property="alias" column="alias"/>
+        <result property="splitNum" column="split_num"/>
         <result property="urlType" column="url_type"/>
         <result property="remark" column="remark"/>
     </resultMap>
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- 码包 -->
     <resultMap id="QrPackageResult" type="com.abi.qms.platform.dao.vo.result.QrPackageVO">
 <!--        <result property="batchNumber" column="batch_number"/>-->
-<!--        <result property="name" column="qr_package_name"/>-->
+        <result property="id" column="qr_package_id"/>
         <result property="qrNumber" column="qr_number"/>
         <result property="createTime" column="qr_package_create_time"/>
         <result property="createByName" column="qr_package_create_by_name"/>
@@ -123,11 +123,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qrc.clone_column,
             qrc.sort_number,
             qrc.alias,
+            qrc.split_num,
             qrc.url_type,
             qrc.remark,
-            qf.code_variable_build_class,
-<!--            qp.batch_number,-->
-<!--            qp.name AS qr_package_name,-->
+            qf.name as qr_format_name,
+            qp.id as qr_package_id,
             qp.qr_number,
             qp.create_time AS qr_package_create_time,
             ui.user_name AS qr_package_create_by_name