后端提交

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -3926,6 +3926,7 @@
            and UPLOAD_FLAG='2'
            and NET_TIME > to_date('2022-07-21'，'YYYY-MM-DD')
            union
+            (
                select FS_WEIGHTNO as ACTUAL_NO,
                       fs_noticeId as prediction_no,
                       REPLACE(FS_CARNO,'-','') as CAR_NO,
@@ -3949,6 +3950,7 @@
                       '老系统' as REMARK
                 from jgweight.view_car_net @MCMS
                    where FS_NETWEIGHTTIME > to_date('2022-07-21'，'YYYY-MM-DD') AND FS_DELETEDTAG='N'
+                        and fs_noticeId is not null )
              )
         where 1 = 1
           <if test="remark != null and remark != ''">
@@ -4032,8 +4034,9 @@
                   senderRemark sender_remark,
                   '老系统' remark
                   from jgweight.VIEW_CAR_FIRST @MCMS
-            where weightTime > to_date('2022-07-21'，'YYYY-MM-DD') AND FS_DELETEDTAG='N')
-            ) A
+            where weightTime > to_date('2022-07-21'，'YYYY-MM-DD') AND FS_DELETEDTAG='N'
+                 and noticeId is not null)
+          ) A
         where 1 = 1
           <if test="remark != null and remark != ''">
             and remark LIKE '%${remark}%'
@@ -4075,6 +4078,8 @@
             and matter_name LIKE '%${matterName}%'
           </if>
   </select>
+
+
   <select id="countOldAndNew" parameterType="java.util.HashMap" resultType="HashMap">
     select * from
     (
@@ -4113,6 +4118,8 @@
         '老系统' remark
         from jgweight.view_car_net @MCMS
         where 1 = 1
+            and fs_noticeId is not null
+            and FS_DELETEDTAG='N'
             <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
               and  fs_netweightTime  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and fs_netweightTime  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
             </if>