'222'

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

@@ -638,35 +638,34 @@ public class StatisticalReportController extends BaseRESTfulController {
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getSaleSteelReport")
-    public RESTfulResult getSaleSteelReport(@RequestBody(required=false) Map<String,Object> mapValue,
-                                          Integer apiId,
-                                          Integer pageNum,
-                                          Integer pageSize,
+    public RESTfulResult getSaleSteelReport(@RequestBody(required=false) Map<String,Object> map,
                                           String startTime,
                                           String endTime,
                                           String carrierSsoId,
                                           String receiveName,
                                           String materialName,
                                           String specification,
-                                          String remark
+                                          String remark,
+                                            String saler
     ){
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId) && carrierSsoId != null){
-                mapValue.put("carrierSsoId", carrierSsoId);
+                map.put("carrierSsoId", carrierSsoId);
             }
         }
         if (receiveName != null && !"null".equals(receiveName)) {
-            mapValue.put("receivName","%" + receiveName + "%");
+            map.put("receivName","%" + receiveName + "%");
         }
-        if (materialName != null && !"".equals(materialName) && !"null".equals(materialName)) {
-            mapValue.put("remark","%" + materialName + "%");
+        if (remark != null && !"".equals(remark) && !"null".equals(remark)) {
+            map.put("remark","%" + remark + "%");
+        }
+        if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            map.put("saler",saler);
         }
-        PageHelper.startPage(pageNum, pageSize);
         //分页数据
-        List<Map<String, Object>> report = statisticalReportService.getSaleSteelReport(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData5(apiId, null, report);
-        return success(pageList);
+        List<Map<String, Object>> report = statisticalReportService.getSaleSteelReport(map);
+        return success(report);
     }
 
 }

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

@@ -253,6 +253,16 @@ public class StatisticalReportImpl implements IStatisticalReportService {
 
     @Override
     public List<Map<String, Object>> getSaleSteelReport(Map<String, Object> mapValue) {
-        return statisticalReportMapper.getSaleSteelReport(mapValue);
+        List<Map<String, Object>> saleSteelReport = statisticalReportMapper.getSaleSteelReport(mapValue);
+        for (Map<String, Object> map : saleSteelReport) {
+            Object capacityNo = map.get("capacityNo");
+            if (capacityNo == null) {
+                map.put("isNull","true");
+            }
+            else {
+                map.put("isNull","false");
+            }
+        }
+        return saleSteelReport;
     }
 }

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -257,4 +257,34 @@ public class DataChange {
         map.put("startDate", dayStartTime + " 00:00:00");
         map.put("endDate", dayEndTime + " 00:00:00");
     }
+
+    /**
+     * 只支持两个时间查询
+     * @Author TXF
+     * @Date 2022/1/15 9:08
+     * @param startTime
+     * @param endTime
+     * @param sdf
+     * @return
+     **/
+    public static void queryDataByDateTimeYestDay(String startTime, String endTime, Map<String, Object> map,SimpleDateFormat sdf){
+        SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
+        if (startTime != null && !"null".equals(startTime) && endTime != null && !"null".equals(endTime)) {
+            map.put("startDate", sdf.format(new Date(Long.parseLong(startTime))));
+            map.put("endDate", sdf.format(new Date(Long.parseLong(endTime))));
+        }
+        //如果开始时间和结束时间有且只有一个为空 则只查那天的数据
+        else if((startTime != null && !"null".equals(startTime)) || (endTime != null && !"null".equals(endTime))){
+            if(startTime != null && !"null".equals(startTime)){
+                queryDataByTwoDateSon(map, startTime, sdfDate);
+            }
+            if(endTime != null && !"null".equals(endTime)){
+                queryDataByTwoDateSon(map, endTime, sdfDate);
+            }
+        }else {
+            //如果两者时间都为空，则查询当天和昨天数据
+            String yesDate = sdfDate.format(new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24));
+            map.put("oneDate", yesDate + " 08:00:00");
+        }
+    }
 }

src/main/resources/application-prod.yml

@@ -26,7 +26,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:

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

@@ -1861,8 +1861,10 @@
                     ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
                     RS.SHIPPER_NAME "shipperName",
                     RCA.CAPACITY_NUMBER "capacityNo",
+                    OO.CAPACITY_ID "capacityId",
                     ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
                     ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+                    OO.ORDER_LINE_SEQUENCE "lineSequence",
                     ASO.SALE_ORDER_ISSELF_MENTION "isSelfMention",
                     RSR.SALER_NAME "saler",
                     RM.MATERIAL_NAME || RM.MATERIAL_MODEL "materialName",
@@ -1873,6 +1875,7 @@
                     RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
                     RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
                     OO.ORDER_LINE_SEQUENCE "lineSqe",
+                    OO.DRIVER_TEL "capacityTel",
                     TWR.RESULT_GROSS_WEIGHT "grossWeight",
                     TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
                     TWR.RESULT_TARE_WEIGHT       "tareWeight",
@@ -1895,7 +1898,7 @@
                                             null, '运单未派发') "orderStatus"
                     FROM AMS_SALE_ORDER ASO
                     LEFT JOIN RMS_CONSIGNEE RC
-                    ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                              ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
                     LEFT JOIN RMS_SHIPPER RS
                               ON RS.SHIPPER_ID = ASO.SHIPPER_ID
                     LEFT JOIN RMS_SALER RSR
@@ -1948,6 +1951,12 @@
                         and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <=  ASOM.SALE_DATE_OF_RECEIPT
                         and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASOM.SALE_DATE_OF_RECEIPT
                     </if>
+                    <if test="remark != null" >
+                        and RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
+                    </if>
+                    <if test="saler != null">
+                        and RSR.SALER_NAME = #{saler}
+                    </if>
                     order by ASO.SALE_ORDER_ID DESC, OO.ORDER_ID  DESC
                      )
                     <where>