修改客户提出得检测与探测、预处理与探测校验逻辑

DataCheck/src/main/java/com/tofly/dataCheck/config/DataCheckEnum.java

@@ -29,7 +29,14 @@ public enum DataCheckEnum {
     ALL_LENGTH_NOT_EQUAL(52,3,"长度（水位小于20cm长度+水位大于20cm长度!=判读检测长度"),
 
 
-    JC_TC_DATA_DIFF(3,3,"视频显示断面数据1与探测断面数据不一致"),
+    JC_TC_DATA_DIFF(3,3,"探测数据中“是否下达任务”为“否时: 比对检测数据与探测数据断面数据 1和 2 及管段长度是否相等，且视频显示断面数据 1 和 2 及判读检测长度为空值时，为完全对应，否则不完成对应。"),
+    JC_TC_DATA_DIFF32(32,3,"探测数据中“是否下达任务”不为“否”时: 当暂无法预处理长度=探测最新设施长度时，且检测数据与探测数据断面数据 1 和 2 及管段长度是相等时，且视频显示断面数据 1和 2 及判读检测长度为空值时，为完全对应，否则不完成对应。"),
+    JC_TC_DATA_DIFF33(33,3,"探测数据中“是否下达任务”不为“否”时: 当暂无法预处理长度不等于探测最新设施长度时，满足新无法预处理长度+检测判读长度=探测最新设施长度，且视频显示断面数据 1 和 2 与探测数据断面数据 1和 2 相等，为完全对应"),
+
+    YCL_TC_DATA_DIFF(4,3,"探测数据中“是否下达任务”为“否时: 比对预处理数据与探测数据断面数据 1和 2 及管段长度是否相等，且视频显示断面数据 1 和 2 及判读预处理长度为空值时，为完全对应，否则不完成对应。"),
+    YCL_TC_DATA_DIFF32(42,3,"探测数据中“是否下达任务”不为“否”时: 当暂无法预处理长度=探测最新设施长度时，且预处理数据与探测数据断面数据 1 和 2 及管段长度是相等时，且视频显示断面数据 1和 2 及判读预处理长度为空值时，为完全对应，否则不完成对应。"),
+    YCL_TC_DATA_DIFF33(43,3,"探测数据中“是否下达任务”不为“否”时: 当暂无法预处理长度不等于探测最新设施长度时，满足新无法预处理长度+预处理判读长度=探测最新设施长度，且视频显示断面数据 1 和 2 与探测数据断面数据 1和 2 相等，为完全对应"),
+
     JC_TC_DATA_DIFF2(4,3,"暂无法预处理长度+检测判读长度!=探测最新设施长度"),
     JC_TC_DATA_DIFF3(5,3,"视频显示断面数据1与探测断面数据不一致 且 暂无法预处理长度+检测判读长度!=探测最新设施长度"),
     YCL_JS_DATA_DIFF(6,3,"管径区间不一致"),

DataCheck/src/main/java/com/tofly/dataCheck/entity/MessageNotice.java

@@ -46,11 +46,25 @@ public class MessageNotice {
     @JsonIgnore
     private  Integer vedioSectionDiff;
 
+    @JsonIgnore
+    private  Integer vedioSectionDiff2;
+
+    @JsonIgnore
+    private  Integer vedioSectionDiff3;
+
     @ApiModelProperty(value = "暂无法预处理长度+检测判读长度!=探测最新设施长度")
     @TableField(exist = false)
     @JsonIgnore
     private  Integer sumHandleAndPdDiff;
 
+    @TableField(exist = false)
+    @JsonIgnore
+    private  Integer sumHandleAndPdDiff2;
+
+    @TableField(exist = false)
+    @JsonIgnore
+    private  Integer sumHandleAndPdDiff3;
+
     @ApiModelProperty(value = "视频时间较早")
     @TableField(exist = false)
     @JsonIgnore

DataCheck/src/main/resources/customMapper/CheckAndDetectMapper.xml

@@ -40,7 +40,9 @@
 
         <result property="messageNotice.dataExist" column="data_exist"/>
         <result property="messageNotice.vedioSectionDiff" column="vedioSectionDiff"/>
-        <result property="messageNotice.sumHandleAndPdDiff" column="sumHandleAndPdDiff"/>
+        <result property="messageNotice.vedioSectionDiff2" column="vedioSectionDiff2"/>
+        <result property="messageNotice.vedioSectionDiff3" column="vedioSectionDiff3"/>
+
     </resultMap>
 
     <select id="compareCheckAndDetect" resultMap="checkAndDetectVoMap">
@@ -48,7 +50,7 @@
        (
         SELECT
         e.*,
-        e.vedioSectionDiff+e.sumHandleAndPdDiff+e.data_exist exe_Num
+        e.vedioSectionDiff + e.vedioSectionDiff2+ e.vedioSectionDiff3 + e.data_exist exe_Num
         FROM
         (
         SELECT
@@ -71,8 +73,33 @@
         )
         END end_code,
         CASE WHEN d.id IS NOT NULL AND d.id2 IS NOT NULL THEN 0 ELSE ( CASE WHEN d.id IS NULL THEN 9999 ELSE 9998 END ) END data_exist,
-        case when IFNULL(d.section_data_one,0) =IFNULL(d.video_section_data_one,0) THEN 0 else 3 end vedioSectionDiff,
-        case when IFNULL(d.pd_check_length,0)+IFNULL(d.no_handle_length,0)=IFNULL(d.pipe_length,0) then 0 else 4 end sumHandleAndPdDiff,
+        case when d.is_order='否' then
+        CASE
+        WHEN IFNULL( d.section_data_one, 0 ) = IFNULL( d.section_data_one2, 0 )
+        and IFNULL( d.section_data_two, 0 ) = IFNULL( d.section_data_two2, 0 )
+        and IFNULL( d.pipe_length, 0 ) = IFNULL( d.pipe_length2, 0 )
+        and d.video_section_data_one is null
+        and d.video_section_data_two is null
+        and d.pd_check_length is null
+        THEN 0 ELSE 3 end
+        else 0 end vedioSectionDiff,
+        case when (d.is_order is null or  d.is_order <![CDATA[ <> ]]> '否') and IFNULL( d.no_handle_length, 0 ) = IFNULL( d.pipe_length, 0 ) 	then
+        CASE
+        WHEN IFNULL( d.section_data_one, 0 ) = IFNULL( d.section_data_one2, 0 )
+        and IFNULL( d.section_data_two, 0 ) = IFNULL( d.section_data_two2, 0 )
+        and IFNULL( d.pipe_length, 0 ) = IFNULL( d.pipe_length2, 0 )
+        and d.video_section_data_one is null
+        and d.video_section_data_two is null
+        and d.pd_check_length is null
+        THEN 0 ELSE 32 end
+        else 0 end vedioSectionDiff2,
+        case when (d.is_order is null or  d.is_order <![CDATA[ <> ]]> '否') and IFNULL( d.no_handle_length, 0 ) <![CDATA[ <> ]]> IFNULL( d.pipe_length, 0 ) 	then
+        CASE
+        WHEN IFNULL( d.section_data_one, 0 ) = IFNULL( d.video_section_data_one, 0 )
+        and IFNULL( d.section_data_two, 0 ) = IFNULL( d.video_section_data_two, 0 )
+        and IFNULL(d.pd_check_length,0)+IFNULL(d.no_handle_length,0)=IFNULL(d.pipe_length,0)
+        THEN 0 ELSE 33 end
+        else 0 end vedioSectionDiff3,
         d.*
         FROM
         (

DataCheck/src/main/resources/customMapper/DetectAndHandleMapper.xml

@@ -48,7 +48,8 @@
 
         <result property="messageNotice.dataExist" column="data_exist"></result>
         <result property="messageNotice.sumHandleAndPdDiff" column="sumHandleAndPdDiff"></result>
-        <result property="messageNotice.vedioSectionDiff" column="vedioSectionDiff"></result>
+        <result property="messageNotice.sumHandleAndPdDiff2" column="sumHandleAndPdDiff2"></result>
+        <result property="messageNotice.sumHandleAndPdDiff3" column="sumHandleAndPdDiff3"></result>
 
 
     </resultMap>
@@ -58,7 +59,7 @@
         (
         SELECT
         e.*,
-        e.vedioSectionDiff+e.sumHandleAndPdDiff+e.data_exist exe_Num
+        e.sumHandleAndPdDiff + e.sumHandleAndPdDiff2+ e.sumHandleAndPdDiff3 + e.data_exist exe_Num
         FROM
         (
         SELECT
@@ -81,8 +82,33 @@
         )
         END end_code,
         CASE WHEN d.id IS NOT NULL AND d.id2 IS NOT NULL THEN 0 ELSE ( CASE WHEN d.id IS NULL THEN 9999 ELSE 9998 END ) END data_exist,
-        case when IFNULL(d.section_data_one1,0) =IFNULL(d.video_section_data_one2,0) THEN 0 else 3 end vedioSectionDiff,
-        case when IFNULL(d.pd_check_length2,0)+IFNULL(d.no_handle_length2,0)=IFNULL(d.pipe_length1,0) then 0 else 4 end sumHandleAndPdDiff,
+        case when d.is_order='否'	then
+        CASE
+        WHEN IFNULL( d.section_data_one1, 0 ) = IFNULL( d.section_data_one2, 0 )
+        and IFNULL( d.section_data_two1, 0 ) = IFNULL( d.section_data_two2, 0 )
+        and IFNULL( d.pipe_length1, 0 ) = IFNULL( d.pipe_length2, 0 )
+        and d.video_section_data_one2 is null
+        and d.video_section_data_two2 is null
+        and d.pd_check_length2 is null
+        THEN 0 ELSE 4 end
+        else 0 end sumHandleAndPdDiff,
+        case when (d.is_order is null or  d.is_order !='否') and IFNULL( d.no_handle_length2, 0 ) = IFNULL( d.pipe_length1, 0 ) 	then
+        CASE
+        WHEN IFNULL( d.section_data_one1, 0 ) = IFNULL( d.section_data_one2, 0 )
+        and IFNULL( d.section_data_two1, 0 ) = IFNULL( d.section_data_two2, 0 )
+        and IFNULL( d.pipe_length1, 0 ) = IFNULL( d.pipe_length2, 0 )
+        and d.video_section_data_one2 is null
+        and d.video_section_data_two2 is null
+        and d.pd_check_length2 is null
+        THEN 0 ELSE 42 end
+        else 0 end sumHandleAndPdDiff2,
+        case when (d.is_order is null or  d.is_order !='否') and IFNULL( d.no_handle_length2, 0 ) != IFNULL( d.pipe_length1, 0 ) 	then
+        CASE
+        WHEN IFNULL( d.section_data_one1, 0 ) = IFNULL( d.video_section_data_one2, 0 )
+        and IFNULL( d.section_data_two1, 0 ) = IFNULL( d.video_section_data_two2, 0 )
+        and IFNULL(d.pd_check_length2,0)+IFNULL(d.no_handle_length2,0)=IFNULL(d.pipe_length1,0)
+        THEN 0 ELSE 43 end
+        else 0 end sumHandleAndPdDiff3,
         d.*
         FROM
         (