Browse Source

Merge branch 'prod' into test

anderx 8 months ago
parent
commit
c1ca223c32

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -532,7 +532,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		Map<String,Object> map=new HashMap<>();
 		for (TaskTime e : taskTimes) {
 			Map<String,Object> param=new HashMap<>();
-			param.put("date",DateUtils.formatDate(e.getDateTime(),AFTConstants.YYYYMMDD));
+			if (e.getDateTime()!=null){
+				param.put("date",DateUtils.formatDate(e.getDateTime(),AFTConstants.YYYYMMDD));
+			}
 			param.put("title",NewProjectStatus.getValueByCode(e.getProjectStatus()));
 			map.put(e.getProjectStatus().toString(),param);
 		}