备选交收库查询重复问题修改

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/caxx/CaxxMapper.xml

@@ -31,7 +31,7 @@
         left join
         (
                 select
-                        cx.DEPT_ID,
+                        cx.KQID,
                         cx.id cwId,
                         cx.SYNDZZC,
                         cy.JLR
@@ -46,7 +46,7 @@
                    GROUP BY  CWXX_ID) m
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
                    )  cy  on cx.id=cy.CWXX_ID
-        ) t2 on t2.DEPT_ID=cd.id
+        ) t2 on t2.KQID=ck.id
         <where>
             cd.qyxz!='10'
             and cd.DELETED=0
@@ -106,7 +106,7 @@
         left join
         (
                 select
-                        cx.DEPT_ID,
+                        cx.KQID,
                         cx.id cwId,
                         cx.SYNDZZC,
                         cy.JLR
@@ -121,7 +121,7 @@
                    GROUP BY  CWXX_ID) m
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
                    )  cy  on cx.id=cy.CWXX_ID
-        ) t2 on t2.DEPT_ID=cd.id
+        ) t2 on t2.KQID=ck.id
         left join DELIVERY_DK dk on dk.KQ_ID = ck.id
         <where>
             cd.qyxz!='10' and cd.DELETED=0
@@ -304,7 +304,7 @@
         left join
         (
                 select
-                        cx.DEPT_ID,
+                        cx.KQID,
                         cx.id cwId,
                         cx.SYNDZZC,
                         cy.JLR
@@ -319,7 +319,7 @@
                    GROUP BY  CWXX_ID) m
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
                    )  cy  on cx.id=cy.CWXX_ID
-        ) t2 on t2.DEPT_ID=cd.id
+        ) t2 on t2.KQID=ck.id
         <where>
             cd.qyxz!='10'and cd.DELETED=0
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">
@@ -584,7 +584,7 @@
         left join
         (
                 select
-                        cx.DEPT_ID,
+                        cx.KQID,
                         cx.id cwId,
                         cx.SYNDZZC,
                         cy.JLR
@@ -599,7 +599,7 @@
                    GROUP BY  CWXX_ID) m
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
                    )  cy  on cx.id=cy.CWXX_ID
-        ) t3 on t3.DEPT_ID=cd.id
+        ) t3 on t3.KQID=ck.id
         <where>
             cd.qyxz!='10' and cd.DELETED=0
             <if test="pageReqVO.dwmc!=null and pageReqVO.dwmc!=''">

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -238,7 +238,7 @@
         left join
         (
                 select
-                        cx.DEPT_ID,
+                        cx.KQID,
                         cx.id cwId,
                         cx.SYNDZZC,
                         cy.JLR
@@ -253,7 +253,7 @@
                    GROUP BY  CWXX_ID) m
                    ON d.CWXX_ID = m.CWXX_ID AND d.CN = m.maxCN
                    )  cy  on cx.id=cy.CWXX_ID
-        ) t2 on t2.DEPT_ID=cd.id
+        ) t2 on t2.KQID=ck.id
         left join
         (
         select