Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -107,9 +107,10 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             carrierSsoId = null;
         }
         mapValue.put("carrierSsoId",carrierSsoId);
-        PageHelper.startPage(pageNum,pageSize);
+        mapValue.put("pageNum",pageNum);
+        mapValue.put("pageSize",pageSize);
         List<Map<String, Object>> columnList = amsDispatchSaleOrderService.getPCDispatchSaleOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);
+        PageListAdd pageList = columnDataUtil.tableColumnData5(apiId, null,columnList);
         return success(pageList);
     }
 

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

@@ -1250,7 +1250,7 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getFuSaleOrderList(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData5(apiId, null, saleOrderList);
         return success(pageList);
     }
 
@@ -1571,7 +1571,7 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleCokeOrder(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, saleOrderList);
+        PageListAdd pageList = columnDataUtil.tableColumnData5(apiId, null, saleOrderList);
         return success(pageList);
     }
 

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

@@ -10,6 +10,7 @@ import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.MapRemoveUtil;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -361,6 +362,9 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         else {
             mapValue.put("carrierId",null);
         }
+        int pageNum=Integer.parseInt(mapValue.get("pageNum")+"");
+        int pageSize=Integer.parseInt(mapValue.get("pageSize")+"");
+        PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> dispatchSaleOrderList = amsDispatchSaleOrderMapper.getPCDispatchSaleOrderList(mapValue);
         for (Map<String,Object> map: dispatchSaleOrderList) {
 //            Date dispatchDealTime = (Date) map.get("dispatchDealTime");

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

@@ -47,4 +47,11 @@ public class ColumnDataUtil {
         pageList.setColumnData(columnDataList);
         return pageList;
     }
+
+    public PageListAdd tableColumnData5(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        PageListAdd pageList = new PageListAdd(data);
+        pageList.setColumnData(columnDataList);
+        return pageList;
+    }
 }

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

@@ -565,7 +565,8 @@
         ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
         ADSO.INSERT_TIME AS "insertTime",
         ASOM.SALE_DATE_OF_RECEIPT AS "receiptDate",
-        ASM.SALE_WAREHOUSE AS "saleWareHouse"
+        ASM.SALE_WAREHOUSE AS "saleWareHouse",
+        RM.MATERIAL_NAME AS "materialName"
         FROM AMS_DISPATCH_SALE_ORDER ADSO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
@@ -583,6 +584,8 @@
         ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN AMS_SALE_MATERIAL ASM
         ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         WHERE ADSO.DISPATCH_TYPE = #{dispatchType}
         AND ADSO.DISPATCH_STATUS = 0
         AND ADSO.DISPATCH_DEAL_TIME IS NULL
@@ -591,6 +594,18 @@
         </if>
         )
         <where>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" 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="saleOrderMaterialTruckNo != null">
                 and
                 <foreach collection="saleOrderMaterialTruckNo" item="item" open="(" separator="or" close=")">

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

@@ -4307,28 +4307,39 @@
     )
     <where>
       <if test="saleNumber != null">
+        and
         <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
           "saleNumber" like '%${item}%'
         </foreach>
       </if>
+      <if test="saleWareHouse != null">
+        and
+        <foreach collection="saleWareHouse" item="item" open="(" separator="or" close=")">
+           "saleWareHouse" like '%${item}%'
+        </foreach>
+      </if>
       <if test="materialName != null">
+        and
         <foreach collection="materialName" item="item" open="(" separator="or" close=")">
-          "materialName" like '%${item}%'
+            "materialName" like '%${item}%'
         </foreach>
       </if>
       <if test="materialSpecification != null">
+        and
         <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
-          "materialSpecification" like '%${item}%'
+           "materialSpecification" like '%${item}%'
         </foreach>
       </if>
       <if test="materialModel != null">
+        and
         <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
-          "materialModel" like '%${item}%'
+         "materialModel" like '%${item}%'
         </foreach>
       </if>
       <if test="statusStr != null">
+        and
         <foreach collection="statusStr" item="item" open="(" separator="or" close=")">
-          and "statusStr" like '%${item}%'
+          "statusStr" like '%${item}%'
         </foreach>
       </if>