新增码包已废除查询

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

@@ -23,7 +23,4 @@ public class ListQrBoxCodeMappingReq extends PageReq implements Serializable {
 
     @ApiModelProperty(value = "激活状态 0-未激活 1-已激活 9-已作废")
     private Integer activeStatus;
-
-    @ApiModelProperty(value = "是否作废 0-未作废 1-已作废")
-    private Integer invalid;
 }

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

@@ -84,14 +84,12 @@ public class ListQrBoxCodeMappingRes extends PageResp implements Serializable {
         @ApiModelProperty(value = "激活厂商")
         private String factoryName;
 
-        @ApiModelProperty(value = "激活状态 0-未激活 1-已激活")
+        @ApiModelProperty(value = "激活状态 0-未激活 1-已激活 9-已作废")
         private Integer activeStatus;
 
         @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/service/impl/QrBoxMappingServiceImpl.java

@@ -183,6 +183,11 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
         // 封装出参、放入分页信息
         ListQrBoxCodeMappingRes res = new ListQrBoxCodeMappingRes();
         PageUtil.copyPageInfo(res, iPage);
+        qrboxMappingList.forEach(item -> {
+            if (item.getInvalid().equals(1)) {
+                item.setActiveStatus(9);
+            }
+        });
         List<ListQrBoxCodeMappingRes.QrBoxMappingBean> beanList = PojoConverterUtils.copyList(qrboxMappingList, ListQrBoxCodeMappingRes.QrBoxMappingBean.class);
         res.setQrBoxMappingBeanList(beanList);
 

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

@@ -47,14 +47,15 @@
             left join base_factory bf on bf.id=qp.factory_beer_id
         <where>
             qbm.is_delete = 0
-            <if test="req.activeStatus != null ">
+            <if test="req.activeStatus != null and req.activeStatus != 9 ">
                 AND qbm.active_status = #{req.activeStatus}
+                AND qbm.invalid = 0
             </if>
             <if test="req.packageId != null ">
                 AND qbm.package_id = #{req.packageId}
             </if>
-            <if test=" req.invalid != null ">
-                AND qbm.invalid = #{req.invalid}
+            <if test=" req.activeStatus != null and req.activeStatus == 9  ">
+                AND qbm.invalid = 1
             </if>
         </where>
         order by qbm.create_time