箱码合一导出数据接口去掉分页，改成列表查询

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/QrBoxCodeUnityController.java

@@ -1,9 +1,6 @@
 package com.abi.qms.platform.controller.console;
 
-import com.abi.qms.platform.dto.req.ActiveBoxCodeReq;
-import com.abi.qms.platform.dto.req.GenerateBarCodeReq;
-import com.abi.qms.platform.dto.req.ListQrBoxCodeMappingReq;
-import com.abi.qms.platform.dto.req.PrintingDetailReq;
+import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.ListQrBoxCodeMappingRes;
 import com.abi.qms.platform.dto.res.PrintingDetailRes;
 import com.abi.qms.platform.dto.res.QrBoxCodeUploadRes;
@@ -107,8 +104,8 @@ public class QrBoxCodeUnityController {
     @ResponseBody
     @ApiOperation(value = "导出数据")
     @GetMapping("downloadExcelData")
-    public void downloadExcelData(ListQrBoxCodeMappingReq listQrBoxCodeMappingReq, HttpServletResponse response) throws Exception {
-        List<QrBoxExportProperty> res = qrBoxMappingService.downloadExcelData(listQrBoxCodeMappingReq);
+    public void downloadExcelData(ListQrBoxCodeMappingExportReq req, HttpServletResponse response) throws Exception {
+        List<QrBoxExportProperty> res = qrBoxMappingService.downloadExcelData(req);
 
         ExcelInputFactory.downloadExcelData("箱码合一", response, res, QrBoxExportProperty.class);
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/mapper/QrBoxMappingMapper.java

@@ -6,10 +6,7 @@ import com.abi.qms.platform.dao.vo.result.ActivationRecordVO;
 import com.abi.qms.platform.dao.vo.result.PrintingDetailVO;
 import com.abi.qms.platform.dao.vo.result.QrBoxMappingVO;
 import com.abi.qms.platform.dao.vo.result.QueryWxQrBoxMappingDetailsVO;
-import com.abi.qms.platform.dto.req.ActivationRecordReq;
-import com.abi.qms.platform.dto.req.ListQrBoxCodeMappingReq;
-import com.abi.qms.platform.dto.req.QrOneBoxCodeMappingReq;
-import com.abi.qms.platform.dto.req.QueryWxQrBoxMappingDetailsWxReq;
+import com.abi.qms.platform.dto.req.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
@@ -75,4 +72,12 @@ public interface QrBoxMappingMapper extends BaseMapper<QrBoxMapping> {
      * @return
      */
     ActivateDetailVo getActivateDetail(@Param("boxCode") String boxCode);
+
+    /**
+     * 查询箱码合一List
+     *
+     * @param req
+     * @return
+     */
+    List<QrBoxMappingVO> listQrBoxCodeMapping(@Param("req") ListQrBoxCodeMappingExportReq req);
 }

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

@@ -0,0 +1,20 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Eurus
+ * @date 2021/6/22 10:32
+ * @Description: 箱码合一导出数据，列表查询入参
+ */
+@Data
+@ApiModel
+public class ListQrBoxCodeMappingExportReq implements Serializable {
+
+    @ApiModelProperty(value = "激活状态 0-未激活 1-已激活 9-已作废")
+    private Integer activeStatus;
+}

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/QrBoxMappingService.java

@@ -1,14 +1,6 @@
 package com.abi.qms.platform.service;
 
-import com.abi.qms.platform.dto.req.ActivateDetailReq;
-import com.abi.qms.platform.dto.req.ActivateNowReq;
-import com.abi.qms.platform.dto.req.ActivationRecordReq;
-import com.abi.qms.platform.dto.req.ActiveBoxCodeReq;
-import com.abi.qms.platform.dto.req.GenerateBarCodeReq;
-import com.abi.qms.platform.dto.req.ListQrBoxCodeMappingReq;
-import com.abi.qms.platform.dto.req.PrintingDetailReq;
-import com.abi.qms.platform.dto.req.QueryWxQrBoxMappingDetailsWxReq;
-import com.abi.qms.platform.dto.req.ReplenishActivationReq;
+import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.ActivateDetailRes;
 import com.abi.qms.platform.dto.res.ActivationRecordRes;
 import com.abi.qms.platform.dto.res.ListQrBoxCodeMappingRes;
@@ -114,5 +106,9 @@ public interface QrBoxMappingService {
      */
     ActivateDetailRes getActivateDetail(ActivateDetailReq activateDetailReq);
 
-    List<QrBoxExportProperty> downloadExcelData(ListQrBoxCodeMappingReq listQrBoxCodeMappingReq);
+    /**
+     * 导出数据
+     * @return
+     */
+    List<QrBoxExportProperty> downloadExcelData(ListQrBoxCodeMappingExportReq req);
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrBoxMappingServiceImpl.java

@@ -13,15 +13,7 @@ import com.abi.qms.platform.dao.vo.result.ActivationRecordVO;
 import com.abi.qms.platform.dao.vo.result.PrintingDetailVO;
 import com.abi.qms.platform.dao.vo.result.QrBoxMappingVO;
 import com.abi.qms.platform.dao.vo.result.QueryWxQrBoxMappingDetailsVO;
-import com.abi.qms.platform.dto.req.ActivateDetailReq;
-import com.abi.qms.platform.dto.req.ActivateNowReq;
-import com.abi.qms.platform.dto.req.ActivationRecordReq;
-import com.abi.qms.platform.dto.req.ActiveBoxCodeReq;
-import com.abi.qms.platform.dto.req.GenerateBarCodeReq;
-import com.abi.qms.platform.dto.req.ListQrBoxCodeMappingReq;
-import com.abi.qms.platform.dto.req.PrintingDetailReq;
-import com.abi.qms.platform.dto.req.QueryWxQrBoxMappingDetailsWxReq;
-import com.abi.qms.platform.dto.req.ReplenishActivationReq;
+import com.abi.qms.platform.dto.req.*;
 import com.abi.qms.platform.dto.res.ActivateDetailRes;
 import com.abi.qms.platform.dto.res.ActivationRecordRes;
 import com.abi.qms.platform.dto.res.ListQrBoxCodeMappingRes;
@@ -278,18 +270,20 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
     }
 
     @Override
-    public List<QrBoxExportProperty> downloadExcelData(ListQrBoxCodeMappingReq listQrBoxCodeMappingReq) {
-        ListQrBoxCodeMappingRes listQrBoxCodeMappingRes = listQrBoxCodeMapping(listQrBoxCodeMappingReq);
-        if(Objects.nonNull(listQrBoxCodeMappingRes) && CollectionUtils.isNotEmpty(listQrBoxCodeMappingRes.getQrBoxMappingBeanList())){
+    public List<QrBoxExportProperty> downloadExcelData(ListQrBoxCodeMappingExportReq req) {
+        List<QrBoxMappingVO> qrBoxMappingVOList = qrBoxMappingMapper.listQrBoxCodeMapping(req);
+        if(CollectionUtils.isNotEmpty(qrBoxMappingVOList)){
             List<QrBoxExportProperty> qrBoxExportProperties = new ArrayList<>();
-            for (ListQrBoxCodeMappingRes.QrBoxMappingBean qrBoxMappingBean:listQrBoxCodeMappingRes.getQrBoxMappingBeanList()) {
-                QrBoxExportProperty qrBoxExportProperty = PojoConverterUtils.copy(qrBoxMappingBean, QrBoxExportProperty.class);
-                if(InvalidEnum.INVALID.is(qrBoxMappingBean.getInvalid())){
+            for (QrBoxMappingVO qrBoxMappingVO:qrBoxMappingVOList) {
+                QrBoxExportProperty qrBoxExportProperty = PojoConverterUtils.copy(qrBoxMappingVO, QrBoxExportProperty.class);
+                if(InvalidEnum.INVALID.is(qrBoxMappingVO.getInvalid())){
                     qrBoxExportProperty.setActiveStatus(InvalidEnum.INVALID.getName());
-                }else if(BoxMappingActiveStatusEnum.NOT_ACTIVE.is(qrBoxMappingBean.getActiveStatus())){
-                    qrBoxExportProperty.setActiveStatus(BoxMappingActiveStatusEnum.NOT_ACTIVE.getName());
-                }else if(BoxMappingActiveStatusEnum.ACTIVATED.is(qrBoxMappingBean.getActiveStatus())){
-                    qrBoxExportProperty.setActiveStatus(BoxMappingActiveStatusEnum.ACTIVATED.getName());
+                }else{
+                    if(BoxMappingActiveStatusEnum.NOT_ACTIVE.is(qrBoxMappingVO.getActiveStatus())){
+                        qrBoxExportProperty.setActiveStatus(BoxMappingActiveStatusEnum.NOT_ACTIVE.getName());
+                    }else if(BoxMappingActiveStatusEnum.ACTIVATED.is(qrBoxMappingVO.getActiveStatus())){
+                        qrBoxExportProperty.setActiveStatus(BoxMappingActiveStatusEnum.ACTIVATED.getName());
+                    }
                 }
                 qrBoxExportProperties.add(qrBoxExportProperty);
             }