feat：箱码合一和小程序问题修改

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

@@ -26,4 +26,7 @@ public class ActivateDetailVo implements Serializable {
 
     @ApiModelProperty(value = "盖码数量")
     private Integer capNum;
+
+    @ApiModelProperty(value = "激活状态 0-未激活 1-已激活")
+    private Integer activeStatus;
 }

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -16,6 +17,10 @@ import java.io.Serializable;
 @ApiModel
 public class ListQrBoxCodeMappingReq extends PageReq implements Serializable {
 
+    @ApiModelProperty(value = "码包ID")
+    @NotNull(message = "码包ID不能为空")
+    private Long packageId;
+
     @ApiModelProperty(value = "激活状态 0-未激活 1-已激活 9-已作废")
     private Integer activeStatus;
 

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

@@ -26,4 +26,7 @@ public class ActivateDetailRes implements Serializable {
 
     @ApiModelProperty(value = "盖码数量")
     private Integer capNum;
+
+    @ApiModelProperty(value = "激活状态 0-未激活 1-已激活")
+    private Integer activeStatus;
 }

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

@@ -50,6 +50,9 @@
             <if test="req.activeStatus != null ">
                 AND qbm.active_status = #{req.activeStatus}
             </if>
+            <if test="req.packageId != null ">
+                AND qbm.packageId = #{req.packageId}
+            </if>
         </where>
         order by qbm.create_time
     </select>
@@ -141,7 +144,7 @@
     </select>
 
     <select id="getActivateDetail" resultType="com.abi.qms.platform.dao.vo.result.ActivateDetailVo">
-        select qbm.box_code,ba.active_name,bm.material_name,
+        select qbm.box_code,ba.active_name,bm.material_name,qbm.active_status
             case when qp.qr_type = 2 then qp.qr_number else 0 end as capNum
         from qr_box_mapping qbm
             left join qr_package qp on qbm.package_id=qp.id