afdsf

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

@@ -148,6 +148,11 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         List<Map<String, Object>> inwardReportResult = statisticalReportMapper.getInwardReportResult(mapValue);
         for (Map<String,Object>inwardReport:inwardReportResult
         ) {
+            if(DataChange.dataToBigDecimal(inwardReport.get("orderType")).intValue() == 10){
+                inwardReport.put("transRange","化工园区铁专线-焦化二厂");
+            }else{
+                inwardReport.put("transRange","化工园区铁专线-达钢厂区");
+            }
             BigDecimal netWeightSecond = DataChange.dataToBigDecimal(inwardReport.get("netWeightSecond"));
             BigDecimal netWeightFirst = DataChange.dataToBigDecimal(inwardReport.get("netWeightFirst"));
             BigDecimal netTract = netWeightSecond.subtract(netWeightFirst).divide(new BigDecimal(1), 2, 4);

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

@@ -907,6 +907,7 @@
     </select>
     <select id="getInwardReportResult" resultType="java.util.LinkedHashMap">
             select * from (select oo.order_id                   "orderId",
+                                  oo.ORDER_TYPE "orderType",
            rm.material_name              "materialName",
            apo.purchase_order_no         "purchaseNo",
            rc.capacity_number            "capacityNo",