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

src/main/java/com/steerinfo/dil/service/impl/StatisticalReportImpl.java

@@ -104,7 +104,7 @@ public class StatisticalReportImpl implements IStatisticalReportService {
      */
     @Override
     public List<Map<String, Object>> getSporadicSuppliesReportNum2(Map<String, Object> mapValue) {
-        return statisticalReportMapper.getSporadicSuppliesReport1(mapValue);
+        return statisticalReportMapper.getSporadicSuppliesReport2(mapValue);
     }
 
     @Override

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

@@ -168,6 +168,8 @@
                         RCON.CONSIGNEE_COMPANY_NAME         "receiveName",
                         RS.SUPPLIER_NAME                    "sendName",
                         RM.MATERIAL_NAME                     "materialName",
+                        TLR.INSERT_UPDATE_REMARK             "materialRemark",
+                        ASO.SALE_NUMBER                      "saleNumber",
                         CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
                  from OMSTRUCK_ORDER OO
                           left join AMS_SALE_ORDER_MATERIAL ASOM
@@ -232,6 +234,24 @@
                     "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
+            <if test="receiveName != null">
+                and
+                <foreach collection="receiveName" item="item" open="(" separator="or" close=")">
+                    "receiveName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialRemark != null">
+                and
+                <foreach collection="materialRemark" item="item" open="(" separator="or" close=")">
+                    "materialRemark" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="sendName != null">
+                and
+                <foreach collection="sendName" item="item" open="(" separator="or" close=")">
+                    "sendName" like '%${item}%'
+                </foreach>
+            </if>
             <if test="resultEntryGateTime != null">
                 and
                 <foreach collection="resultEntryGateTime" item="item" open="(" separator="or" close=")">
@@ -274,6 +294,12 @@
                     "resultGrossWeight" like '%${item}%'
                 </foreach>
             </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
             <if test="resultNetWeight != null">
                 and
                 <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
@@ -384,6 +410,24 @@
         </if>
         )
         <where>
+            <if test="receiveName != null">
+                and
+                <foreach collection="receiveName" item="item" open="(" separator="or" close=")">
+                    "receiveName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="sendName != null">
+                and
+                <foreach collection="sendName" item="item" open="(" separator="or" close=")">
+                    "sendName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
             <if test="orderNumber != null">
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
                     "orderNumber" like '%${item}%'
@@ -547,6 +591,24 @@
         </if>
         )
         <where>
+            <if test="receiveName != null">
+                and
+                <foreach collection="receiveName" item="item" open="(" separator="or" close=")">
+                    "receiveName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="sendName != null">
+                and
+                <foreach collection="sendName" item="item" open="(" separator="or" close=")">
+                    "sendName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
             <if test="orderNumber != null">
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
                     "orderNumber" like '%${item}%'