|
@@ -99,7 +99,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
}
|
|
|
map.put("portName", list.get(i-1).get("portName"));
|
|
|
map.put("materialType",list.get(i-1).get("materialTypeName"));
|
|
|
- tonnageSum+=Double.parseDouble(list.get(i-1).get("tonnage").toString());
|
|
|
+
|
|
|
map.put("capacity1","小计");
|
|
|
map.put("capacity2","小计");
|
|
|
map.put("capacity3" ,"小计");
|
|
@@ -167,9 +167,12 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
materialTonnageSum=0.0;
|
|
|
materialNumberAllSum=0.0;
|
|
|
}
|
|
|
+
|
|
|
if(i==0 || !list.get(i).get("batchId").equals(list.get(i-1).get("batchId")) || !list.get(i).get("portName").equals(list.get(i-1).get("portName"))){
|
|
|
|
|
|
materialTonnageSum=new BigDecimal(materialTonnageSum+Double.valueOf(list.get(i).get("tonnage").toString())).setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
|
|
|
+
|
|
|
+ tonnageSum+=Double.parseDouble(list.get(i).get("tonnage").toString());
|
|
|
}
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
map.put("batchInfacoryId",list.get(i).get("batchInfacoryId"));
|
|
@@ -289,7 +292,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
list.get(list.size()-1).get("numberOfLoans").toString());
|
|
|
map.put("tonnage",list.get(list.size()-1).get("tonnage"));
|
|
|
map.put("portName", list.get(list.size()-1).get("portName"));
|
|
|
- tonnageSum+=Double.parseDouble(list.get(list.size()-1).get("tonnage").toString());
|
|
|
+
|
|
|
map.put("capacity1","小计");
|
|
|
map.put("capacity2","小计");
|
|
|
map.put("capacity3","小计");
|
|
@@ -349,29 +352,17 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
map22.put("type",1);
|
|
|
map22.put("aaaaa", 2);
|
|
|
mapList.add(map22);
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
|
|
|
Map<String,Object> map3=new HashMap<>();
|
|
|
map3.put("batchInfacoryId",Integer.parseInt(list.get(list.size() -1).get("batchInfacoryId").toString()) + 1);
|
|
|
map3.put("batchId",Integer.parseInt(list.get(list.size()-1).get("batchId").toString())+1);
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ if (list.get(list.size()-1).get("instructionStatus")!=null) {
|
|
|
+ map3.put("tonnage1",new BigDecimal(tonnageSum).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
+ }else {
|
|
|
+ map3.put("tonnage",new BigDecimal(tonnageSum).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
+ }
|
|
|
map3.put("pm","合计");
|
|
|
map3.put("capacityNumber1",capacityNumberAllSum1);
|
|
|
map3.put("capacityNumber2",capacityNumberAllSum2);
|
|
@@ -384,11 +375,11 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
map3.put("batchInfacoryId",Integer.parseInt(list.get(list.size() -1).get("batchInfacoryId").toString()) + 1);
|
|
|
map4.put("batchId",Integer.parseInt(list.get(list.size()-1).get("batchId").toString())+1);
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+ if (list.get(list.size()-1).get("instructionStatus")!=null) {
|
|
|
+ map4.put("tonnage1",new BigDecimal(tonnageSum).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
+ }else {
|
|
|
+ map4.put("tonnage",new BigDecimal(tonnageSum).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
+ }
|
|
|
map4.put("pm","合计");
|
|
|
map4.put("capacity1",new BigDecimal(capacityNumberAllSum1+capacityNumberAllSum2+capacityNumberAllSum3+capacityNumberAllSum4).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
map4.put("type",1);
|