Merge branch 'master' of https://gitee.com/antai-wuliu/ANTAI-API

src/main/resources/application-prod.yml

@@ -27,7 +27,7 @@ openfeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.90.202:80}
   AmsFeign:
     url: ${AMSFEIGN_URL:172.16.90.202:8000}
-#    url: ${RMSFEIGN_URL:localhost:8079}
+#    url: ${AMSFEIGN_URL:localhost:8079}
   TmsFeign:
 #    url: ${TMSFEIGN_URL:172.16.90.202:8000}
     url: ${RMSFEIGN_URL:localhost:8086}

src/main/resources/com/steerinfo/dil/mapper/CommonMapper.xml

@@ -23,25 +23,35 @@
             <foreach collection="roleCodes" index="index" item="item" separator="or" close=")" open="(">
                 <choose>
                     <when test="item == 'chengYunShang'">
+                        (
                         "carrierId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
-                            #{item.companyId}
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                            SELECT
+                            COMPANY_ID
+                            FROM
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID =
+                            #{item.companyId})
                         </foreach>
-                    </when>
-                    <when test="item == 'shippingCompany'">
+                        OR
                         "shippingCompanyId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
-                            #{item.companyId}
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                            SELECT
+                            COMPANY_ID
+                            FROM
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID = #{item.companyId})
                         </foreach>
-                    </when>
-                    <when test="item == 'receivingCompany'">
+                        OR
                         "receivingCompanyId"
                         in
-                        <foreach collection="dilCompanyList" open="(" close=")" separator="," item="item" index="index">
-                            #{item.companyId}
+                        <foreach collection="dilCompanyList" open="(" close=")" separator=" UNION " item="item" index="index">
+                            SELECT
+                            COMPANY_ID
+                            FROM
+                            RMS_COMPANY WHERE COMPANY_NAME IN ( SELECT COMPANY_NAME FROM RMS_COMPANY WHERE COMPANY_ID = #{item.companyId})
                         </foreach>
+                        )
                     </when>
                     <when test="item == 'businessCompany'">
                         "businessCompanyId"

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -1599,6 +1599,9 @@
         RP.PERSONNEL_PHONE "personnelPhone",
         RP.IDENTITY_CARD "personnelCard",
         RP.INNNER_CODE "innerCode",
+        (
+        select count(*) from oms_trans_order oto where oto.driver_id = rp.personnel_id or oto.driver_id2 = rp.personnel_id
+        ) "orders",
         to_char(RP.SSO_ID) "ssoId",
         CASE WHEN RC.COMPANY_TYPE = '业务单位'
         THEN RC.COMPANY_ID
@@ -1640,7 +1643,6 @@
             ) T ON T."driverId" = RP .PERSONNEL_ID
         </if>
         WHERE RP.DELETED = 0
-        AND RC.COMPANY_TYPE = '承运商'
         <if test="isNC!=null">
             AND RP.SOURCE_ID IS NOT NULL
         </if>
@@ -1671,6 +1673,7 @@
         <if test="!(capacityId!=null and capacityId!='')">
             order by "personnelId" desc
         </if>
+        FETCH NEXT 10 ROWS ONLY
         )
         <if test="id!=null and id.size>0">
             UNION
@@ -1681,6 +1684,9 @@
             RP.PERSONNEL_PHONE "personnelPhone",
             RP.IDENTITY_CARD "personnelCard",
             RP.INNNER_CODE "innerCode",
+            (
+            select count(*) from oms_trans_order oto where oto.driver_id = rp.personnel_id or oto.driver_id2 = rp.personnel_id
+            ) "orders",
             to_char(RP.SSO_ID) "ssoId",
             CASE WHEN RC.COMPANY_TYPE = '业务单位'
             THEN RC.COMPANY_ID