【功能修改】app 端:省核验人员:带核验数量修正

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dk/DkMapper.xml

@@ -18,10 +18,10 @@
             COUNT(distinct dc.ID) AS HY_NUM
         FROM
             ${pageReqVO.tableName} dp
+        LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.ID
         LEFT JOIN DELIVERY_KQXX dk ON dp.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID AND dc.DELETED = 0
         WHERE
-            dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0
+            dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0 AND dc.DELETED = 0
         <if test="pageReqVO.sheng != null and pageReqVO.sheng != ''">
             AND dk.SHENG = #{pageReqVO.sheng}
         </if>
@@ -62,9 +62,9 @@
         COUNT(distinct dc.ID) AS HY_NUM
         FROM
         DELIVERY_USERS du
+        LEFT JOIN DELIVERY_CAXX dc ON du.CA_ID = dc.ID
         LEFT JOIN DELIVERY_KQXX dk ON du.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID AND dc.DELETED = 0
-        WHERE dk.DELETED = 0 AND dk.SFZX = 0 and du.DELETED = 0
+        WHERE dk.DELETED = 0 AND dk.SFZX = 0 and du.DELETED = 0 AND dc.DELETED = 0
             <if test="pageReqVO.sheng != null and pageReqVO.sheng != ''">
                 AND dk.SHENG = #{pageReqVO.sheng}
             </if>
@@ -96,8 +96,8 @@
         COUNT(distinct dc.ID) AS HY_NUM
         FROM
         DELIVERY_BANK dp
+        LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.ID
         LEFT JOIN DELIVERY_KQXX dk ON dp.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID
         LEFT JOIN DELIVERY_USERS du ON dc.ID = du.CA_ID AND du.DELETED = 0
         WHERE
         dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0 AND dc.DELETED = 0
@@ -145,7 +145,7 @@
         FROM
             DELIVERY_KQXX dk
         LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID
-        left join DELIVERY_BANK db on dk.ID = db.KQ_ID and db.deleted = 0
+        left join DELIVERY_BANK db on DC.ID = db.CA_ID and db.deleted = 0
         LEFT JOIN DELIVERY_USERS du ON dc.ID = du.CA_ID and du.deleted = 0
         WHERE
             dk.DELETED =0 AND dc.DELETED = 0 AND dk.SFZX = 0