afsdf

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

@@ -47,7 +47,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
      * @return
      * @throws Exception
      */
-    public int addSmsResult(BigDecimal orderId) throws Exception {
+    public int addSmsResult(BigDecimal orderId,String content) throws Exception {
         //新增短信实绩
         TmstruckSmsRusult tmstruckSmsRusult=new TmstruckSmsRusult();
         tmstruckSmsRusult.setResultId(tmstruckSmsRusultMapper.selectMaxId());
@@ -55,7 +55,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
         BigDecimal resultTotalId = utilsMapper.getTotalIdByOrderId(orderId);
         tmstruckSmsRusult.setTotalResultId(resultTotalId);
         tmstruckSmsRusult.setResultSendingTime(new Date());
-        tmstruckSmsRusult.setResultSmsContent("【达州钢铁】您好!您在达钢购买的钢材已发车.欲知详情，请前往https://wl.dasteel.cn:32322/views/#/地址，浏览车辆实时运输状态。退订");
+        tmstruckSmsRusult.setResultSmsContent(content);
         //新增短信实绩
         tmstruckSmsRusult.setInsertTime(new Date());
         tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
@@ -79,7 +79,7 @@ public class TmstruckSmsRusultServiceImpl  implements ITmstruckSmsRusultService
             String code = (String) hashMap.get("code");
             System.out.println(hashMap.get("code"));
             if("SUCCESS".equals(code)){
-                return addSmsResult(orderId);
+                return addSmsResult(orderId,content);
             }else{
                 return 0;
             }

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

@@ -27,10 +27,10 @@ public class ColumnDataUtil {
 
     public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list,List<Map<String,Object>> data) {
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
-        for (Map<String, Object> columnData : columnDataList) {
-            //每个表头字段的过滤条件
-            columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
-        }
+        //for (Map<String, Object> columnData : columnDataList) {
+        //    //每个表头字段的过滤条件
+        //    columnData.put("filters", setListMap(data, columnData.get("prop").toString()));
+        //}
         PageListAdd pageList = new PageListAdd(data);
         pageList.setColumnData(columnDataList);
         return pageList;

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

@@ -1002,6 +1002,8 @@
         on tlfr2.result_total_id = ttr.result_total_id
       left join rms_gatepost rg4
         on tlfr2.gatepost_id = rg4.gatepost_id
+      left join RMS_TRANS_RANGE RTR
+        on RTR.TRANS_RANGE_ID = AIR.LINE_ID
      where oo.order_type in (10,20)
        and ter1.segmen_sqe = 1
        and twr1.tare_segment_sqe = 2
@@ -1361,7 +1363,7 @@
         LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
         LEFT JOIN AMSTRUCK_SPORADIC_ORDER ASO ON ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
         LEFT JOIN RMS_SUPPLIER RS ON RS.SUPPLIER_ID = ASO.SEND_UNIT_ID
-        LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.SPORADIC_ORDER_ID
+        LEFT JOIN RMS_CONSIGNEE RCE ON RCE.CONSIGNEE_ID = ASO.RECEIVE_UNIT_ID
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
         LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER1  ON TER1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN RMS_GATEPOST RG1 ON RG1.GATEPOST_ID = TER1.GATEPOST_ID