单井历史数据查询调整（数据关联调整）

src/main/java/com/hb/proj/data/controller/WellDataController.java

@@ -132,7 +132,7 @@ public class WellDataController {
 		Map<String,SingleDataVO> mapping=new HashMap<>(datas.size());
 		datas.forEach(data->{
 			DataTransUtils.convert(wpMapping.get(data.getWellParam()), data);
-			mapping.put(data.getWellParam()+"_"+data.getGatherTime().getTime(), data);
+			mapping.put(data.getWellParam()+"_"+DateUtil.format(data.getGatherTime(), "yyyyMMddHHmm"), data);
 		});
 		return mapping;
 	}
@@ -150,7 +150,7 @@ public class WellDataController {
 					itm.put(wp.getParamCode(), mdata.getDispDataVal());
 				}
 				else {
-					vo=othDatas.get(wp.getParamId()+"_"+mdata.getGatherTime().getTime());
+					vo=othDatas.get(wp.getParamId()+"_"+DateUtil.format(mdata.getGatherTime(), "yyyyMMddHHmm"));
 					itm.put(wp.getParamCode(), vo!=null?vo.getDispDataVal():null);
 				}
 			}