修改

pom.xml

@@ -163,8 +163,8 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>MEASURE_JSON_DATA</param>-->
-<!--                        <param>DIL_TABLE_COLUMN_ROLE</param>-->
-                        <param>DIL_CAPACITY_TIMES</param>
+                        <param>DIL_ROLE_ORGCODE_TABLE</param>
+<!--                        <param>DIL_CAPACITY_TIMES</param>-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -2146,7 +2146,7 @@
                     <if test="capacityNum != null">
                         and  RCA.CAPACITY_NUMBER like #{capacityNum}
                     </if>
-                    <if test="capacityList != null">
+                    <if test="capacityList != null and capacityList.size > 0">
                         and <foreach collection="capacityList" item="item" open="(" separator="or" close=")">
                         <if test="item == null">
                             RCA.CAPACITY_NUMBER is null
@@ -2164,7 +2164,7 @@
                     <if test="consigneeNames != null">
                         and RC.CONSIGNEE_COMPANY_NAME like #{consigneeNames}
                     </if>
-                    <if test="consigneeNameList != null">
+                    <if test="consigneeNameList != null and consigneeNameList.size > 0">
                       and <foreach collection="consigneeNameList" item="item" open="(" separator="or" close=")">
                          RC.CONSIGNEE_COMPANY_NAME like '%${item}%'
                     </foreach>
@@ -2175,7 +2175,7 @@
                         ELSE R_CARRIER.CARRIER_ABBREVIATION
                         END) like #{carrierNames}
                     </if>
-                    <if test="carrierList != null ">
+                    <if test="carrierList != null and  carrierList.size > 0">
                         and <foreach collection="carrierList" item="item" open="(" separator="or" close=")">
                           <if test="item == null">
                               R_CARRIER.CARRIER_ABBREVIATION is null
@@ -2188,17 +2188,17 @@
                         </if>
                     </foreach>
                     </if>
-                    <if test="materialNameList != null">
+                    <if test="materialNameList != null and materialNameList.size > 0">
                         and <foreach collection="materialNameList" item="item" open="(" separator="or" close=")">
                         RM.MATERIAL_NAME like '%${item}%'
                     </foreach>
                     </if>
-                    <if test="saleAreaList != null">
+                    <if test="saleAreaList != null and saleAreaList.size > 0">
                         and <foreach collection="saleAreaList" item="item" open="(" separator="or" close=")">
                         RSA.AREA_NAME like '%${item}%'
                     </foreach>
                     </if>
-                    <if test="orderStatusList != null">
+                    <if test="orderStatusList != null and orderStatusList.size > 0">
                         and <foreach collection="orderStatusList" item="item" open="(" separator="or" close=")">
                         (CASE
                         when OO.ORDER_STATUS =2
@@ -2227,18 +2227,18 @@
                         END) like '%${item}%'
                     </foreach>
                     </if>
-                    <if test="addressPlaceList != null">
+                    <if test="addressPlaceList != null and addressPlaceList.size > 0">
                         and <foreach collection="addressPlaceList" item="item" open="(" separator="or" close=")">
                         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
                         RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS like '%${item}%'
                     </foreach>
                     </if>
-                    <if test="materialSpeList != null">
+                    <if test="materialSpeList != null and materialSpeList.size > 0 ">
                         and <foreach collection="materialSpeList" item="item" open="(" separator="or" close=")">
                         RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' like '%${item}%'
                     </foreach>
                     </if>
-                    <if test="saleOrderStatusList != null">
+                    <if test="saleOrderStatusList != null and saleOrderStatusList.size > 0">
                         and <foreach collection="saleOrderStatusList" item="item" open="(" separator="or" close=")">
                         (CASE WHEN
                         ASO.DELETED = 2 then '关闭'
@@ -2251,12 +2251,12 @@
                         ) like '%${item}%'
                     </foreach>
                     </if>
-                    <if test="saleRemarkList != null">
+                    <if test="saleRemarkList != null and saleRemarkList.size > 0">
                         and <foreach collection="saleRemarkList" item="item" open="(" separator="or" close=")">
                         ASO.sale_remark like '%${item}%'
                     </foreach>
                     </if>
-                    <if test="truckRemarkList != null">
+                    <if test="truckRemarkList != null and truckRemarkList.size > 0">
                         and <foreach collection="truckRemarkList" item="item" open="(" separator="or" close=")">
                         ASOM.TRUCK_REMARK like '%${item}%'
                     </foreach>

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

@@ -720,6 +720,13 @@
     OO.ORDER_ID "orderId",
     OO.ORDER_NUMBER "orderNumber",
     TTTR.RESULT_VALUE AS "resultTime",
+    AIR.REQUIREMENT_ESTIMATED_DURATION "planTimeDuration",
+    (CASE WHEN
+     AIR.REQUIREMENT_ESTIMATED_DURATION is null
+      then '未填写预计时长,无法比较'
+     WHEN AIR.REQUIREMENT_ESTIMATED_DURATION is NOT null
+    then (AIR.REQUIREMENT_ESTIMATED_DURATION - TTTR.RESULT_VALUE) || ''
+    end) "dValue",
     RCT.CAPACITY_TYPE_NAME "capacityTypeName",
     TTTR.result_balance_time   "aboutTime",
     TTTR.INSERT_TIME "insertTime",