提交代码

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

@@ -32,6 +32,8 @@ public class StatisticalReportController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
+
+
     private final SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd");
 
     private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -689,6 +691,30 @@ public class StatisticalReportController extends BaseRESTfulController {
         }
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getSaleSteelReport(map);
+        for (Map<String, Object> stringObjectMap : report) {
+            String shippingAddressIds = (String) stringObjectMap.get("shippingAddressIds");
+            String capacityNumbers= (String) stringObjectMap.get("capacityNumbers");
+            //确认是否有多个收货单位
+            if (shippingAddressIds !=null && !("".equals(shippingAddressIds))){
+                String[] split = shippingAddressIds.split(",");
+                String address="";
+                for (String s : split) {
+                    String getaddress = statisticalReportService.getaddress(DataChange.dataToBigDecimal(s));
+                    address+=getaddress+",";
+                }
+                stringObjectMap.put("addressPlace",address);
+            }
+            //确认是否有多个车牌号
+            if (capacityNumbers!=null &&!("".equals(capacityNumbers))){
+                String[] split = capacityNumbers.split(",");
+                String capacityNumber="";
+                for (String s : split) {
+                    String s1 = statisticalReportService.getcapacityNumber(DataChange.dataToBigDecimal(s));
+                    capacityNumber+=s1+",";
+                }
+                stringObjectMap.put("capacityNo",capacityNumber);
+            }
+        }
         return success(report);
     }
 

src/main/java/com/steerinfo/dil/mapper/StatisticalReportMapper.java

@@ -84,4 +84,7 @@ public interface StatisticalReportMapper {
 
     List<Map<String, Object>> getSteelReportDetailsListBySmId(BigDecimal saleOrderMaterialId);
 
+    String queryAddress(BigDecimal addressid);
+
+    String queryCapacityNumber(BigDecimal capacityNumber);
 }

src/main/java/com/steerinfo/dil/service/IStatisticalReportService.java

@@ -77,5 +77,11 @@ public interface IStatisticalReportService {
     List<Map<String, Object>> getInwardSaleSteelOrder(Map<String, Object> map);
 
     Map<String,Object> getSteelReportDetailsBySmId(BigDecimal saleOrderMaterialId);
+
+    //获取收货地址
+    String getaddress(BigDecimal addressid);
+
+    //获取车牌号
+    String getcapacityNumber(BigDecimal capacitynumber);
 }
 

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

@@ -254,6 +254,8 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         return saleSteelReport;
     }
 
+
+
     @Override
     public List<Map<String, Object>> getInwardSaleSteelReport(Map<String, Object> map) {
         return statisticalReportMapper.getInwardSaleSteelReport(map);
@@ -304,4 +306,18 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         }
         return map;
     }
+
+    @Override
+    public String getaddress(BigDecimal addressid) {
+        String address = statisticalReportMapper.queryAddress(addressid);
+        return address;
+    }
+
+    @Override
+    public String getcapacityNumber(BigDecimal capacitynumber) {
+        String s = statisticalReportMapper.queryCapacityNumber(capacitynumber);
+        return s;
+    }
+
+
 }

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

@@ -1931,9 +1931,11 @@
                     TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
                     ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",
                     R_CARRIER.CARRIER_ID        "carrierId",
+                    OO.CAPACITYIDS "capacityNumbers",
                     NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
                     OO.CAN_WORK     "canwork",
                     OO.ORDER_STATUS              "carStatus",
+                    ASOM.SHIPPING_ADDRESS_IDS "shippingAddressIds",
                     DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
                                                  2,'销售已提交',
                                                  4,'财务已审批',
@@ -1987,16 +1989,16 @@
                     WHERE ASO.SALE_TYPE = 1
                           AND ASO.DELETED = 0
                           and ASM.SALE_MATERIAL_ID IS NOT NULL
-                    <if test="oneDate != null">
+                    <!--<if test="oneDate != null">
                         and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASOM.SALE_DATE_OF_RECEIPT
-                    </if>
+                    </if>-->
                     <if test="carrierSsoId != null">
                         and R_CARRIER.CARRIER_SSO_ID = #{carrierSsoId}
                     </if>
-                    <if test="startDate != null">
+                    <!--<if test="startDate != null">
                         and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASOM.SALE_DATE_OF_RECEIPT
                         and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASOM.SALE_DATE_OF_RECEIPT
-                    </if>
+                    </if>-->
                     <if test="remark != null" >
                         and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
                     </if>
@@ -2406,4 +2408,17 @@
         AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
 
+    <select id="queryAddress" resultType="java.lang.String">
+        select RRA.ADDRESS_PROVINCE||RRA.ADDRESS_DISTRICT||RRA.ADDRESS_TOWN
+        ||RRP.ADDRESS_DELIVERY_ADDRESS "realAddress"
+        from RMS_RECEIVE_PLACE RRP
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+        WHERE RRP.PLACE_ID=#{addressid}
+    </select>
+
+    <select id="queryCapacityNumber" resultType="java.lang.String">
+        select CAPACITY_NUMBER from RMS_CAPACITY
+        where CAPACITY_ID=#{capacitynumber}
+    </select>
 </mapper>