Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

pom.xml

@@ -163,7 +163,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>MEASURE_JSON_DATA</param>-->
-                        <param>TMSTRUCK_TOTAL_RESULT</param>
+<!--                        <param>TMSTRUCK_TOTAL_RESULT</param>-->
                     </tables>
                 </configuration>
                 <executions>

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

@@ -2228,7 +2228,7 @@
                     </if>
                     <if test="materialSpeList != null">
                         and <foreach collection="materialSpeList" item="item" open="(" separator="or" close=")">
-                        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL like '%${item}%'
+                        RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' like '%${item}%'
                     </foreach>
                     </if>
                     <if test="saleOrderStatusList != null">
@@ -2459,7 +2459,6 @@
         ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
-        and twr.SALE_MATERIAL_ID is not null
         LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
         ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
@@ -2588,7 +2587,7 @@
         </if>
         <if test="materialSpeList != null">
             and <foreach collection="materialSpeList" item="item" open="(" separator="or" close=")">
-            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL like '%${item}%'
+            RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' like '%${item}%'
         </foreach>
         </if>
         <if test="saleOrderStatusList != null">
@@ -2777,8 +2776,6 @@
         ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.SALE_MATERIAL_ID = ASM.SALE_MATERIAL_ID
-        and twr.SALE_MATERIAL_ID is not null
-        OR ( TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID AND TWR.MATERIAL_ID = RM.MATERIAL_ID and twr.sale_material_id is null )
         LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
         ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
@@ -2908,7 +2905,7 @@
         </if>
         <if test="materialSpeList != null">
             and <foreach collection="materialSpeList" item="item" open="(" separator="or" close=")">
-            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL like '%${item}%'
+            RM.MATERIAL_SPECIFICATION || '(' || RM.MATERIAL_MODEL || ')' like '%${item}%'
         </foreach>
         </if>
         <if test="saleOrderStatusList != null">