|
@@ -244,22 +244,22 @@ public class ZhcxShipOffshoreServiceImpl extends ServiceImpl<ZhcxShipOffshoreDao
|
|
|
String prjname = cells.get(i, 5).getStringValue();
|
|
|
String machineno = cells.get(i, 7).getStringValue();
|
|
|
if (code == null || code.isEmpty()) {
|
|
|
- errmsg.append("第").append(i+1).append("行工位编号必填;<br>");
|
|
|
+ errmsg.append("第").append(i).append("行工位编号必填;<br>");
|
|
|
}else{
|
|
|
zhcxShipOffshoreVo.setCode(code);
|
|
|
}
|
|
|
if (prjcode == null || prjcode.isEmpty()) {
|
|
|
- errmsg.append("第").append(i+1).append("行项目工号必填;<br>");
|
|
|
+ errmsg.append("第").append(i).append("行项目工号必填;<br>");
|
|
|
}else{
|
|
|
zhcxShipOffshoreVo.setProjectcode(prjcode);
|
|
|
}
|
|
|
if (prjname == null || prjname.isEmpty()) {
|
|
|
- errmsg.append("第").append(i+1).append("行项目名称必填;<br>");
|
|
|
+ errmsg.append("第").append(i).append("行项目名称必填;<br>");
|
|
|
}else{
|
|
|
zhcxShipOffshoreVo.setProjectname(prjname);
|
|
|
}
|
|
|
if (machineno == null || machineno.isEmpty()) {
|
|
|
- errmsg.append("第").append(i+1).append("行机号必填;<br>");
|
|
|
+ errmsg.append("第").append(i).append("行机号必填;<br>");
|
|
|
}else{
|
|
|
zhcxShipOffshoreVo.setMachineno(machineno);
|
|
|
}
|
|
@@ -274,7 +274,7 @@ public class ZhcxShipOffshoreServiceImpl extends ServiceImpl<ZhcxShipOffshoreDao
|
|
|
shipBaseList.forEach(v ->{
|
|
|
shipBase.put(v.getSeat(),v.getWharf());
|
|
|
});
|
|
|
- int i = 3;
|
|
|
+ int i = 2;
|
|
|
Map<String,String> map = new HashMap<>(4);
|
|
|
for (int i1 = 0; i1 < list.size(); i1++) {
|
|
|
String orDefault = shipBase.getOrDefault(list.get(i1).getCode(), "");
|