|
@@ -180,12 +180,7 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
|
|
|
String carrierSsoId,
|
|
|
String enableStatus,
|
|
|
String planStatus) {
|
|
|
- if (con != null) {
|
|
|
- if (!con.equals("undefined")) {
|
|
|
- String index="get_pur_requirement_list";
|
|
|
- return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
if (mapValue == null) {
|
|
|
mapValue = new HashMap<>();
|
|
|
}
|
|
@@ -203,23 +198,8 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
|
|
|
}
|
|
|
mapValue.put("requirementStatus",requirementStatus);
|
|
|
List<Map<String, Object>> truckRequirementList = null;
|
|
|
- if (mapValue.size() == 1) {
|
|
|
-
|
|
|
- truckRequirementList = amstruckInwardRequirementService.getPurRequirementList(mapValue);
|
|
|
- Map<String, Object> map1 = new HashMap<>();
|
|
|
-
|
|
|
- map1.put("index","get_pur_requirement_list");
|
|
|
-
|
|
|
- map1.put("indexId","purRequirementId");
|
|
|
- truckRequirementList.add(map1);
|
|
|
-
|
|
|
- esFeign.insertIndex(truckRequirementList);
|
|
|
-
|
|
|
- truckRequirementList.remove(truckRequirementList.size()-1);
|
|
|
- }
|
|
|
- if (truckRequirementList == null) {
|
|
|
- truckRequirementList = amstruckInwardRequirementService.getPurRequirementList(mapValue);
|
|
|
- }
|
|
|
+
|
|
|
+ truckRequirementList = amstruckInwardRequirementService.getPurRequirementList(mapValue);
|
|
|
PageHelper.startPage(pageNum, pageSize);
|
|
|
|
|
|
List<Map<String, Object>> columnList = amstruckInwardRequirementService.getPurRequirementList(mapValue);
|