整理码库列表分页查询入参出参数据

删除码库部门id，部门名称，初始数量字段

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/QrRepertory.java

@@ -27,18 +27,12 @@ public class QrRepertory {
 	@TableId(value = "id", type = IdType.AUTO)
 	private Long id;
 
-	@ApiModelProperty("部门id")
-	private Long deptId;
-
 	@ApiModelProperty("码库名称")
 	private String name;
 
 	@ApiModelProperty("码库类型 1-系统生成 2-文本导入 3-FTP接入")
 	private Integer type;
 
-	@ApiModelProperty("初始数量")
-	private Long initialNumber;
-
 	@ApiModelProperty("码库状态 10-待生成 11-自动生成 20-待导入 21-已导入 40-停用")
 	private Integer status;
 

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

@@ -21,24 +21,12 @@ public class QrRepertoryVO {
 	@ApiModelProperty("码库id")
 	private Long id;
 
-	@ApiModelProperty("部门id")
-	private Long deptId;
-
-	@ApiModelProperty("部门名称")
-	private String deptName;
-
-	@ApiModelProperty(value = "部门url")
-	private String deptUrl;
-
 	@ApiModelProperty("码库名称")
 	private String name;
 
 	@ApiModelProperty("码库类型 1-系统生成 2-文本导入 3-FTP接入")
 	private Integer type;
 
-	@ApiModelProperty("初始数量")
-	private Long initialNumber;
-
 	@ApiModelProperty("码库状态 10-待生成 11-自动生成 20-待导入 21-已导入 40-停用")
 	private Integer status;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListQrRepertoryReq.java

@@ -17,18 +17,12 @@ import java.io.Serializable;
 @ApiModel
 public class ListQrRepertoryReq extends PageReq implements Serializable {
 
-	@ApiModelProperty("部门名称")
-	private String deptName;
-
 	@ApiModelProperty("码库名称")
 	private String name;
 
 	@ApiModelProperty("码库类型 1-系统生成 2-文本导入 3-FTP接入")
 	private Integer type;
 
-	@ApiModelProperty("初始数量")
-	private Long initialNumber;
-
 	@ApiModelProperty("码库状态 10-待生成 11-自动生成 20-待导入 21-已导入 40-停用")
 	private Integer status;
 

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

@@ -39,31 +39,18 @@ public class ListQrRepertoryRes extends PageResp implements Serializable {
 		@ApiModelProperty("码库id")
 		private Long id;
 
-		@ApiModelProperty("部门名称")
-		private String deptName;
-
 		@ApiModelProperty("码库名称")
 		private String name;
 
 		@ApiModelProperty("码库类型 1-系统生成 2-文本导入 3-FTP接入")
 		private Integer type;
 
-		@ApiModelProperty("初始数量")
-		private Long initialNumber;
-
 		@ApiModelProperty("码库状态 10-待生成 11-自动生成 20-待导入 21-已导入 40-停用")
 		private Integer status;
 
 		@ApiModelProperty("码数据组成")
 		private String dataComposition;
 
-		@ApiModelProperty(value = "创建时间")
-		@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-		private LocalDateTime createTime;
-
-		@ApiModelProperty(value = "创建人id")
-		private Long createBy;
-
 		@ApiModelProperty(value = "修改时间")
 		@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 		private LocalDateTime updateTime;

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

@@ -44,8 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 适用于码库详情的resultMap -->
     <resultMap id="DetailResult" type="com.abi.qms.platform.dao.vo.result.QrRepertoryVO" extends="QrRepertoryResult">
-        <result property="deptName" column="dept_name"/>
-        <result property="deptUrl" column="dept_url"/>
         <result property="updateByName" column="update_by_name"/>
         <!-- 码库的列 -->
         <collection property="qrRepertoryColumnList" javaType="java.util.List" resultMap="QrRepertoryColumnResult" />
@@ -55,7 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <!-- 适用于分页查询的resultMap，因为IPage遇到collection会分页异常，需要使用select重新查询 -->
     <resultMap id="IPageResult" type="com.abi.qms.platform.dao.vo.result.QrRepertoryVO" extends="QrRepertoryResult">
-        <result property="deptName" column="dept_name"/>
         <result property="updateByName" column="update_by_name"/>
         <!-- 码库的列 -->
         <collection property="qrRepertoryColumnList" column="id" javaType="java.util.List" ofType="com.abi.qms.platform.dao.vo.result.QrRepertoryColumnVO" select="selectQrRepertoryColumn"/>
@@ -80,22 +77,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qr.id,
             qr.name,
             qr.type,
-            qr.initial_number,
             qr.status,
-            qr.create_time,
-            qr.create_by,
             qr.update_time,
             qr.update_by,
-            bd.dept_name,
             ui.user_name AS update_by_name
         FROM qr_repertory qr
-        LEFT JOIN base_department bd ON qr.dept_id = bd.id
         LEFT JOIN user_info ui ON qr.update_by = ui.id
         <where>
             qr.is_delete = 0
-            <if test="param.deptName != null and param.deptName != ''">
-                AND bd.dept_name LIKE CONCAT('%',#{param.deptName},'%')
-            </if>
             <if test="param.name != null and param.name != ''">
                 AND qr.name LIKE CONCAT('%',#{param.name},'%')
             </if>
@@ -121,10 +110,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectQrRepertoryDetailById" resultMap="DetailResult">
         SELECT
             qr.id,
-            qr.dept_id,
             qr.name,
             qr.type,
-            qr.initial_number,
             qr.status,
             qr.create_time,
             qr.create_by,
@@ -139,7 +126,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qrc.url_type,
             qrc.remark,
             qf.code_variable_build_class,
-            bd.dept_url,
 <!--            qp.batch_number,-->
 <!--            qp.name AS qr_package_name,-->
             qp.qr_number,
@@ -148,7 +134,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM qr_repertory qr
         LEFT JOIN qr_repertory_column qrc ON qrc.qr_repertory_id = qr.id
         LEFT JOIN qr_format qf ON qf.id = qrc.qr_format_id
-        LEFT JOIN base_department bd ON qr.dept_id = bd.id
         LEFT JOIN qr_box_code_format bcf ON bcf.qr_repertory_id = qr.id
         LEFT JOIN qr_package qp ON qp.box_code_format_id = bcf.id
         LEFT JOIN user_info ui ON ui.id = qp.create_by