|
|
@@ -497,6 +497,8 @@ public class ExportUtil1 {
|
|
|
Double fourKvLength=0.0;//400v及以下
|
|
|
List<String> organDataList = new ArrayList<String>();//预算批准机关、日期、文号
|
|
|
List<Date> commencementDateList =new ArrayList<Date>();//开工日期
|
|
|
+ Date beforeDate=null;
|
|
|
+ Date endDate = null;
|
|
|
List<Date> completionDateList = new ArrayList<Date>();//竣工日期
|
|
|
String organData = "";//文号
|
|
|
Double investmentBudget=0.0;//预算投资
|
|
|
@@ -553,11 +555,27 @@ public class ExportUtil1 {
|
|
|
generalSituation.setOrganDataNumber(organData);
|
|
|
}
|
|
|
if (null!=commencementDateList&&commencementDateList.size()>0){
|
|
|
- generalSituation.setCommencementDate("2019-11-08 11:10:26");
|
|
|
+ for (Date date:commencementDateList){
|
|
|
+ beforeDate = date;
|
|
|
+ if (beforeDate!=null){
|
|
|
+ if (date.before(beforeDate)){
|
|
|
+ beforeDate=date;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ generalSituation.setCommencementDate(sdf.format(beforeDate));
|
|
|
// generalSituation.setCommencementDate(sdf.format(Collections.min(commencementDateList)));
|
|
|
}
|
|
|
if (null!=completionDateList&&completionDateList.size()>0){
|
|
|
- generalSituation.setCompletionDate("2019-11-08 11:10:26");
|
|
|
+ for (Date date:commencementDateList){
|
|
|
+ endDate = date;
|
|
|
+ if (endDate!=null){
|
|
|
+ if (date.before(endDate)){
|
|
|
+ endDate=date;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ generalSituation.setCompletionDate(sdf.format(endDate));
|
|
|
// generalSituation.setCompletionDate(sdf.format(Collections.max(completionDateList)));
|
|
|
}
|
|
|
generalSituation.setInvestmentBudget(String.valueOf(investmentBudget));
|
xs