20191114

src/main/java/com/jeeplus/modules/sg/financial/erpcredit/util/ExportUtil1.java

@@ -534,7 +534,9 @@ public class ExportUtil1 {
                 if (null!=maintainData.getApprovalNumber()){//如果审批文号不为空
                     organDataList.add(maintainData.getApprovalNumber());
                 }
-                commencementDateList.add(maintainData.getStartDate());
+                if (null!=maintainData.getStartDate()&&maintainData.getEndDate().toString().length()>0){
+                    commencementDateList.add(maintainData.getStartDate());
+                }
                 if (null!=maintainData.getEndDate()&&maintainData.getEndDate().toString().length()>0){
                     completionDateList.add(maintainData.getEndDate());
                 }
@@ -570,7 +572,7 @@ public class ExportUtil1 {
                 for (Date date:commencementDateList){
                     endDate = date;
                     if (endDate!=null){
-                        if (date.before(endDate)){
+                        if (date.after(endDate)){
                             endDate=date;
                         }
                     }