|
|
@@ -181,7 +181,7 @@ public class DredgingServiceImpl implements DredgingService {
|
|
|
jsonObject.put("projectId",dredgingImportRule.getProjectOverviewId());
|
|
|
HttpResponse response = HttpUtil.createPost(dredgingWorkCameraUrl).body(jsonObject.toString()).setConnectionTimeout(30000).execute();
|
|
|
List<HashMap> hashMaps = JSONArray.parseArray(response.body(), HashMap.class);
|
|
|
- List<DredgingProjectShips> projectShips = dredgingProjectShipService.list(Wrappers.<DredgingProjectShips>lambdaQuery().eq(DredgingProjectShips::getOverviewId, projectOverviewId));
|
|
|
+ List<DredgingProjectShips> projectShips = dredgingProjectShipService.list(Wrappers.<DredgingProjectShips>lambdaQuery().eq(DredgingProjectShips::getOverviewId, dredgingImportRule.getProjectOverviewId()));
|
|
|
for (DredgingProjectShips projectShip : projectShips) {
|
|
|
for (HashMap hashMap : hashMaps) {
|
|
|
if (hashMap.get("ShipCode").equals(projectShip.getCode())){
|
lag