外部报验功能-每日报表

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

@@ -79,11 +79,6 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
      * @param statisticsTime
      */
     private void analysisDataData(List<SameDayRealTimeInspectionVo> inspetionList, Date statisticsTime) {
-
-        if(ObjectUtil.isEmpty(inspetionList)) {
-            return ;
-        }
-
         ZhcxReprotSameDayRealTimeInspectionStatisticsDo mainEntity = ZhcxReprotSameDayRealTimeInspectionStatisticsDo.builder()
                 .statistictime(statisticsTime)
                 .statisticday(DateUtil.format(statisticsTime, "yyyy-MM-dd"))
@@ -98,6 +93,12 @@ public class ZhcxReprotSameDayRealTimeInspectionStatisticsServiceImpl extends Se
         mainEntity.setId(SecurityUtil.getUUID());
         mainEntity.setDeleted("0");
 
+
+        if(ObjectUtil.isEmpty(inspetionList)) {
+            save(mainEntity);
+            return ;
+        }
+
         Map<String, ZhcxReprotSameDayRealTimeInspectionStatisticsLocationDo> map = new HashMap<>();
 
         for(SameDayRealTimeInspectionVo row : inspetionList) {

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

@@ -1,14 +1,15 @@
 package com.rongwei.bsentity.domain;
 
-import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.rongwei.rwcommon.base.BaseDo;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  * 外部报验-ITP报验
@@ -275,6 +276,36 @@ public class ZhcxOutsideInspectionItpDo extends BaseDo {
      */
     @TableField("INSPECTIONCOMPLATETIME")
     private Date inspectioncomplatetime;
+    /**
+     * 检验室名称
+     */
+    @TableField("LABORATORYNAME")
+    private String laboratoryname;
+    /**
+     * 班组ID
+     */
+    @TableField("TEAMGROUPID")
+    private String teamgroupid;
+    /**
+     * 班组名称
+     */
+    @TableField("TEAMGROUPNAME")
+    private String teamgroupname;
+    /**
+     * 检验室ID
+     */
+    @TableField("LABORATORYID")
+    private String laboratoryid;
+    /**
+     * 班组pathid
+     */
+    @TableField("TEAMGROUPPATHID")
+    private String teamgrouppathid;
+    /**
+     * 检验室pathid
+     */
+    @TableField("LABORATORYPATHID")
+    private String laboratorypathid;
 
 
 }