feat: 箱码合一返回参数修改

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

@@ -1,8 +1,8 @@
 package com.abi.qms.platform.dao.vo.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -29,30 +29,9 @@ public class QrBoxMappingVO implements Serializable {
     @ApiModelProperty(value = "结束序号")
     private Long indexEnd;
 
-    @ApiModelProperty(value = "起始二维码")
-    private String beginQrCode;
-
-    @ApiModelProperty(value = "结束二维码")
-    private String endQrCode;
-
     @ApiModelProperty(value = "条数")
     private Long qrCodeCount;
 
-    @ApiModelProperty(value = "激活状态 0-未激活 1-已激活 9-已作废")
-    private Integer activeStatus;
-
-    @ApiModelProperty(value = "激活时间")
-    private LocalDateTime activeTime;
-
-    @ApiModelProperty(value = "激活人id")
-    private Long activeUserId;
-
-    @ApiModelProperty(value = "激活人姓名")
-    private String activeUserName;
-
-    @ApiModelProperty(value = "码包id")
-    private Long packageId;
-
     @ApiModelProperty(value = "项目号")
     private String projectNo;
 
@@ -66,19 +45,23 @@ public class QrBoxMappingVO implements Serializable {
     private String createUserName;
 
     @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
-    @ApiModelProperty(value = "创建人id")
-    private Long createBy;
+    @ApiModelProperty(value = "激活时间")
+    private LocalDateTime activeTime;
 
-    @ApiModelProperty(value = "修改时间")
-    private LocalDateTime updateTime;
+    @ApiModelProperty(value = "激活人姓名")
+    private String activeUserName;
+
+    @ApiModelProperty(value = "激活厂商")
+    private String factoryName;
 
-    @ApiModelProperty(value = "修改人id")
-    private Long updateBy;
+    @ApiModelProperty(value = "激活状态 0-未激活 1-已激活")
+    private Integer activeStatus;
 
-    @ApiModelProperty(value = "是否删除")
-    private Integer isDelete;
+    @ApiModelProperty(value = "码包id")
+    private Long packageId;
 
     @ApiModelProperty(value = "是否作废 0-未作废 1-已作废")
     private Integer invalid;

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

@@ -72,12 +72,12 @@ public class ListQrBoxCodeMappingRes extends PageResp implements Serializable {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime activeTime;
 
-        @ApiModelProperty(value = "激活人id")
-        private Long activeUserId;
-
         @ApiModelProperty(value = "激活人姓名")
         private String activeUserName;
 
+        @ApiModelProperty(value = "激活厂商")
+        private String factoryName;
+
         @ApiModelProperty(value = "激活状态 0-未激活 1-已激活")
         private Integer activeStatus;
 

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

@@ -37,15 +37,19 @@
 
     <select id="listQrBoxCodeMapping" resultType="com.abi.qms.platform.dao.vo.result.QrBoxMappingVO">
         select
-        <include refid="Base_Column_List"/>
-        from qr_box_mapping
+        qbm.id,qbm.box_code,qbm.index_begin,qbm.index_end,qbm.qr_code_count,qbm.project_no,qbm.board_no,qbm.remark,
+        qbm.create_user_name,qbm.create_time,qbm.active_time,qbm.active_user_name,qbm.active_status,qbm.package_id,
+        qbm.invalid,bf.factory_name
+        from qr_box_mapping qbm
+        inner join qr_package qp on qp.id=qbm.package_id
+        left join base_factory bf on bf.id=qp.factory_beer_id
         <where>
-            is_delete = 0
+            qbm.is_delete = 0
             <if test="req.activeStatus != null ">
-                AND active_status = #{req.activeStatus}
+                AND qbm.active_status = #{req.activeStatus}
             </if>
         </where>
-        order by create_time
+        order by qbm.create_time
     </select>
 
     <select id="getPrintingDetail" resultType="com.abi.qms.platform.dao.vo.result.PrintingDetailVO">