|
|
@@ -1962,10 +1962,17 @@ public class NewExcelUtil<T> {
|
|
|
if (o.getBeforeLastRdBudget()!=null){
|
|
|
cell.setCellValue(o.getBeforeLastRdBudget().stripTrailingZeros().toPlainString());
|
|
|
}else cell.setCellValue("");
|
|
|
-
|
|
|
}
|
|
|
- else if(i==8)cell.setCellValue(o.getLastSalesAmount().stripTrailingZeros().toPlainString());
|
|
|
- else if(i==9)cell.setCellValue(o.getLastRdBudget().stripTrailingZeros().toPlainString());
|
|
|
+ else if(i==8){
|
|
|
+ if(o.getLastSalesAmount()!=null){
|
|
|
+ cell.setCellValue(o.getLastSalesAmount().stripTrailingZeros().toPlainString());
|
|
|
+ }else cell.setCellValue("");
|
|
|
+ }
|
|
|
+ else if(i==9){
|
|
|
+ if(o.getLastRdBudget()!=null){
|
|
|
+ cell.setCellValue(o.getLastRdBudget().stripTrailingZeros().toPlainString());
|
|
|
+ }else cell.setCellValue("");
|
|
|
+ }
|
|
|
else if(i==10){
|
|
|
switch (o.getCloseMeetingStatus())
|
|
|
{
|
|
|
@@ -1978,11 +1985,18 @@ public class NewExcelUtil<T> {
|
|
|
case 3: cell.setCellValue("合同无此项"); break;
|
|
|
|
|
|
}
|
|
|
-
|
|
|
}else if(i==11){
|
|
|
cell.setCellValue(o.getProjectApprovalNumber());
|
|
|
- }else if(i==12)cell.setCellValue(o.getRdBudget().stripTrailingZeros().toPlainString());
|
|
|
- else if(i==13)cell.setCellValue(o.getRdSalesAmount().stripTrailingZeros().toPlainString());
|
|
|
+ }else if(i==12){
|
|
|
+ if (o.getRdBudget() !=null){
|
|
|
+ cell.setCellValue(o.getRdBudget().stripTrailingZeros().toPlainString());
|
|
|
+ }else cell.setCellValue("");
|
|
|
+ }
|
|
|
+ else if(i==13){
|
|
|
+ if (o.getRdSalesAmount() !=null){
|
|
|
+ cell.setCellValue(o.getRdSalesAmount().stripTrailingZeros().toPlainString());
|
|
|
+ }else cell.setCellValue("");
|
|
|
+ }
|
|
|
else if(i==14)cell.setCellValue(o.getRdBudgetRate());
|
|
|
else if(i==15)cell.setCellValue(o.getThreeYearsRdBudgetRate());
|
|
|
else if(i==16){
|
|
|
@@ -1998,8 +2012,16 @@ public class NewExcelUtil<T> {
|
|
|
}
|
|
|
}
|
|
|
else if(i==17)cell.setCellValue(o.getActualRdNumber());
|
|
|
- else if(i==18)cell.setCellValue(o.getActualRdAmount().stripTrailingZeros().toPlainString());
|
|
|
- else if(i==19)cell.setCellValue(o.getActualSalesAmount().stripTrailingZeros().toPlainString());
|
|
|
+ else if(i==18){
|
|
|
+ if (o.getActualRdAmount() !=null){
|
|
|
+ cell.setCellValue(o.getActualRdAmount().stripTrailingZeros().toPlainString());
|
|
|
+ }else cell.setCellValue("");
|
|
|
+ }
|
|
|
+ else if(i==19){
|
|
|
+ if (o.getActualSalesAmount() !=null){
|
|
|
+ cell.setCellValue(o.getActualSalesAmount().stripTrailingZeros().toPlainString());
|
|
|
+ }else cell.setCellValue("");
|
|
|
+ }
|
|
|
else if(i==20)cell.setCellValue(o.getActualRdRate());
|
|
|
else if(i==21)cell.setCellValue(o.getThreeYearsActualRdRate());
|
|
|
else if(i==22) {
|
|
|
@@ -2050,7 +2072,11 @@ public class NewExcelUtil<T> {
|
|
|
case 3: cell.setCellValue("合同无此项"); break;
|
|
|
}
|
|
|
}
|
|
|
- else if(i==26)cell.setCellValue(o.getReportRdAmount().stripTrailingZeros().toPlainString());
|
|
|
+ else if(i==26){
|
|
|
+ if (o.getReportRdAmount() !=null){
|
|
|
+ cell.setCellValue(o.getReportRdAmount().stripTrailingZeros().toPlainString());
|
|
|
+ }else cell.setCellValue("");
|
|
|
+ }
|
|
|
else if(i==27){
|
|
|
switch (o.getRdReservesStatus())
|
|
|
{
|
|
|
@@ -2087,7 +2113,11 @@ public class NewExcelUtil<T> {
|
|
|
case 3: cell.setCellValue("合同无此项"); break;
|
|
|
}
|
|
|
}
|
|
|
- else if(i==30){cell.setCellValue(o.getRdAnnouncementAmount().stripTrailingZeros().toPlainString());}
|
|
|
+ else if(i==30){
|
|
|
+ if (o.getRdAnnouncementAmount() !=null){
|
|
|
+ cell.setCellValue(o.getRdAnnouncementAmount().stripTrailingZeros().toPlainString());
|
|
|
+ }else cell.setCellValue("");
|
|
|
+ }
|
|
|
else if(i==31){
|
|
|
switch (o.getAdDeliverStatus())
|
|
|
{
|
|
|
@@ -2225,6 +2255,8 @@ public class NewExcelUtil<T> {
|
|
|
}
|
|
|
else if(i==52){
|
|
|
cell.setCellValue(DateUtils.formatDateYYYYMMddHHmm(o.getUpdateTime()));
|
|
|
+ }else {
|
|
|
+ cell.setCellValue("");
|
|
|
}
|
|
|
}
|
|
|
|