'统计报表'

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

@@ -80,14 +80,17 @@ public class StatisticalReportController extends BaseRESTfulController {
                                        Integer pageSize,
                                        String startTime,
                                        String endTime,
-                                       String carrierSsoId
+                                       String carrierSsoId,
+                                          Integer orderType,
+                                          Integer shipperId
     ){
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId)){
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
-
+        mapValue.put("orderType",orderType);
+        mapValue.put("shipperId",shipperId);
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         List<Map<String, Object>> allReport =  statisticalReportService.getAllSaleReportNum(mapValue);
         PageHelper.startPage(pageNum, pageSize);

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

@@ -319,82 +319,82 @@
     <!--  查询销售统计报表  -->
     <select id="getAllSaleReport" parameterType="java.util.Map" resultType="java.util.Map">
         select
-               *
+        *
         from (
-                 select DISTINCT OO.ORDER_NUMBER              "orderNumber",
-                        RC.CAPACITY_NUMBER           "capacityNumber",
-                        TER.RESULT_ENTRY_GATE_TIME   "resultEntryGateTime",
-                        TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
-                        TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
-                        TLR.RESULT_LOAD_END_TIME     "resultLoadEndTime",
-                        RW.WAREHOUSE_NAME            "warehouseName",
-                        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-                        TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
-                        TWR.RESULT_NET_WEIGHT        "resultNetWeight",
-                        TLFR.RESULT_OUT_GATE_TIME    "resultOutGateTime",
-                        RTCMAO.TRUCK_CALCULATE_NUMBER       "maoCalculate",
-                        RTCPI.TRUCK_CALCULATE_NUMBER        "piCalculate",
-                        RGEN.GATEPOST_NAME                  "enGatepostName",
-                        RGOUT.GATEPOST_NAME                 "outGatepostName",
-                        RCON.CONSIGNEE_COMPANY_NAME         "receiveName",
-                        RS.SUPPLIER_NAME                    "sendName",
-                        RM.MATERIAL_NAME                     "materialName",
-                        TLR.INSERT_UPDATE_REMARK             "materialRemark",
-                        ASO.SALE_NUMBER                      "saleNumber",
-                        TLR.CASE_NUMBER                      "caseNumber",
-                        RC2.CARRIER_NAME                     "carrierName",
-                        CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
-                 from OMSTRUCK_ORDER OO
-                          left join AMS_SALE_ORDER_MATERIAL ASOM
-                               on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-                          left join AMS_DISPATCH_SALE_ORDER ADSO
-                               on ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
-                          left join RMS_CARRIER RC2
-                               on RC2.CARRIER_ID = ADSO.CARRIER_ID
-                          left join AMS_SALE_ORDER ASO
-                               on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
-                          left join RMS_CONSIGNEE RCON
-                               on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
-                          left join RMS_SUPPLIER RS
-                               on RS.SUPPLIER_ID = ASO.SHIPPER_ID
-                          join TMSTRUCK_TOTAL_RESULT TTR
-                               on TTR.ORDER_ID = OO.ORDER_ID
-                          join TMSTRUCK_LOAD_RESULT TLR
-                               on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join RMS_WAREHOUSE RW
-                               on RW.WAREHOUSE_ID = TLR.LOADING_ID
-                          join TMSTRUCK_WEIGHT_RESULT TWR
-                               on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join RMS_TRUCK_CALCULATE RTCMAO
-                               on TWR.RESULT_GROSS_PLACE_ID = RTCMAO.TRUCK_CALCULATE_ID
-                          left join RMS_TRUCK_CALCULATE RTCPI
-                               on TWR.RESULT_TARE_PLACE_ID = RTCPI.TRUCK_CALCULATE_ID
-                          join TMSTRUCK_ENFACTORY_RESULT TER
-                               on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join RMS_GATEPOST RGEN
-                               on RGEN.GATEPOST_ID = TER.GATEPOST_ID
-                          join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-                               on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                          left join RMS_GATEPOST RGOUT
-                               on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
-                          join RMS_CAPACITY RC
-                               on RC.CAPACITY_ID = OO.CAPACITY_ID
-                          join OMSTRUCK_ORDER_MATERIAL OOM
-                               on OOM.ORDER_ID = OO.ORDER_ID
-                          join RMS_MATERIAL RM
-                               on RM.MATERIAL_ID = OOM.MATERIAL_ID
-                 where OO.ORDER_TYPE in (1, 2)
-                          <if test="carrierSsoId != null">
-                              and RC2.CARRIER_SSO_ID = #{carrierSsoId}
-                          </if>
-                          <if test="oneDate != null">
-                              and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
-                          </if>
-                          <if test="startDate != null">
-                              and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
-                              and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_GROSS_WEIGHT_TIME
-                          </if>
-             )
+        select DISTINCT OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
+        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
+        TLR.RESULT_LOAD_END_TIME "resultLoadEndTime",
+        RW.WAREHOUSE_NAME "warehouseName",
+        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        TWR.RESULT_NET_WEIGHT "resultNetWeight",
+        TLFR.RESULT_OUT_GATE_TIME "resultOutGateTime",
+        RTCMAO.TRUCK_CALCULATE_NUMBER "maoCalculate",
+        RTCPI.TRUCK_CALCULATE_NUMBER "piCalculate",
+        RGEN.GATEPOST_NAME "enGatepostName",
+        RGOUT.GATEPOST_NAME "outGatepostName",
+        RCON.CONSIGNEE_COMPANY_NAME "receiveName",
+        RS.SUPPLIER_NAME "sendName",
+        RM.MATERIAL_NAME "materialName",
+        TLR.INSERT_UPDATE_REMARK "materialRemark",
+        ASO.SALE_NUMBER "saleNumber",
+        TLR.CASE_NUMBER "caseNumber",
+        RC2.CARRIER_NAME "carrierName",
+        CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
+        from TMSTRUCK_WEIGHT_RESULT TWR
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join AMS_SALE_ORDER_MATERIAL ASOM
+        on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        left join AMS_DISPATCH_SALE_ORDER ADSO
+        on ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        left join RMS_CARRIER RC2
+        on RC2.CARRIER_ID = ADSO.CARRIER_ID
+        left join AMS_SALE_ORDER ASO
+        on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        left join RMS_CONSIGNEE RCON
+        on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = ASO.SHIPPER_ID
+        join TMSTRUCK_LOAD_RESULT TLR
+        on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        and TLR.MATERIAL_ID = TWR.MATERIAL_ID
+        left join RMS_WAREHOUSE RW
+        on RW.WAREHOUSE_ID = TLR.LOADING_ID
+        left join RMS_TRUCK_CALCULATE RTCMAO
+        on TWR.RESULT_GROSS_PLACE_ID = RTCMAO.TRUCK_CALCULATE_ID
+        left join RMS_TRUCK_CALCULATE RTCPI
+        on TWR.RESULT_TARE_PLACE_ID = RTCPI.TRUCK_CALCULATE_ID
+        join TMSTRUCK_ENFACTORY_RESULT TER
+        on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_GATEPOST RGEN
+        on RGEN.GATEPOST_ID = TER.GATEPOST_ID
+        join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_GATEPOST RGOUT
+        on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
+        join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = TWR.MATERIAL_ID
+        WHERE OO.ORDER_TYPE = #{orderType}
+        AND ASO.SHIPPER_ID = #{shipperId}
+        <if test="carrierSsoId != null">
+            and RC2.CARRIER_SSO_ID = #{carrierSsoId}
+        </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_GROSS_WEIGHT_TIME
+        </if>
+        )
         <where>
             <if test="orderNumber != null">
                 <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
@@ -478,7 +478,7 @@
             <if test="resultGrossWeightTime != null">
                 and
                 <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
-                        "resultGrossWeightTime" like '%${item}%'
+                    "resultGrossWeightTime" like '%${item}%'
                 </foreach>
             </if>
             <if test="resultGrossWeight != null">