wing 3 سال پیش
والد
کامیت
6fe55b62b8

+ 5 - 1
src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -82,13 +82,17 @@ public class StatisticalReportController extends BaseRESTfulController {
                                        String endTime,
                                        String carrierSsoId,
                                           Integer orderType,
-                                          Integer shipperId
+                                          Integer shipperId,
+                                          String receivName
     ){
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId)){
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
+        if (receivName != null && !"null".equals(receivName)) {
+            mapValue.put("receivName","%" + receivName + "%");
+        }
         mapValue.put("orderType",orderType);
         mapValue.put("shipperId",shipperId);
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据

+ 3 - 0
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -396,6 +396,9 @@
         <if test="carrierSsoId != null">
             and RC2.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
+        <if test="receivName != null">
+            and RCON.CONSIGNEE_COMPANY_NAME like #{receivName}
+        </if>
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
         </if>