增加内部报验每小时统计

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxReprotSameDayRealTimeInspectionStatisticsDao.java

@@ -24,7 +24,8 @@ public interface ZhcxReprotSameDayRealTimeInspectionStatisticsDao extends BaseMa
             "      i.INSPECTIONCONTENT,\n" +
             "      i.INSPECTIONLOCATION,\n" +
             "      d.DISPATCHSTATUS,\n" +
-            "      d.INSPECTIONCONCLUSION\n" +
+            "      d.INSPECTIONCONCLUSION,\n" +
+            "      'out' AS INSPECTIONTYPE\n" +
             "    FROM\n" +
             "      ZHCX_OUTSIDE_INSPECTION_ITP i\n" +
             "    JOIN ZHCX_OUTSIDE_INSPECTION_ITP_SUPERVISION_DISPATCH  d ON d.ITPID = i.ID AND d.DELETED = '0' \n" +
@@ -32,6 +33,24 @@ public interface ZhcxReprotSameDayRealTimeInspectionStatisticsDao extends BaseMa
             "      i.DELETED = '0'\n" +
             "      AND i.INSPECTIONSTATUS > 10\n" +
             "      AND i.RESERVATIONINSPECTIONTIME BETWEEN #{startTime} AND #{endTime}")
-    List<SameDayRealTimeInspectionVo> getInspetion(@Param("startTime") String startTime, @Param("endTime") String endTime);
+    List<SameDayRealTimeInspectionVo> getInspetionOut(@Param("startTime") String startTime, @Param("endTime") String endTime);
+
+
+    @Select("SELECT\n" +
+            "      i.ID,\n" +
+            "      i.INSPECTIONSTATUS,\n" +
+            "      i.INSPECTIONCONTENT,\n" +
+            "      i.INSPECTIONLOCATION,\n" +
+            "      d.DISPATCHSTATUS,\n" +
+            "      d.INSPECTIONCONCLUSION,\n" +
+            "      'in' AS INSPECTIONTYPE\n" +
+            "    FROM\n" +
+            "      ZHCX_INSIDE_INSPECTION i\n" +
+            "    JOIN ZHCX_INSIDE_INSPECTION_DISPATCH  d ON d.INSIDEID = i.ID AND d.DELETED = '0' \n" +
+            "    WHERE\n" +
+            "      i.DELETED = '0'\n" +
+            "      AND i.INSPECTIONSTATUS > 10\n" +
+            "      AND i.RESERVATIONINSPECTIONTIME BETWEEN #{startTime} AND #{endTime}")
+    List<SameDayRealTimeInspectionVo> getInspetionIn(@Param("startTime") String startTime, @Param("endTime") String endTime);
 
 }

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

@@ -44,11 +44,17 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
         //统计时间
         StatisticsDateDto dateDto = getStatisticsDate();
 
-        //前一小时报验单
-        List<SameDayRealTimeInspectionVo> inspetionList = dao.getInspetion(dateDto.getStartTime(), dateDto.getEndTime());
+        //前一小时外部报验单
+        List<SameDayRealTimeInspectionVo> inspetionList = dao.getInspetionOut(dateDto.getStartTime(), dateDto.getEndTime());
+
+        //前一小时内部报验单
+        List<SameDayRealTimeInspectionVo> inspetionList2 = dao.getInspetionIn(dateDto.getStartTime(), dateDto.getEndTime());
+
+        //数据处理
+        analysisDataData(inspetionList, dateDto.getStatisticsTime(), "out");
 
         //数据处理
-        analysisDataData(inspetionList, dateDto.getStatisticsTime());
+        analysisDataData(inspetionList2, dateDto.getStatisticsTime(), "in");
     }
 
     /**
@@ -91,7 +97,7 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
      * @param inspetionList
      * @param statisticsTime
      */
-    private void analysisDataData(List<SameDayRealTimeInspectionVo> inspetionList, Date statisticsTime) {
+    private void analysisDataData(List<SameDayRealTimeInspectionVo> inspetionList, Date statisticsTime, String inspectiontype) {
         ZhcxReprotSameDayRealTimeInspectionStatisticsDo mainEntity = ZhcxReprotSameDayRealTimeInspectionStatisticsDo.builder()
                 .statistictime(statisticsTime)
                 .statisticday(DateUtil.format(statisticsTime, "yyyy-MM-dd"))
@@ -105,7 +111,7 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
                 .build();
         mainEntity.setId(SecurityUtil.getUUID());
         mainEntity.setDeleted("0");
-
+        mainEntity.setInspectiontype(inspectiontype);
 
         if(ObjectUtil.isEmpty(inspetionList)) {
             save(mainEntity);
@@ -175,9 +181,10 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
                 locationDo.setExecutedqty(locationDo.getExecutedqty() + 1);
             }
 
+            locationDo.setInspectiontype(inspectiontype);
             map.put(row.getInspectioncontent(), locationDo);
         }
-
+        mainEntity.setInspectiontype(inspectiontype);
         save(mainEntity);
         locationService.saveBatch(map.values());
     }

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxReprotSameDayRealTimeInspectionStatisticsDo.java

@@ -88,5 +88,10 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsDo extends BaseDo {
     @TableField("CANCELQTY")
     private Integer cancelqty;
 
+    /**
+     * 报验类型 (out、in)
+     */
+    @TableField("INSPECTIONTYPE")
+    private String inspectiontype;
 
 }

business-entity/src/main/java/com/rongwei/bsentity/domain/ZhcxReprotSameDayRealTimeInspectionStatisticsLocationDo.java

@@ -99,5 +99,10 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsLocationDo extends Bas
     @TableField("INSPECTIONCONTENT")
     private String inspectioncontent;
 
+    /**
+     * 报验类型 (out、in)
+     */
+    @TableField("INSPECTIONTYPE")
+    private String inspectiontype;
 
 }

business-entity/src/main/java/com/rongwei/bsentity/vo/report/SameDayRealTimeInspectionVo.java

@@ -20,4 +20,6 @@ public class SameDayRealTimeInspectionVo {
     private String dispatchstatus;
 
     private String inspectionconclusion;
+
+    private String inspectiontype;
 }