报表时间bug修改

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

@@ -973,7 +973,7 @@ public class QrPackageServiceImpl implements QrPackageService {
         if (ObjectUtils.isNotEmpty(indexQrBoxCodeMappingOne)) {
             qrSingleCheckVO.setBoxCode(indexQrBoxCodeMappingOne.getBoxCode());//条码序号
             qrSingleCheckVO.setActiveTime(indexQrBoxCodeMappingOne.getActiveTime());//激活时间
-            qrSingleCheckVO.setActiveUserName(indexQrBoxCodeMappingOne.getActiveUserName());//激活时间
+            qrSingleCheckVO.setActiveUserName(indexQrBoxCodeMappingOne.getActiveUserName());//激活人
             qrSingleCheckVO.setActiveStatus(indexQrBoxCodeMappingOne.getActiveStatus());//激活状态
             qrSingleCheckVO.setPackageActiveStatus(indexQrBoxCodeMappingOne.getActiveStatus());//赋值原始状态
         }

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

@@ -270,10 +270,10 @@ public class ReportServiceImpl implements ReportService {
      * @param reportReq
      */
     private Map<String,String> fillParam(ReportReq reportReq) {
+        setQueryTime(reportReq);
         if (ObjectUtils.isEmpty(reportReq) || ObjectUtils.isEmpty(reportReq.getValue())){
             return Maps.newHashMap();
         }
-        setQueryTime(reportReq);
         return getBeforeWeekTime(reportReq.getValue().toString());
     }