Browse Source

新项目旧数据处理项目完成日期接口

anderx 1 year ago
parent
commit
fc1aca0ccc

+ 17 - 21
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -2088,28 +2088,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			try {
 				Map map = mapper.readValue(timeRecord, Map.class);
 				//高新 10已下证 科技 18立项已拨款 专利/软著 19已完成/下证 会员 27全部完成
-				Map map2 = (Map) map.get("10");
-				Integer x = 10;
-				String date = (String) map2.get("date");
-				if (date == null) {
-					map2 = (Map) map.get("18");
-					date = (String) map2.get("date");
-					x = 18;
-				}
-				if (date == null) {
-					map2 = (Map) map.get("19");
-					date = (String) map2.get("date");
-					x = 19;
-				}
-				if (date == null) {
-					map2 = (Map) map.get("27");
-					date = (String) map2.get("date");
-					x = 27;
-				}
-				if (date != null) {
-					System.out.println( x + "=" + date);
-					return date;
+				String[] str={"10","18","19","27"};
+				String date = null;
+				for (String s : str) {
+					if (StringUtils.isEmpty(date)){
+						date=pushStr(s,map);
+					}
+
 				}
+				return date;
 			} catch (JsonProcessingException ex) {
 				throw new RuntimeException(ex);
 			}
@@ -2117,4 +2104,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		return null;
 	}
 
+	private String pushStr(String s,Map map) {
+		String date=null;
+		Map map2 = (Map) map.get(s);
+		if (map2!=null){
+			date = (String) map2.get("date");
+		}
+		return date;
+	}
+
 }