liyg před 2 roky
rodič
revize
81b1f547d1

+ 4 - 0
src/main/java/com/steerinfo/dil/controller/AmsContractTruckPriceController.java

@@ -64,10 +64,14 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
                                                       Integer apiId,
                                                       Integer pageNum,
                                                       Integer pageSize,
+                                                      String con,
                                                       Integer deleted){
         if(deleted != null) {
             mapValue.put("deleted", deleted);
         }
+        if(con !=null){
+            mapValue.put("con",con);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getAmsContractTransportPrice(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);

+ 6 - 0
src/main/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

@@ -662,6 +662,12 @@
         <if test="deleted != null">
           and a_t_price.DELETED = #{deleted}
         </if>
+        <if test="con !=null and con != ''.toString()">
+          and
+          r_r_address.ADDRESS_PROVINCE || r_r_address.ADDRESS_DISTRICT  || r_r_address.ADDRESS_TOWN
+          || rrp.ADDRESS_DELIVERY_ADDRESS ||  r_carrier.CARRIER_NAME || r_c_type.CAPACITY_TYPE_NAME
+          like CONCAT('%',CONCAT(#{con},'%'))
+        </if>
     </where>
         )