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

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

@@ -265,6 +265,7 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         HashSet<Map<String,Object>> filteraddressPlace = new HashSet<>();
         HashSet<Map<String,Object>> filtermaterialSpe = new HashSet<>();
         HashSet<Map<String,Object>> filterSaleRemark = new HashSet<>();
+        HashSet<Map<String,Object>> filterTruckRemark = new HashSet<>();
         int totalNumber = 0;
         for (int j = 0; j < saleSteelReport.size();j++) {
             Map<String,Object> stringObjectMap = saleSteelReport.get(j);
@@ -320,6 +321,11 @@ public class StatisticalReportImpl implements IStatisticalReportService {
             filterSaleRemarkMap.put("text",stringObjectMap.get("saleRemark"));
             filterSaleRemarkMap.put("value",stringObjectMap.get("saleRemark"));
             filterSaleRemark.add(filterSaleRemarkMap);
+            //备注筛选
+            Map<String,Object> filterTruckRemarkMap = new HashMap<>();
+            filterTruckRemarkMap.put("text",stringObjectMap.get("truckRemark"));
+            filterTruckRemarkMap.put("value",stringObjectMap.get("truckRemark"));
+            filterTruckRemark.add(filterTruckRemarkMap);
             totalNumber += Integer.parseInt(stringObjectMap.get("materialNum").toString());
             String capacityNumbers= (String) stringObjectMap.get("capacityNumbers");
             //确认是否有多个收货单位
@@ -367,6 +373,7 @@ public class StatisticalReportImpl implements IStatisticalReportService {
             saleSteelReport.get(0).put("filterCapacityList",filterCapacityList);
             saleSteelReport.get(0).put("filterCarrierList",filterCarrierList);
             saleSteelReport.get(0).put("filterSaleRemark",filterSaleRemark);
+            saleSteelReport.get(0).put("filterTruckRemark",filterTruckRemark);
 
         }
         return saleSteelReport;

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

@@ -2170,7 +2170,10 @@
                     </foreach>
                     </if>
                     <if test="carrierNames != null">
-                        and R_CARRIER.CARRIER_ABBREVIATION like #{carrierNames}
+                        and (CASE WHEN ASO.SALE_ORDER_ISSELF_MENTION = '是'
+                        THEN '自提'
+                        ELSE R_CARRIER.CARRIER_ABBREVIATION
+                        END) like #{carrierNames}
                     </if>
                     <if test="carrierList != null ">
                         and <foreach collection="carrierList" item="item" open="(" separator="or" close=")">
@@ -2253,6 +2256,11 @@
                         ASO.sale_remark like '%${item}%'
                     </foreach>
                     </if>
+                    <if test="truckRemarkList != null">
+                        and <foreach collection="truckRemarkList" item="item" open="(" separator="or" close=")">
+                        ASOM.TRUCK_REMARK like '%${item}%'
+                    </foreach>
+                    </if>
                     <if test="consigneeLoginName != null">
                         and RC.CONSIGNEE_COMPANY_NAME LIKE '%${consigneeLoginName}%'
                     </if>

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

@@ -723,7 +723,7 @@
     RCT.CAPACITY_TYPE_NAME "capacityTypeName",
     TTTR.result_balance_time   "aboutTime",
     TTTR.INSERT_TIME "insertTime",
-    RP.PERSONNEL_NAME  "personName",
+    SU.USER_NAME  "personName",
     (
     SELECT TTTR2.RESULT_TIME
     FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
@@ -767,8 +767,8 @@
     ON TTR.ORDER_ID=OO.ORDER_ID
     LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
     ON TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
-    LEFT JOIN RMS_PERSONNEL RP
-    ON RP.PERSONNEL_SSO_ID=TTTR.INSERT_USERNAME
+    LEFT JOIN SSO.SYS_USER SU
+    ON SU.USER_ID =TTTR.INSERT_USERNAME
     LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
     ON TTTR.RESULT_UOM_ID=RUOM.UNIT_OF_MEASURE_ID
     LEFT JOIN RMS_CAPACITY RC