'表头'

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

@@ -139,7 +139,8 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
                                                  Integer pageSize,
                                                  Integer apiId,
                                                  Integer requirementStatus,
-                                                 String orgCode) {
+                                                 String orgCode,
+                                                 String index) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
@@ -147,12 +148,14 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
             String con = "%"+orgCode+"%";
             mapValue.put("con",con);
         }
+        if (index != null && !"null".equals(index)) {
+            mapValue.put("index","%"+index+"%");
+        }
         mapValue.put("requirementStatus",requirementStatus);
-        List<Map<String, Object>> list = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
     //展示采购内转需求

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

@@ -35,4 +35,14 @@ public class ColumnDataUtil {
         pageList.setColumnData(columnDataList);
         return pageList;
     }
+    public PageListAdd tableColumnData4(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()));
+        }
+        PageListAdd pageList = new PageListAdd(data);
+        pageList.setColumnData(columnDataList);
+        return pageList;
+    }
 }

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

@@ -815,7 +815,9 @@
         arm.material_count "materialCount",
         arm.MATERIAL_ID "materialId",
         rm.material_name || rm.material_specification || '(' || rm.material_model || ')' "materialName",
-        AIR.INSERT_UPDATE_REMARK "Tel"
+        AIR.INSERT_UPDATE_REMARK "Tel",
+        RMT.MATERIAL_TYPE_NAME "materialTypeName",
+        RS.SHIPPER_NAME || RM.MATERIAL_NAME || rw2.warehouse_name || rw1.warehouse_name || RMT.MATERIAL_TYPE_NAME "likeIndex"
         FROM
         AMSTRUCK_INWARD_REQUIREMENT AIR
         LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
@@ -825,6 +827,7 @@
         LEFT JOIN rms_material rm ON rm.material_id = arm.material_id
         LEFT JOIN amstruck_inward_requirement air ON air.requirement_id = arm.requirement_id
         LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
+        LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
         WHERE
         AIR.DELETED = 0
         AND AIR.PURCHASE_ORDER_ID IS NULL
@@ -839,6 +842,9 @@
         </if>
         )
         <where>
+            <if test="index != null">
+                and "likeIndex" like #{index}
+            </if>
             <if test="requirementType != null">
                 and
                 <foreach collection="requirementType" item="item" open="(" separator="or" close=")">