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

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -88,7 +88,8 @@ public class StatisticalReportController extends BaseRESTfulController {
                                           Integer orderType,
                                           Integer shipperId,
                                           String receiveName,
-                                          String materialName
+                                          String materialName,
+                                          String wareHouse
     ){
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         if(carrierSsoId != null){
@@ -102,6 +103,9 @@ public class StatisticalReportController extends BaseRESTfulController {
         if (materialName != null && !"".equals(materialName) && !"null".equals(materialName)) {
             mapValue.put("remark","%" + materialName + "%");
         }
+        if (wareHouse != null && !"".equals(wareHouse) && !"null".equals(wareHouse)) {
+            mapValue.put("wareHouse","%" + wareHouse + "%");
+        }
         mapValue.put("orderTypee",orderType);
         mapValue.put("shipperId",shipperId);
         PageHelper.startPage(pageNum, pageSize);

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

@@ -362,7 +362,8 @@
         TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
         TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
         RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialCode",
-        RM.MATERIAL_NAME  || TLR.INSERT_UPDATE_REMARK || ASM.SALE_WAREHOUSE || RW.WAREHOUSE_NAME "likeRemark"
+        RM.MATERIAL_NAME  || TLR.INSERT_UPDATE_REMARK "likeRemark",
+        ASM.SALE_WAREHOUSE || RW.WAREHOUSE_NAME "wareHouse"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -439,6 +440,9 @@
             <if test="remark != null">
                and "likeRemark" like #{remark}
             </if>
+            <if test="wareHouse != null">
+                and "wareHouse" like #{wareHouse}
+            </if>
             <if test="materialName != null">
                 and
                 <foreach collection="materialName" item="item" open="(" separator="or" close=")">