箱码合一导出修改

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

@@ -105,9 +105,9 @@ public class QrBoxCodeUnityController {
     @ApiOperation(value = "导出数据")
     @GetMapping("downloadExcelData")
     public void downloadExcelData(ListQrBoxCodeMappingExportReq req, HttpServletResponse response) throws Exception {
-//        List<QrBoxExportProperty> res = qrBoxMappingService.downloadExcelData(req);
-//
-//        ExcelInputFactory.downloadExcelData("箱码合一", response, res, QrBoxExportProperty.class);
+        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

@@ -73,11 +73,12 @@ public interface QrBoxMappingMapper extends BaseMapper<QrBoxMapping> {
      */
     ActivateDetailVo getActivateDetail(@Param("boxCode") String boxCode);
 
+
     /**
      * 查询箱码合一List
-     *
-     * @param req
+     * @param activeStatus
+     * @param packageId
      * @return
      */
-    List<QrBoxMappingVO> listQrBoxCodeMapping(@Param("req") ListQrBoxCodeMappingExportReq req);
+    List<QrBoxMappingVO> listQrBoxCodeMappingForExcel(@Param("activeStatus") Integer activeStatus,@Param("packageId") Long packageId);
 }

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

@@ -15,6 +15,9 @@ import java.io.Serializable;
 @ApiModel
 public class ListQrBoxCodeMappingExportReq implements Serializable {
 
+    @ApiModelProperty(value = "码包ID")
+    private Long packageId;
+
     @ApiModelProperty(value = "激活状态 0-未激活 1-已激活 9-已作废")
     private Integer activeStatus;
 

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

@@ -277,7 +277,7 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
     @Override
     public List<QrBoxExportProperty> downloadExcelData(ListQrBoxCodeMappingExportReq req) {
 
-        List<QrBoxMappingVO> qrBoxMappingVOList = qrBoxMappingMapper.listQrBoxCodeMapping(req);
+        List<QrBoxMappingVO> qrBoxMappingVOList = qrBoxMappingMapper.listQrBoxCodeMappingForExcel(req.getActiveStatus(),req.getPackageId());
 
         List<QrBoxExportProperty> qrBoxExportProperties = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(qrBoxMappingVOList)){
@@ -295,6 +295,7 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
                 qrBoxExportProperties.add(qrBoxExportProperty);
             }
         }
+
         return qrBoxExportProperties;
     }
 

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

@@ -957,14 +957,10 @@ public class QrPackageServiceImpl implements QrPackageService {
         }
 
         //查询批次号id
-        QrOnePackageBatchReq qrOnePackageBatchReq = new QrOnePackageBatchReq();
-        qrOnePackageBatchReq.setPackageId(qrCode.getPackageId());
-        qrOnePackageBatchReq.setBatchNumber(qrCode.getBatchNumberId());
-        QrPackageBatchVO qrPackageBatchOne = qrPackageBatchMapper.getQrPackageBatchOne(qrOnePackageBatchReq);
-
+        QrPackageBatch qrPackageBatch = qrPackageBatchMapper.selectById(qrCode.getBatchNumberId());
         //存批次号
-        if (ObjectUtils.isNotEmpty(qrPackageBatchOne)) {
-            qrSingleCheckVO.setBatchNumber(qrPackageBatchOne.getBatchNumber());
+        if (ObjectUtils.isNotEmpty(qrPackageBatch)) {
+            qrSingleCheckVO.setBatchNumber(qrPackageBatch.getBatchNumber());
         }
 
         //1-查询码关联激活信息单条数据

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

@@ -54,6 +54,26 @@
         order by qbm.create_time
     </select>
 
+    <select id="listQrBoxCodeMappingForExcel" resultType="com.abi.qms.platform.dao.vo.result.QrBoxMappingVO">
+        select
+            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,qbm.begin_qr_code,qbm.end_qr_code
+        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>
+            <if test="activeStatus != null ">
+                AND qbm.active_status = #{activeStatus}
+            </if>
+            <if test="packageId !=null">
+                AND qbm.packageId = #{packageId}
+            </if>
+            and qbm.is_delete = 0
+        </where>
+        order by qbm.create_time
+    </select>
+
     <select id="getPrintingDetail" resultType="com.abi.qms.platform.dao.vo.result.PrintingDetailVO">
         select
             qbm.begin_qr_code,qbm.end_qr_code,qbm.create_time,qbm.box_code,qbm.qr_code_count,