外部报验功能-每日报表

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl.java

@@ -53,9 +53,8 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
 
         Date date0 = calendar.getTime();
 
-        //前一小时开始时间
+        //小时开始时间
         calendar.setTime(new Date());
-        calendar.add(Calendar.HOUR_OF_DAY, -1);;
         calendar.set(Calendar.MINUTE, 0);
         calendar.set(Calendar.SECOND, 0);
         calendar.set(Calendar.MILLISECOND, 0);
@@ -63,7 +62,6 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
         Date statisticsTime = calendar.getTime();
 
         //前一小时结束时间
-        calendar.add(Calendar.HOUR_OF_DAY, 1);
         calendar.add(Calendar.MILLISECOND, -1);
         String endTime = dateFormat.format(calendar.getTime());
 
@@ -144,6 +142,10 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
                     mainEntity.setConditionreceivedqty(mainEntity.getConditionreceivedqty() + 1);
                     locationDo.setConditionreceivedqty(locationDo.getConditionreceivedqty() + 1);
                 }
+
+
+                mainEntity.setExecutedqty(mainEntity.getExecutedqty() + 1);
+                locationDo.setExecutedqty(locationDo.getExecutedqty() + 1);
             }
             //待报验
             else if("20".equals(row.getInspectionstatus())) {
@@ -154,6 +156,9 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
             else if("40".equals(row.getInspectionstatus())) {
                 mainEntity.setCancelqty(mainEntity.getCancelqty() + 1);
                 locationDo.setCancelqty(locationDo.getCancelqty() + 1);
+
+                mainEntity.setExecutedqty(mainEntity.getExecutedqty() + 1);
+                locationDo.setExecutedqty(locationDo.getExecutedqty() + 1);
             }
 
             map.put(row.getInspectioncontent(), locationDo);