|
|
@@ -28,14 +28,27 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
//获取视图里的所有外轮船名，物资名称
|
|
|
List<Map<String, Object>> list = iShipDynamicsService.selectAll();
|
|
|
List<Map<String, Object>> mapList=new ArrayList<>(list.size());
|
|
|
+ //小计，没一个批次进行完小计后清空
|
|
|
Double capacityNumberSum1 = 0.0;
|
|
|
Double capacityNumberSum2 = 0.0;
|
|
|
Double capacityNumberSum3 = 0.0;
|
|
|
Double capacityNumberSum4 = 0.0;
|
|
|
+ //获取下游港口吨位的总和
|
|
|
+ Double tonnageSum=0.0;
|
|
|
+ //1：未到闸船舶2：等闸船舶3：已过闸船舶4：到港待卸船舶的和
|
|
|
+ Double capacityNumberAllSum1=0.0;
|
|
|
+ Double capacityNumberAllSum2=0.0;
|
|
|
+ Double capacityNumberAllSum3=0.0;
|
|
|
+ Double capacityNumberAllSum4=0.0;
|
|
|
for (int i = 0; i <= list.size()-1; i++) {
|
|
|
if(i>0&&!list.get(i).get("batchId").equals(list.get(i-1).get("batchId"))){
|
|
|
Map<String,Object> map=new HashMap<>();
|
|
|
- map.put("batchId",list.get(i).get("batchId"));
|
|
|
+ map.put("batchId",list.get(i-1).get("batchId"));
|
|
|
+ map.put("pm",list.get(i-1).get("shipName").toString()+
|
|
|
+ list.get(i-1).get("materialName").toString()+
|
|
|
+ list.get(i-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
|
|
|
+ list.get(i-1).get("numberOfLoans").toString());
|
|
|
+ map.put("tonnage",list.get(i-1).get("tonnage"));
|
|
|
map.put("capacity1","小计");
|
|
|
map.put("capacity2","小计");
|
|
|
map.put("capacity3","小计");
|
|
|
@@ -46,7 +59,12 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
map.put("capacityNumber4",capacityNumberSum4);
|
|
|
mapList.add(map);
|
|
|
Map<String,Object> map2=new HashMap<>();
|
|
|
- map2.put("batchId",list.get(i).get("batchId"));
|
|
|
+ map2.put("batchId",list.get(i-1).get("batchId"));
|
|
|
+ map2.put("pm",list.get(i-1).get("shipName").toString()+
|
|
|
+ list.get(i-1).get("materialName").toString()+
|
|
|
+ list.get(i-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
|
|
|
+ list.get(i-1).get("numberOfLoans").toString());
|
|
|
+ map2.put("tonnage",list.get(i-1).get("tonnage"));
|
|
|
map2.put("capacity1",capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4);
|
|
|
map2.put("type",1);
|
|
|
mapList.add(map2);
|
|
|
@@ -59,16 +77,16 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
map.put("batchId",list.get(i).get("batchId"));
|
|
|
list.get(i).get("shipName").toString();
|
|
|
list.get(i).get("materialName").toString();
|
|
|
- list.get(i).get("dateOfLoans").toString().substring(0, 9);
|
|
|
+ list.get(i).get("dateOfLoans").toString().substring(0, 10);
|
|
|
list.get(i).get("numberOfLoans").toString();
|
|
|
|
|
|
String pm=list.get(i).get("shipName").toString()+
|
|
|
list.get(i).get("materialName").toString()+
|
|
|
- list.get(i).get("dateOfLoans").toString().substring(0, 9)+"放货"+
|
|
|
+ list.get(i).get("dateOfLoans").toString().substring(0, 10)+"放货"+
|
|
|
list.get(i).get("numberOfLoans").toString();
|
|
|
map.put("pm",pm);
|
|
|
map.put("tonnage",list.get(i).get("tonnage"));
|
|
|
-
|
|
|
+ tonnageSum+=Double.parseDouble(list.get(i).get("tonnage").toString());
|
|
|
//1：未到闸船舶2：等闸船舶3：已过闸船舶4：到港待卸船舶
|
|
|
String capacity1=null;
|
|
|
String capacity2=null;
|
|
|
@@ -90,27 +108,31 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
if ("未到闸船舶".equals(locationStatus)) {
|
|
|
capacity1 = list.get(i).get("capacity").toString();
|
|
|
capacityNumber1 = Double.valueOf(list.get(i).get("capacityNumber").toString());
|
|
|
- outPortTime1 = list.get(i).get("outPortTime").toString().substring(0, 9);
|
|
|
+ outPortTime1 = list.get(i).get("outPortTime").toString().substring(0, 10);
|
|
|
locationValue1 = list.get(i).get("locationValue").toString();
|
|
|
capacityNumberSum1 += capacityNumber1;
|
|
|
+ capacityNumberAllSum1+=capacityNumber1;
|
|
|
} else if ("等闸船舶".equals(locationStatus)) {
|
|
|
capacity2 = list.get(i).get("capacity").toString();
|
|
|
capacityNumber2 = Double.valueOf(list.get(i).get("capacityNumber").toString());
|
|
|
- outPortTime2 = list.get(i).get("outPortTime").toString().substring(0, 9);
|
|
|
+ outPortTime2 = list.get(i).get("outPortTime").toString().substring(0, 10);
|
|
|
locationValue2 = list.get(i).get("locationValue").toString();
|
|
|
- capacityNumberSum1 += capacityNumber2;
|
|
|
+ capacityNumberSum2 += capacityNumber2;
|
|
|
+ capacityNumberAllSum2+=capacityNumber2;
|
|
|
} else if ("已过闸船舶".equals(locationStatus)) {
|
|
|
capacity3 = list.get(i).get("capacity").toString();
|
|
|
capacityNumber3 = Double.valueOf(list.get(i).get("capacityNumber").toString());
|
|
|
- outPortTime3 = list.get(i).get("outPortTime").toString().substring(0, 9);
|
|
|
+ outPortTime3 = list.get(i).get("outPortTime").toString().substring(0, 10);
|
|
|
locationValue3 = list.get(i).get("locationValue").toString();
|
|
|
- capacityNumberSum1 += capacityNumber3;
|
|
|
+ capacityNumberSum3 += capacityNumber3;
|
|
|
+ capacityNumberAllSum3+=capacityNumber3;
|
|
|
} else if ("到港待卸船舶".equals(locationStatus)) {
|
|
|
capacity4 = list.get(i).get("capacity").toString();
|
|
|
capacityNumber4 = Double.valueOf(list.get(i).get("capacityNumber").toString());
|
|
|
- outPortTime4 = list.get(i).get("outPortTime").toString().substring(0, 9);
|
|
|
+ outPortTime4 = list.get(i).get("outPortTime").toString().substring(0, 10);
|
|
|
locationValue4 = list.get(i).get("locationValue").toString();
|
|
|
- capacityNumberSum1 += capacityNumber4;
|
|
|
+ capacityNumberSum4 += capacityNumber4;
|
|
|
+ capacityNumberAllSum4+=capacityNumber4;
|
|
|
}
|
|
|
map.put("capacity1",capacity1);
|
|
|
map.put("capacityNumber1",capacityNumber1);
|
|
|
@@ -130,7 +152,52 @@ public class ShipDynamicsController extends BaseRESTfulController {
|
|
|
map.put("outPortTime4",outPortTime4);
|
|
|
mapList.add(map);
|
|
|
}
|
|
|
+ Map<String,Object> map=new HashMap<>();
|
|
|
+ map.put("batchId",list.get(list.size()-1).get("batchId"));
|
|
|
+ map.put("pm",list.get(list.size()-1).get("shipName").toString()+
|
|
|
+ list.get(list.size()-1).get("materialName").toString()+
|
|
|
+ list.get(list.size()-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
|
|
|
+ list.get(list.size()-1).get("numberOfLoans").toString());
|
|
|
+ map.put("tonnage",list.get(list.size()-1).get("tonnage"));
|
|
|
+ map.put("capacity1","小计");
|
|
|
+ map.put("capacity2","小计");
|
|
|
+ map.put("capacity3","小计");
|
|
|
+ map.put("capacity4","小计");
|
|
|
+ map.put("capacityNumber1",capacityNumberSum1);
|
|
|
+ map.put("capacityNumber2",capacityNumberSum2);
|
|
|
+ map.put("capacityNumber3",capacityNumberSum3);
|
|
|
+ map.put("capacityNumber4",capacityNumberSum4);
|
|
|
+ mapList.add(map);
|
|
|
+ Map<String,Object> map2=new HashMap<>();
|
|
|
+ map2.put("batchId",list.get(list.size()-1).get("batchId"));
|
|
|
+ map2.put("pm",list.get(list.size()-1).get("shipName").toString()+
|
|
|
+ list.get(list.size()-1).get("materialName").toString()+
|
|
|
+ list.get(list.size()-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
|
|
|
+ list.get(list.size()-1).get("numberOfLoans").toString());
|
|
|
+ map2.put("tonnage",list.get(list.size()-1).get("tonnage"));
|
|
|
+ map2.put("capacity1",capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4);
|
|
|
+ map2.put("type",1);
|
|
|
+ mapList.add(map2);
|
|
|
|
|
|
+ //最下方的两行
|
|
|
+ //第一行
|
|
|
+ Map<String,Object> map3=new HashMap<>();
|
|
|
+ map3.put("batchId",Integer.parseInt(list.get(list.size()-1).get("batchId").toString())+1);
|
|
|
+ map3.put("tonnage",tonnageSum);
|
|
|
+ map3.put("pm","合计");
|
|
|
+ map3.put("capacityNumber1",capacityNumberAllSum1);
|
|
|
+ map3.put("capacityNumber2",capacityNumberAllSum2);
|
|
|
+ map3.put("capacityNumber3",capacityNumberAllSum3);
|
|
|
+ map3.put("capacityNumber4",capacityNumberAllSum4);
|
|
|
+ mapList.add(map3);
|
|
|
+ //第二行
|
|
|
+ Map<String,Object> map4=new HashMap<>();
|
|
|
+ map4.put("batchId",Integer.parseInt(list.get(list.size()-1).get("batchId").toString())+1);
|
|
|
+ map4.put("tonnage",tonnageSum);
|
|
|
+ map4.put("pm","合计");
|
|
|
+ map4.put("capacity1",capacityNumberAllSum1+capacityNumberAllSum2+capacityNumberAllSum3+capacityNumberAllSum4);
|
|
|
+ map4.put("type",1);
|
|
|
+ mapList.add(map4);
|
|
|
return success(mapList);
|
|
|
}
|
|
|
}
|
yangk