提交代码

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

@@ -407,6 +407,21 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         }
         PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getSteelTruckDetailsOrder(mapValue);
+        //查询多条数据
+        for (Map<String, Object> objectMap : columnList) {
+            String priceids = (String) objectMap.get("priceids");
+            if (priceids!=null&&!("".equals(priceids))){
+                String[] split = priceids.split(",");
+                String address1="";
+                for (String s : split) {
+                    //查询出运输订单的行
+                    Map<String, Object> queryaddress = bmstruckDetailsOrderMapper.queryaddress(new BigDecimal(s));
+                    String address = bmstruckDetailsOrderMapper.queryaddress1((BigDecimal) queryaddress.get("placeid"));
+                    address1+=address+",";
+                }
+                objectMap.put("realAddress",address1);
+            }
+        }
         List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
         int i=0;
         for (Map<String, Object> columnData : columnDataList) {
@@ -429,7 +444,7 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         }
         PageListAdd pageList = new PageListAdd(columnList);
         pageList.setColumnData(columnDataList);
-        //PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(pageList);
     }
 

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

@@ -1990,7 +1990,8 @@
                         rsa.area_name "areaName",
                         aso.sale_order_receive_customer "receiveMoneyCus",
                         ASM.EAS_PRIMARY_ID "easPrimaryId",
-                        oo.ORDER_ISSUE_TIME "orderissuetime"
+                        oo.ORDER_ISSUE_TIME "orderissuetime",
+                        bdo.PRICEIDS  "priceids"
                         FROM
                         BMSTRUCK_DETAILS_ORDER bdo
                         JOIN TMSTRUCK_WEIGHT_RESULT twr ON twr.WEIGHT_TASK_RESULT_ID = bdo.WEIGHT_TASK_RESULT_ID
@@ -2020,20 +2021,131 @@
                             and rc.capacity_number||rco.consignee_company_name
                             ||RC2.Carrier_Abbreviation||RRA.ADDRESS_PROVINCE
                             || RRA.ADDRESS_DISTRICT ||RRA.ADDRESS_TOWN
-                            || RRP.ADDRESS_DELIVERY_ADDRESS like #{con}
+                            || RRP.ADDRESS_DELIVERY_ADDRESS||rsa.area_name like #{con}
                         </if>
                          <if test="carrierId != null">
                              and RC2.CARRIER_ID = #{carrierId}
                          </if>
-                        <if test="oneDate != null">
+                        <!--<if test="oneDate != null">
                             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= bdo.INSERT_TIME
                         </if>
                         <if test="startDate != null">
                             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= bdo.INSERT_TIME
                             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= bdo.INSERT_TIME
-                        </if>
+                        </if>-->
                         order by oo.order_id desc
             )
+            <where>
+                <if test="preparationDate!= null">
+                    and
+                    <foreach collection="preparationDate" item="item" open="(" separator="or" close=")">
+                        "preparationDate" like '%${item}%'
+                    </foreach>
+                </if>
+            <if test="carrierName!= null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+                <if test="capacityNumber!= null">
+                    and
+                    <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                        "capacityNumber" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="realAddress!= null">
+                    and
+                    <foreach collection="realAddress" item="item" open="(" separator="or" close=")">
+                        "realAddress" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="companyName!= null">
+                    and
+                    <foreach collection="companyName" item="item" open="(" separator="or" close=")">
+                        "companyName" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="priceValue!= null">
+                    and
+                    <foreach collection="priceValue" item="item" open="(" separator="or" close=")">
+                        "priceValue" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="detailsAmount!= null">
+                    and
+                    <foreach collection="detailsAmount" item="item" open="(" separator="or" close=")">
+                        "detailsAmount" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="companyName!= null">
+                    and
+                    <foreach collection="companyName" item="item" open="(" separator="or" close=")">
+                        "companyName" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="materialName!= null">
+                    and
+                    <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                        "materialName" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="materialSpa!= null">
+                    and
+                    <foreach collection="materialSpa" item="item" open="(" separator="or" close=")">
+                        "materialSpa" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="materialNum!= null">
+                    and
+                    <foreach collection="materialNum" item="item" open="(" separator="or" close=")">
+                        "materialNum" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="theoryWeight!= null">
+                    and
+                    <foreach collection="theoryWeight" item="item" open="(" separator="or" close=")">
+                        "theoryWeight" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="resultNetWeight!= null">
+                    and
+                    <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
+                        "resultNetWeight" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="saleRemark!= null">
+                    and
+                    <foreach collection="saleRemark" item="item" open="(" separator="or" close=")">
+                        "saleRemark" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="areaName!= null">
+                and
+                <foreach collection="areaName" item="item" open="(" separator="or" close=")">
+                    "areaName" like '%${item}%'
+                </foreach>
+                </if>
+                <if test="easPrimaryId!= null">
+                    and
+                    <foreach collection="easPrimaryId" item="item" open="(" separator="or" close=")">
+                        "easPrimaryId" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="receiveMoneyCus!= null">
+                    and
+                    <foreach collection="receiveMoneyCus" item="item" open="(" separator="or" close=")">
+                        "receiveMoneyCus" like '%${item}%'
+                    </foreach>
+                </if>
+                <if test="orderissuetime!= null">
+                    and
+                    <foreach collection="orderissuetime" item="item" open="(" separator="or" close=")">
+                        "orderissuetime" like '%${item}%'
+                    </foreach>
+                </if>
+            </where>
+        <include refid="orderBy"></include>
     </select>
     <select id="selectDetailsByOrder" resultType="java.lang.Integer" parameterType="decimal">
         SELECT count(BDO.DETAILS_ID) FROM BMSTRUCK_DETAILS_ORDER BDO
@@ -2042,7 +2154,6 @@
     <select id="getDetailsIdByOrderId" resultType="java.math.BigDecimal" parameterType="java.lang.Integer">
         SELECT BDO.DETAILS_ID FROM BMSTRUCK_DETAILS_ORDER BDO
         WHERE
-
         BDO.ORDER_ID = #{orderId}
     </select>
     <select id="selectNetWeight" resultType="java.math.BigDecimal" parameterType="decimal">