|
@@ -369,6 +369,11 @@ public class ImportInformation {
|
|
BigDecimal b1 = new BigDecimal(Double.parseDouble(civil.toString()));
|
|
BigDecimal b1 = new BigDecimal(Double.parseDouble(civil.toString()));
|
|
BigDecimal b2 = new BigDecimal(Double.parseDouble(installation.toString()));
|
|
BigDecimal b2 = new BigDecimal(Double.parseDouble(installation.toString()));
|
|
double settlementPrice = b1.add(b2).doubleValue();
|
|
double settlementPrice = b1.add(b2).doubleValue();
|
|
|
|
+ //AH(建议结算款)
|
|
|
|
+ Object suggestedAmount = ei.getCellValue(row, 33);
|
|
|
|
+ if ("".equals(suggestedAmount)) {
|
|
|
|
+ suggestedAmount = "0.0";
|
|
|
|
+ }
|
|
Object projectFirm = ei.getCellValue(row, 39);
|
|
Object projectFirm = ei.getCellValue(row, 39);
|
|
Object subDate = ei.getCellValue(row, 41);
|
|
Object subDate = ei.getCellValue(row, 41);
|
|
Object releaseDate = ei.getCellValue(row, 42);
|
|
Object releaseDate = ei.getCellValue(row, 42);
|
|
@@ -381,6 +386,7 @@ public class ImportInformation {
|
|
if (projectTotal.equals("")) {
|
|
if (projectTotal.equals("")) {
|
|
projectTotal = "0.0";
|
|
projectTotal = "0.0";
|
|
}
|
|
}
|
|
|
|
+
|
|
information.setProjectId(projectId.toString());
|
|
information.setProjectId(projectId.toString());
|
|
information.setProjectName(projectName.toString());
|
|
information.setProjectName(projectName.toString());
|
|
information.setProjectType(projectType.toString());
|
|
information.setProjectType(projectType.toString());
|
|
@@ -419,6 +425,7 @@ public class ImportInformation {
|
|
information.setCreateDate(new Date());
|
|
information.setCreateDate(new Date());
|
|
information.setUpdateBy(user);
|
|
information.setUpdateBy(user);
|
|
information.setUpdateDate(new Date());
|
|
information.setUpdateDate(new Date());
|
|
|
|
+ information.setSuggestedAmount(suggestedAmount.toString());
|
|
informationList.add(information);
|
|
informationList.add(information);
|
|
successNum++;
|
|
successNum++;
|
|
}
|
|
}
|